31 files changed, 1818 insertions, 473 deletions

diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index 9a79b6a..cface5d 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -110,3 +110,3 @@
         <source>Arrange Edit Fields</source>
-        <translation>Arrumar Campos</translation>
+        <translation type="obsolete">Arrumar Campos</translation>
     </message>
@@ -114,3 +114,3 @@
         <source>Out of Space</source>
-        <translation>Sem Espaço</translation>
+        <translation type="obsolete">Sem Espaço</translation>
     </message>
@@ -122,3 +122,3 @@ Free up some space before
 entering data!</source>
-        <translation>Não há espaço livre para
+        <translation type="obsolete">Não há espaço livre para
 guardar os ficheiros iniciais.
@@ -166,3 +166,3 @@ Sair na mesma?</translation>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
@@ -170,3 +170,3 @@ Sair na mesma?</translation>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
@@ -174,3 +174,3 @@ Sair na mesma?</translation>
         <source>Work</source>
-        <translation>Escritório</translation>
+        <translation type="obsolete">Escritório</translation>
     </message>
@@ -178,3 +178,3 @@ Sair na mesma?</translation>
         <source>Mb</source>
-        <translation>Mb</translation>
+        <translation type="obsolete">Mb</translation>
     </message>
@@ -182,3 +182,3 @@ Sair na mesma?</translation>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
@@ -186,3 +186,3 @@ Sair na mesma?</translation>
         <source>Last Name</source>
-        <translation>Apelido</translation>
+        <translation type="obsolete">Apelido</translation>
     </message>
@@ -190,3 +190,3 @@ Sair na mesma?</translation>
         <source>File As</source>
-        <translation>Ficheiro Como</translation>
+        <translation type="obsolete">Ficheiro Como</translation>
     </message>
@@ -194,3 +194,3 @@ Sair na mesma?</translation>
         <source>Default Email</source>
-        <translation>E-Mail Principal</translation>
+        <translation type="obsolete">E-Mail Principal</translation>
     </message>
@@ -198,3 +198,3 @@ Sair na mesma?</translation>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
@@ -228,2 +228,120 @@ Sair na mesma?</translation>
     </message>
+    <message>
+        <source>Find Next</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>Unable to find a contact for this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search pattern !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of list. Wrap around now.. !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>MyDialog1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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>Signal Wrap Around</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>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -241,3 +359,3 @@ Sair na mesma?</translation>
         <source>Name Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
@@ -277,3 +395,3 @@ Sair na mesma?</translation>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
@@ -281,3 +399,3 @@ Sair na mesma?</translation>
         <source>Groups</source>
-        <translation type="unfinished">Grupos</translation>
+        <translation type="obsolete">Grupos</translation>
     </message>
@@ -1225,3 +1343,3 @@ Sair na mesma?</translation>
         <source>Business Street</source>
-        <translation type="unfinished">Rua (Empresa)</translation>
+        <translation type="obsolete">Rua (Empresa)</translation>
     </message>
@@ -1229,3 +1347,3 @@ Sair na mesma?</translation>
         <source>Home Street</source>
-        <translation type="unfinished">Rua (Pessoal)</translation>
+        <translation type="obsolete">Rua (Pessoal)</translation>
     </message>
@@ -1233,3 +1351,3 @@ Sair na mesma?</translation>
         <source>Business City</source>
-        <translation type="unfinished">Cidade (Empresa)</translation>
+        <translation type="obsolete">Cidade (Empresa)</translation>
     </message>
@@ -1237,3 +1355,3 @@ Sair na mesma?</translation>
         <source>Business State</source>
-        <translation type="unfinished">Estado (Empresa)</translation>
+        <translation type="obsolete">Estado (Empresa)</translation>
     </message>
@@ -1241,3 +1359,3 @@ Sair na mesma?</translation>
         <source>Business Zip</source>
-        <translation type="unfinished">Cód Postal (Empresa)</translation>
+        <translation type="obsolete">Cód Postal (Empresa)</translation>
     </message>
@@ -1245,3 +1363,3 @@ Sair na mesma?</translation>
         <source>Business Country</source>
-        <translation type="unfinished">País (Empresa)</translation>
+        <translation type="obsolete">País (Empresa)</translation>
     </message>
@@ -1249,3 +1367,3 @@ Sair na mesma?</translation>
         <source>Home City</source>
-        <translation type="unfinished">Cidade (Pessoal)</translation>
+        <translation type="obsolete">Cidade (Pessoal)</translation>
     </message>
@@ -1253,3 +1371,3 @@ Sair na mesma?</translation>
         <source>Home State</source>
-        <translation type="unfinished">Estado (Pessoal)</translation>
+        <translation type="obsolete">Estado (Pessoal)</translation>
     </message>
@@ -1257,3 +1375,3 @@ Sair na mesma?</translation>
         <source>Home Zip</source>
-        <translation type="unfinished">Cód. Postal (Pessoal)</translation>
+        <translation type="obsolete">Cód. Postal (Pessoal)</translation>
     </message>
@@ -1261,3 +1379,3 @@ Sair na mesma?</translation>
         <source>Home Country</source>
-        <translation type="unfinished">País (Pessoal)</translation>
+        <translation type="obsolete">País (Pessoal)</translation>
     </message>
@@ -1305,3 +1423,3 @@ Sair na mesma?</translation>
         <source>Work Phone</source>
-        <translation>Telefone (Empresa)</translation>
+        <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
@@ -1309,3 +1427,3 @@ Sair na mesma?</translation>
         <source>Work Fax</source>
-        <translation>Fax (Empresa)</translation>
+        <translation type="obsolete">Fax (Empresa)</translation>
     </message>
@@ -1313,3 +1431,3 @@ Sair na mesma?</translation>
         <source>work Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
@@ -1317,3 +1435,3 @@ Sair na mesma?</translation>
         <source>Work Pager</source>
-        <translation>Pager (Empresa)</translation>
+        <translation type="obsolete">Pager (Empresa)</translation>
     </message>
@@ -1321,3 +1439,3 @@ Sair na mesma?</translation>
         <source>Work Web Page</source>
-        <translation>Site (Empresa)</translation>
+        <translation type="obsolete">Site (Empresa)</translation>
     </message>
@@ -1325,3 +1443,3 @@ Sair na mesma?</translation>
         <source>Work Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
@@ -1335,2 +1453,6 @@ Sair na mesma?</translation>
     </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index abb7195..94eeb66 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -122,3 +122,3 @@
         <source>Change Directory</source>
-        <translation type="obsolete"></translation>
+        <translation type="unfinished"></translation>
     </message>
@@ -203,2 +203,6 @@ and is licensed by the GPL</source>
     </message>
+    <message>
+        <source>Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 78f2c2f..b00d8db 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -2,12 +2,9 @@
 <context>
-    <name>QCheckDetailsBase</name>
+    <name>Checkbook</name>
     <message>
-        <source>Transaction Details</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntry</name>
     <message>
-        <source>Automobile</source>
+        <source>New checkbook</source>
         <translation type="unfinished"></translation>
@@ -15,3 +12,3 @@
     <message>
-        <source>Bills</source>
+        <source>Info</source>
         <translation type="unfinished"></translation>
@@ -19,3 +16,3 @@
     <message>
-        <source>CDs</source>
+        <source>Transactions</source>
         <translation type="unfinished"></translation>
@@ -23,3 +20,3 @@
     <message>
-        <source>Clothing</source>
+        <source>Charts</source>
         <translation type="unfinished"></translation>
@@ -27,3 +24,3 @@
     <message>
-        <source>Computer</source>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
@@ -31,3 +28,3 @@
     <message>
-        <source>DVDs</source>
+        <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -35,3 +32,3 @@
     <message>
-        <source>Eletronics</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
@@ -39,3 +36,3 @@
     <message>
-        <source>Entertainment</source>
+        <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -43,3 +40,3 @@
     <message>
-        <source>Food</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
@@ -47,3 +44,3 @@
     <message>
-        <source>Gasoline</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
@@ -51,3 +48,3 @@
     <message>
-        <source>Misc</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
@@ -55,3 +52,3 @@
     <message>
-        <source>Movies</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
@@ -59,3 +56,3 @@
     <message>
-        <source>Rent</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
@@ -63,3 +60,3 @@
     <message>
-        <source>Travel</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
@@ -67,3 +64,3 @@
     <message>
-        <source>Debit Charge</source>
+        <source>Bank:</source>
         <translation type="unfinished"></translation>
@@ -71,3 +68,3 @@
     <message>
-        <source>Written Check</source>
+        <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -75,3 +72,3 @@
     <message>
-        <source>Transfer</source>
+        <source>Account number:</source>
         <translation type="unfinished"></translation>
@@ -79,3 +76,3 @@
     <message>
-        <source>Credit Card</source>
+        <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -83,3 +80,3 @@
     <message>
-        <source>Work</source>
+        <source>PIN number:</source>
         <translation type="unfinished"></translation>
@@ -87,3 +84,3 @@
     <message>
-        <source>Family Member</source>
+        <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -91,3 +88,3 @@
     <message>
-        <source>Misc. Credit</source>
+        <source>Starting balance:</source>
         <translation type="unfinished"></translation>
@@ -95,3 +92,3 @@
     <message>
-        <source>Automatic Payment</source>
+        <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -99,10 +96,7 @@
     <message>
-        <source>Cash</source>
+        <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckEntryBase</name>
     <message>
-        <source>Account Transaction</source>
+        <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
@@ -110,3 +104,3 @@
     <message>
-        <source>$</source>
+        <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
@@ -114,3 +108,3 @@
     <message>
-        <source>Category:</source>
+        <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
@@ -118,3 +112,5 @@
     <message>
-        <source>Description:</source>
+        <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>
@@ -122,3 +118,3 @@
     <message>
-        <source>Type:</source>
+        <source>ID</source>
         <translation type="unfinished"></translation>
@@ -126,3 +122,3 @@
     <message>
-        <source>Amount:</source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
@@ -130,3 +126,3 @@
     <message>
-        <source>Automobile</source>
+        <source>Description</source>
         <translation type="unfinished"></translation>
@@ -134,3 +130,3 @@
     <message>
-        <source>Bills</source>
+        <source>Amount</source>
         <translation type="unfinished"></translation>
@@ -138,3 +134,3 @@
     <message>
-        <source>CDs</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
@@ -142,3 +138,3 @@
     <message>
-        <source>Clothing</source>
+        <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
@@ -146,3 +142,3 @@
     <message>
-        <source>Computer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
@@ -150,3 +146,3 @@
     <message>
-        <source>DVDs</source>
+        <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
@@ -154,3 +150,3 @@
     <message>
-        <source>Eletronics</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
@@ -158,3 +154,3 @@
     <message>
-        <source>Entertainment</source>
+        <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
@@ -162,3 +158,3 @@
     <message>
-        <source>Food</source>
+        <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
@@ -166,3 +162,3 @@
     <message>
-        <source>Gasoline</source>
+        <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
@@ -170,3 +166,3 @@
     <message>
-        <source>Misc</source>
+        <source>Account balance</source>
         <translation type="unfinished"></translation>
@@ -174,3 +170,3 @@
     <message>
-        <source>Movies</source>
+        <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
@@ -178,3 +174,3 @@
     <message>
-        <source>Rent</source>
+        <source>Deposits by category</source>
         <translation type="unfinished"></translation>
@@ -182,3 +178,3 @@
     <message>
-        <source>Travel</source>
+        <source>Draw</source>
         <translation type="unfinished"></translation>
@@ -186,3 +182,3 @@
     <message>
-        <source>Check Number:</source>
+        <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
@@ -190,3 +186,3 @@
     <message>
-        <source>Extra Fee:</source>
+        <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
@@ -194,7 +190,10 @@
     <message>
-        <source>Additional Notes:</source>
+        <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Date:</source>
+        <source>Checkbook</source>
         <translation type="unfinished"></translation>
@@ -202,3 +201,3 @@
     <message>
-        <source>Debit Charge</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
@@ -206,3 +205,5 @@
     <message>
-        <source>Written Check</source>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
@@ -210,3 +211,3 @@
     <message>
-        <source>Transfer</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
@@ -214,3 +215,5 @@
     <message>
-        <source>Credit Card</source>
+        <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>
@@ -218,3 +221,3 @@
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
@@ -222,12 +225,27 @@
     <message>
-        <source>Payment</source>
+        <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>
-</context>
-<context>
-    <name>QCheckGraphBase</name>
     <message>
-        <source>Account Graph</source>
+        <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>
+</context>
+<context>
+    <name>QCheckDetailsBase</name>
+</context>
+<context>
+    <name>QCheckEntry</name>
+</context>
+<context>
+    <name>QCheckEntryBase</name>
+</context>
+<context>
+    <name>QCheckGraphBase</name>
 </context>
@@ -235,4 +253,16 @@
     <name>QCheckMMBase</name>
+</context>
+<context>
+    <name>QCheckNameBase</name>
+</context>
+<context>
+    <name>QCheckViewBase</name>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Main Menu</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
@@ -240,10 +270,7 @@
     <message>
-        <source>Select from the check books below or click the &quot;New&quot; icon in the toolbar.</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckNameBase</name>
     <message>
-        <source>Check Book Name</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
@@ -251,3 +278,3 @@
     <message>
-        <source>Name...</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
@@ -255,3 +282,3 @@
     <message>
-        <source>Please name your check book (limit: 15 characters):</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
@@ -259,10 +286,11 @@
     <message>
-        <source>&amp;Done</source>
+        <source>Select date of transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QCheckViewBase</name>
     <message>
-        <source>Account Transactions</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
@@ -270,3 +298,3 @@
     <message>
-        <source>$0.00</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
@@ -274,10 +302,35 @@
     <message>
-        <source>Balance:</source>
+        <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>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Out of Space</source>
+        <source>Fee:</source>
         <translation type="unfinished"></translation>
@@ -285,8 +338,105 @@
     <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
+        <source>Enter any fee amount assoiciated with this transaction.
 
-Please free up some space and
-try again.</source>
+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>
diff --git a/i18n/pt/citytime.ts b/i18n/pt/citytime.ts
index 456d1bb..bfea9b0 100644
--- a/i18n/pt/citytime.ts
+++ b/i18n/pt/citytime.ts
@@ -26,2 +26,6 @@
     </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -49,2 +53,14 @@
     </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>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index a86240b..d4bc1de 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -192,2 +192,10 @@
     </message>
+    <message>
+        <source>Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index 4eac967..c5362ac 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -143,2 +143,6 @@ to this account, please try later.</source>
     </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -234,2 +238,42 @@ to this account, please try later.</source>
     </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>
diff --git a/i18n/pt/kpacman.ts b/i18n/pt/kpacman.ts
index b40c4f0..fb73268 100644
--- a/i18n/pt/kpacman.ts
+++ b/i18n/pt/kpacman.ts
@@ -209,24 +209,2 @@ or is of an unknown format.</source>
     <message>
-        <source>You&apos;re going to create the highscore-file
-&apos;%1&apos;
-for your maschine, that should be used systemwide.
-
-To grant access to the other users, set the appropriate rights (a+w)
-on that file or ask your systemadministator for that favor.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>You&apos;re using a private highscore-file, that&apos;s mostly because of
-missing write-access to the systemwide file
-&apos;%1&apos; .
-
-Ask your systemadministrator for granting you access to that file,
-by setting the appropriate rights (a+w) on it.
-
-To use a different directory or filename for the highscores,specify them in the configfile (kpacmanrc:highscoreFilePath).</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>@YY@/@MM@/@DD@</source>
diff --git a/i18n/pt/language.ts b/i18n/pt/language.ts
index 84f6ace..d923a9e 100644
--- a/i18n/pt/language.ts
+++ b/i18n/pt/language.ts
@@ -2,2 +2,13 @@
 <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>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 4153f0e..feae77a 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -48,6 +48,2 @@
     <message>
-        <source>Draw liquid window title bars</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Make toolbar buttons appear flat</source>
@@ -62,12 +58,2 @@
     <name>QObject</name>
-    <message>
-        <source>Liquid</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
diff --git a/i18n/pt/libmetal.ts b/i18n/pt/libmetal.ts
index 8225ce0..343131d 100644
--- a/i18n/pt/libmetal.ts
+++ b/i18n/pt/libmetal.ts
@@ -3,12 +3,2 @@
     <name>QObject</name>
-    <message>
-        <source>Metal</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Metal style</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index 7dcb8c1..ef62f7d 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -5,3 +5,3 @@
         <source>More</source>
-        <translation>Mais</translation>
+        <translation type="obsolete">Mais</translation>
     </message>
@@ -9,3 +9,3 @@
         <source>More...</source>
-        <translation>Mais...</translation>
+        <translation type="obsolete">Mais...</translation>
     </message>
@@ -15,8 +15,4 @@
     <message>
-        <source>Hue:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Sat:</source>
-        <translation>Sat:</translation>
+        <translation type="obsolete">Sat:</translation>
     </message>
@@ -24,3 +20,3 @@
         <source>Val:</source>
-        <translation>Val:</translation>
+        <translation type="obsolete">Val:</translation>
     </message>
@@ -28,3 +24,3 @@
         <source>Red:</source>
-        <translation>Vermelho:</translation>
+        <translation type="obsolete">Vermelho:</translation>
     </message>
@@ -32,3 +28,3 @@
         <source>Green:</source>
-        <translation>Verde:</translation>
+        <translation type="obsolete">Verde:</translation>
     </message>
@@ -36,7 +32,3 @@
         <source>Blue:</source>
-        <translation>Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Azul:</translation>
     </message>
@@ -44,3 +36,3 @@
         <source>Select color</source>
-        <translation>Escolha cor</translation>
+        <translation type="obsolete">Escolha cor</translation>
     </message>
@@ -50,8 +42,4 @@
     <message>
-        <source>FileDialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open</source>
-        <translation>Abrir</translation>
+        <translation type="obsolete">Abrir</translation>
     </message>
@@ -59,3 +47,3 @@
         <source>Save</source>
-        <translation>Gravar</translation>
+        <translation type="obsolete">Gravar</translation>
     </message>
@@ -66,3 +54,3 @@
         <source>Documents</source>
-        <translation>Documentos</translation>
+        <translation type="obsolete">Documentos</translation>
     </message>
@@ -70,3 +58,3 @@
         <source>Files</source>
-        <translation>Ficheiros</translation>
+        <translation type="obsolete">Ficheiros</translation>
     </message>
@@ -74,3 +62,3 @@
         <source>All Files</source>
-        <translation>Todos os Ficheiros</translation>
+        <translation type="obsolete">Todos os Ficheiros</translation>
     </message>
@@ -78,3 +66,3 @@
         <source>All</source>
-        <translation>Todos</translation>
+        <translation type="obsolete">Todos</translation>
     </message>
@@ -82,3 +70,3 @@
         <source>Name:</source>
-        <translation>Nome:</translation>
+        <translation type="obsolete">Nome:</translation>
     </message>
@@ -86,3 +74,3 @@
         <source>&amp;Save</source>
-        <translation>&amp;Gravar</translation>
+        <translation type="obsolete">&amp;Gravar</translation>
     </message>
@@ -90,3 +78,3 @@
         <source>C&amp;ancel</source>
-        <translation>C&amp;ancelar</translation>
+        <translation type="obsolete">C&amp;ancelar</translation>
     </message>
@@ -94,3 +82,3 @@
         <source>Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
@@ -98,3 +86,3 @@
         <source>Size</source>
-        <translation>Tamanho</translation>
+        <translation type="obsolete">Tamanho</translation>
     </message>
@@ -102,11 +90,3 @@
         <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ser Permission</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Data</translation>
     </message>
@@ -114,8 +94,3 @@
         <source>Delete</source>
-        <translation>Apagar</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Apagar</translation>
     </message>
@@ -123,3 +98,3 @@
         <source>Yes</source>
-        <translation>Sim</translation>
+        <translation type="obsolete">Sim</translation>
     </message>
@@ -127,3 +102,3 @@
         <source>No</source>
-        <translation>Não</translation>
+        <translation type="obsolete">Não</translation>
     </message>
@@ -134,3 +109,3 @@
         <source>Large</source>
-        <translation>Grande</translation>
+        <translation type="obsolete">Grande</translation>
     </message>
@@ -138,3 +113,3 @@
         <source>Medium</source>
-        <translation>Médio</translation>
+        <translation type="obsolete">Médio</translation>
     </message>
@@ -142,3 +117,3 @@
         <source>Small</source>
-        <translation>Pequeno</translation>
+        <translation type="obsolete">Pequeno</translation>
     </message>
@@ -148,3 +123,10 @@
     <message>
-        <source>Style</source>
+        <source>Size</source>
+        <translation type="obsolete">Tamanho</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceBase</name>
+    <message>
+        <source>Repeating Event </source>
         <translation type="unfinished"></translation>
@@ -152,7 +134,83 @@
     <message>
-        <source>Size</source>
-        <translation type="unfinished">Tamanho</translation>
+        <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>The Quick Brown Fox Jumps Over The Lazy Dog</source>
+        <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>
@@ -183,3 +241,3 @@
         <source>Summary:</source>
-        <translation>Sumário:</translation>
+        <translation type="obsolete">Sumário:</translation>
     </message>
@@ -187,3 +245,3 @@
         <source>Description:</source>
-        <translation>Descrição:</translation>
+        <translation type="obsolete">Descrição:</translation>
     </message>
@@ -191,3 +249,3 @@
         <source>Priority:</source>
-        <translation>Prioridade:</translation>
+        <translation type="obsolete">Prioridade:</translation>
     </message>
@@ -195,7 +253,3 @@
         <source>Progress:</source>
-        <translation>Progresso:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Progresso:</translation>
     </message>
@@ -203,3 +257,3 @@
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
diff --git a/i18n/pt/libqdvorak.ts b/i18n/pt/libqdvorak.ts
index 4eb9e18..5e1ab53 100644
--- a/i18n/pt/libqdvorak.ts
+++ b/i18n/pt/libqdvorak.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqhandwriting.ts b/i18n/pt/libqhandwriting.ts
index 00fd9e8..2017ade 100644
--- a/i18n/pt/libqhandwriting.ts
+++ b/i18n/pt/libqhandwriting.ts
@@ -23,6 +23,2 @@
     <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="unfinished"></translation>
-    </message>
-    <message>
         <source>Matched: </source>
@@ -38,2 +34,17 @@
     </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>
@@ -61,2 +72,17 @@
     </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>
@@ -68,2 +94,6 @@
     </message>
+    <message>
+        <source>Character:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/pt/libqjumpx.ts b/i18n/pt/libqjumpx.ts
index 4eb9e18..80ea414 100644
--- a/i18n/pt/libqjumpx.ts
+++ b/i18n/pt/libqjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqkeyboard.ts b/i18n/pt/libqkeyboard.ts
index 4eb9e18..318758e 100644
--- a/i18n/pt/libqkeyboard.ts
+++ b/i18n/pt/libqkeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqkjumpx.ts b/i18n/pt/libqkjumpx.ts
index 4eb9e18..964d5dc 100644
--- a/i18n/pt/libqkjumpx.ts
+++ b/i18n/pt/libqkjumpx.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 16d183a..9bcd648 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -151,6 +151,2 @@ as categorias.</translation>
     <message>
-        <source>Create a new Document</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Close the File Selector</source>
@@ -189,6 +185,2 @@ as categorias.</translation>
     </message>
-    <message>
-        <source>There are no files in this directory.</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
@@ -262,10 +254,2 @@ as categorias.</translation>
     <message>
-        <source>Delete Icon and leave file</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Icon deletion failed.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy of </source>
@@ -290,6 +274,2 @@ as categorias.</translation>
     <message>
-        <source>File does not exist.</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Hard Disk</source>
@@ -333,6 +313,2 @@ as categorias.</translation>
     <message>
-        <source>Del Icon</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Copy</source>
@@ -368,2 +344,6 @@ as categorias.</translation>
     </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -862,2 +842,6 @@ Free some memory and try again.</source>
     </message>
+    <message>
+        <source>MMC Card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -871,2 +855,14 @@ Free some memory and try again.</source>
 <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>
diff --git a/i18n/pt/libqpickboard.ts b/i18n/pt/libqpickboard.ts
index 4eb9e18..488fb8f 100644
--- a/i18n/pt/libqpickboard.ts
+++ b/i18n/pt/libqpickboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libqunikeyboard.ts b/i18n/pt/libqunikeyboard.ts
index 4eb9e18..6966daa 100644
--- a/i18n/pt/libqunikeyboard.ts
+++ b/i18n/pt/libqunikeyboard.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libtheme.ts b/i18n/pt/libtheme.ts
index 16fa6e1..7a8a6d4 100644
--- a/i18n/pt/libtheme.ts
+++ b/i18n/pt/libtheme.ts
@@ -3,12 +3,2 @@
     <name>QObject</name>
-    <message>
-        <source>Themed style</source>
-        <comment>name</comment>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <comment>description</comment>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index be40e99..d42f5c2 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -2,2 +2,9 @@
 <context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
@@ -5,3 +12,3 @@
         <source>Adjust to environment</source>
-        <translation>Ajustar ao ambiente</translation>
+        <translation type="obsolete">Ajustar ao ambiente</translation>
     </message>
@@ -13,3 +20,3 @@
         <source>Power saving</source>
-        <translation>Poupança de energia</translation>
+        <translation type="obsolete">Poupança de energia</translation>
     </message>
@@ -17,3 +24,3 @@
         <source> seconds</source>
-        <translation>segundos</translation>
+        <translation type="obsolete">segundos</translation>
     </message>
@@ -29,3 +36,3 @@
         <source>Only deactivate LCD during Suspend</source>
-        <translation>Desactivar o LCD apenas ao suspender</translation>
+        <translation type="obsolete">Desactivar o LCD apenas ao suspender</translation>
     </message>
@@ -37,3 +44,3 @@
         <source>Bright</source>
-        <translation>Brilho</translation>
+        <translation type="obsolete">Brilho</translation>
     </message>
@@ -41,3 +48,3 @@
         <source>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</source>
-        <translation>&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
+        <translation type="obsolete">&lt;blockquote&gt;Gastará mais bateria quanto mais brilhante seja o ecrâ.&lt;/blockquote&gt;</translation>
     </message>
@@ -51,2 +58,117 @@
     </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">Desligar</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>
diff --git a/i18n/pt/mediummount.ts b/i18n/pt/mediummount.ts
index 4f9e4a1..dba8eda 100644
--- a/i18n/pt/mediummount.ts
+++ b/i18n/pt/mediummount.ts
@@ -11,6 +11,2 @@
     <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="unfinished"></translation>
-    </message>
-    <message>
         <source>Enable medium checking</source>
@@ -85,2 +81,6 @@
     </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>
diff --git a/i18n/pt/opieplayer.ts b/i18n/pt/opieplayer.ts
index 6431f8d..925daba 100644
--- a/i18n/pt/opieplayer.ts
+++ b/i18n/pt/opieplayer.ts
@@ -70,2 +70,6 @@ Closing player now.</source>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -133,6 +137,2 @@ Closing player now.</source>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
@@ -219,6 +219,2 @@ the next time you start it.</source>
     <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
@@ -255,2 +251,6 @@ this playlist?</source>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
diff --git a/i18n/pt/oxygen.ts b/i18n/pt/oxygen.ts
index 8bd0f80..a06cb8f 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -4,14 +4,2 @@
     <message>
-        <source>Calculations</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Molweight</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Formula:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Calculate</source>
@@ -24,14 +12,2 @@
     <message>
-        <source>Result:</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Elemental composition (%):</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Nernst</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Form1</source>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 998a3e9..f5fee68 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -2,2 +2,229 @@
 <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>Shut down...</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>
diff --git a/i18n/pt/sheetqt.ts b/i18n/pt/sheetqt.ts
index 299ca20..dcf5b0e 100644
--- a/i18n/pt/sheetqt.ts
+++ b/i18n/pt/sheetqt.ts
@@ -670,16 +670,2 @@
     <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>
@@ -739,2 +725,16 @@ http://qtopia.sitebest.com</source>
     </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>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index ce6be16..9d7fd8c 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -66,6 +66,2 @@
     <message>
-        <source>Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Preferences..</source>
@@ -74,6 +70,2 @@
     <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Image Info ...</source>
@@ -121,2 +113,45 @@
     </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>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index 4a6c32f..a984e76 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -2,2 +2,188 @@
 <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>Predicted time:</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>
+</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>Advanced features</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>
+</context>
+<context>
     <name>SetDateTime</name>
@@ -5,3 +191,3 @@
         <source>Set System Time</source>
-        <translation>Hora do sistema</translation>
+        <translation type="obsolete">Hora do sistema</translation>
     </message>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 4780eed..79bf6e2 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -55,26 +55,2 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <name>FontDialog</name>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Dialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Font Style</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete"></translation>
-    </message>
 </context>
@@ -123,10 +99,2 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Bold</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>Wrap lines</source>
@@ -183,22 +151,2 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Unnamed</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>FontDialog</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>All</source>
@@ -215,3 +163,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Advanced features</source>
+        <source>Advanced Features</source>
         <translation type="unfinished"></translation>
@@ -219,21 +167,12 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <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="obsolete"></translation>
-    </message>
-    <message>
-        <source>Text Edit</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="obsolete"></translation>
+        <source>Prompt on Exit</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"></translation>
+        <source>Always open linked file</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="obsolete"></translation>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index 176e504..3abd8b3 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -36,6 +36,2 @@
     <message>
-        <source>No more appointments today</source>
-        <translation type="obsolete"></translation>
-    </message>
-    <message>
         <source>No plugins found</source>
@@ -47,2 +43,6 @@
     </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -56,6 +56,10 @@
         <source>Today</source>
-        <translation type="obsolete">Hoje</translation>
+        <translation type="unfinished">Hoje</translation>
     </message>
     <message>
-        <source>Today&#xb2;</source>
+        <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>
@@ -99,2 +103,38 @@ resume?
     </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin ore use the arrow buttons on the right to change the appearance order</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>
 </context>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index 9617254..ba92425 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -2,2 +2,118 @@
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">Nova Tarefa</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">Editar Tarefa</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished">Ver Tarefa</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished">Apagar...</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished">Apagar Todas...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished">Duplicar</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished">Irradiar</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished">Procurar</translation>
+    </message>
+    <message>
+        <source>Completed tasks</source>
+        <translation type="unfinished">Tarefas Completas</translation>
+    </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished">Mostrar Limite</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished">Dados</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Categoria</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">Opções</translation>
+    </message>
+    <message>
+        <source>Show only over due</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</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">Todas as Categoria</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"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished">Tarefa</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="unfinished">Não pode editar enquanto sincroniza</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">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>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NewTaskDialog</name>
@@ -5,3 +121,3 @@
         <source>Todo List</source>
-        <translation>Lista Tarefas</translation>
+        <translation type="obsolete">Lista Tarefas</translation>
     </message>
@@ -12,3 +128,3 @@
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
@@ -16,3 +132,3 @@
         <source>Category:</source>
-        <translation>Categoria:</translation>
+        <translation type="obsolete">Categoria:</translation>
     </message>
@@ -20,3 +136,3 @@
         <source>Summary:</source>
-        <translation>Sumário:</translation>
+        <translation type="obsolete">Sumário:</translation>
     </message>
@@ -24,3 +140,3 @@
         <source>&amp;Completed</source>
-        <translation>&amp;Completo</translation>
+        <translation type="obsolete">&amp;Completo</translation>
     </message>
@@ -28,3 +144,3 @@
         <source>D&amp;ue</source>
-        <translation>&amp;Limite</translation>
+        <translation type="obsolete">&amp;Limite</translation>
     </message>
@@ -32,3 +148,3 @@
         <source>1 Jan 2001</source>
-        <translation>1 Jan 2001</translation>
+        <translation type="obsolete">1 Jan 2001</translation>
     </message>
@@ -36,3 +152,3 @@
         <source>Priority:</source>
-        <translation>Prioridade:</translation>
+        <translation type="obsolete">Prioridade:</translation>
     </message>
@@ -40,3 +156,3 @@
         <source>1 - Very High</source>
-        <translation>1 - Muito Alta</translation>
+        <translation type="obsolete">1 - Muito Alta</translation>
     </message>
@@ -44,3 +160,3 @@
         <source>2 - High</source>
-        <translation>2 - Alta</translation>
+        <translation type="obsolete">2 - Alta</translation>
     </message>
@@ -48,3 +164,3 @@
         <source>3 - Normal</source>
-        <translation>3 - Normal</translation>
+        <translation type="obsolete">3 - Normal</translation>
     </message>
@@ -52,3 +168,3 @@
         <source>4 - Low</source>
-        <translation>4 - Baixa</translation>
+        <translation type="obsolete">4 - Baixa</translation>
     </message>
@@ -56,6 +172,82 @@
         <source>5 - Very Low</source>
-        <translation>5 - Muito Baixa</translation>
+        <translation type="obsolete">5 - Muito Baixa</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</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">Editar Tarefa</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished">C.</translation>
+    </message>
+    <message>
+        <source>Prior.</source>
+        <translation type="unfinished">Pri.</translation>
     </message>
     <message>
-        <source>Progress:</source>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished">Limite</translation>
+    </message>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAdvanced</name>
+    <message>
+        <source>Form2</source>
         <translation type="unfinished"></translation>
@@ -63,3 +255,3 @@
     <message>
-        <source>0%</source>
+        <source>State:</source>
         <translation type="unfinished"></translation>
@@ -67,3 +259,3 @@
     <message>
-        <source>20%</source>
+        <source>Started</source>
         <translation type="unfinished"></translation>
@@ -71,3 +263,3 @@
     <message>
-        <source>40%</source>
+        <source>Postponed</source>
         <translation type="unfinished"></translation>
@@ -75,3 +267,3 @@
     <message>
-        <source>60%</source>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
@@ -79,3 +271,3 @@
     <message>
-        <source>80%</source>
+        <source>Not started</source>
         <translation type="unfinished"></translation>
@@ -83,3 +275,229 @@
     <message>
-        <source>100%</source>
+        <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>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Form3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <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">1 - Muito Alta</translation>
+    </message>
+    <message>
+        <source>2 - High</source>
+        <translation type="unfinished">2 - Alta</translation>
+    </message>
+    <message>
+        <source>3 - Normal</source>
+        <translation type="unfinished">3 - Normal</translation>
+    </message>
+    <message>
+        <source>4 - Low</source>
+        <translation type="unfinished">4 - Baixa</translation>
+    </message>
+    <message>
+        <source>5 - Very Low</source>
+        <translation type="unfinished">5 - Muito Baixa</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">Categoria</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">Lista Tarefas</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>
@@ -91,3 +509,3 @@
         <source>C.</source>
-        <translation>C.</translation>
+        <translation type="obsolete">C.</translation>
     </message>
@@ -95,3 +513,3 @@
         <source>Prior.</source>
-        <translation>Pri.</translation>
+        <translation type="obsolete">Pri.</translation>
     </message>
@@ -99,3 +517,3 @@
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
@@ -103,3 +521,3 @@
         <source>Deadline</source>
-        <translation>Limite</translation>
+        <translation type="obsolete">Limite</translation>
     </message>
@@ -107,3 +525,3 @@
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <translation type="obsolete">Vazio</translation>
     </message>
@@ -111,3 +529,3 @@
         <source>All</source>
-        <translation>Tudo</translation>
+        <translation type="obsolete">Tudo</translation>
     </message>
@@ -118,3 +536,3 @@
         <source>Todo</source>
-        <translation>Tarefa</translation>
+        <translation type="obsolete">Tarefa</translation>
     </message>
@@ -122,9 +540,3 @@
         <source>Out of Space</source>
-        <translation>Sem espaço</translation>
-    </message>
-    <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sem espaço</translation>
     </message>
@@ -132,3 +544,3 @@ before you enter any data</source>
         <source>New Task</source>
-        <translation>Nova Tarefa</translation>
+        <translation type="obsolete">Nova Tarefa</translation>
     </message>
@@ -136,3 +548,3 @@ before you enter any data</source>
         <source>Edit Task</source>
-        <translation>Editar Tarefa</translation>
+        <translation type="obsolete">Editar Tarefa</translation>
     </message>
@@ -140,3 +552,3 @@ before you enter any data</source>
         <source>View Task</source>
-        <translation>Ver Tarefa</translation>
+        <translation type="obsolete">Ver Tarefa</translation>
     </message>
@@ -144,3 +556,3 @@ before you enter any data</source>
         <source>Delete...</source>
-        <translation>Apagar...</translation>
+        <translation type="obsolete">Apagar...</translation>
     </message>
@@ -148,3 +560,3 @@ before you enter any data</source>
         <source>Delete all...</source>
-        <translation>Apagar Todas...</translation>
+        <translation type="obsolete">Apagar Todas...</translation>
     </message>
@@ -152,3 +564,3 @@ before you enter any data</source>
         <source>Duplicate</source>
-        <translation>Duplicar</translation>
+        <translation type="obsolete">Duplicar</translation>
     </message>
@@ -156,3 +568,3 @@ before you enter any data</source>
         <source>Beam</source>
-        <translation>Irradiar</translation>
+        <translation type="obsolete">Irradiar</translation>
     </message>
@@ -160,3 +572,3 @@ before you enter any data</source>
         <source>Find</source>
-        <translation>Procurar</translation>
+        <translation type="obsolete">Procurar</translation>
     </message>
@@ -164,3 +576,3 @@ before you enter any data</source>
         <source>Completed tasks</source>
-        <translation>Tarefas Completas</translation>
+        <translation type="obsolete">Tarefas Completas</translation>
     </message>
@@ -168,3 +580,3 @@ before you enter any data</source>
         <source>Show Deadline</source>
-        <translation>Mostrar Limite</translation>
+        <translation type="obsolete">Mostrar Limite</translation>
     </message>
@@ -172,3 +584,3 @@ before you enter any data</source>
         <source>Fonts</source>
-        <translation>Fontes</translation>
+        <translation type="obsolete">Fontes</translation>
     </message>
@@ -176,3 +588,3 @@ before you enter any data</source>
         <source>Data</source>
-        <translation>Dados</translation>
+        <translation type="obsolete">Dados</translation>
     </message>
@@ -180,3 +592,3 @@ before you enter any data</source>
         <source>Category</source>
-        <translation>Categoria</translation>
+        <translation type="obsolete">Categoria</translation>
     </message>
@@ -184,3 +596,3 @@ before you enter any data</source>
         <source>Options</source>
-        <translation>Opções</translation>
+        <translation type="obsolete">Opções</translation>
     </message>
@@ -188,3 +600,3 @@ before you enter any data</source>
         <source>Can not edit data, currently syncing</source>
-        <translation>Não pode editar enquanto sincroniza</translation>
+        <translation type="obsolete">Não pode editar enquanto sincroniza</translation>
     </message>
@@ -192,3 +604,3 @@ before you enter any data</source>
         <source>All Categories</source>
-        <translation>Todas as Categoria</translation>
+        <translation type="obsolete">Todas as Categoria</translation>
     </message>
@@ -196,3 +608,3 @@ before you enter any data</source>
         <source>Unfiled</source>
-        <translation>Vazio</translation>
+        <translation type="obsolete">Vazio</translation>
     </message>
@@ -200,16 +612,3 @@ before you enter any data</source>
         <source>Out of space</source>
-        <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>
-    </message>
-    <message>
-        <source>all tasks</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sem espaço</translation>
     </message>