Merge from BRANCH_1_0.

1 files changed, 82 insertions, 8 deletions

diff --git a/i18n/en/mailit.ts b/i18n/en/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/en/mailit.ts
+++ b/i18n/en/mailit.ts
@@ -14,12 +14,16 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
@@ -163,12 +167,42 @@
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
@@ -193,16 +227,12 @@ Mail has NOT been sent</source>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
@@ -210,12 +240,20 @@ Mail has NOT been sent</source>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
@@ -241,12 +279,16 @@ has not been downloaded yet.
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
@@ -257,16 +299,12 @@ has not been downloaded yet.
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
@@ -291,12 +329,16 @@ reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
@@ -414,12 +456,36 @@ Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
@@ -524,8 +590,16 @@ and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>