Merge from BRANCH_1_0.

1 files changed, 82 insertions, 8 deletions

diff --git a/i18n/pt_BR/mailit.ts b/i18n/pt_BR/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/pt_BR/mailit.ts
+++ b/i18n/pt_BR/mailit.ts
@@ -19,2 +19,6 @@
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -168,2 +172,32 @@ associated to this mail
     </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>
@@ -198,6 +232,2 @@ Mail has NOT been sent</source>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
@@ -215,2 +245,10 @@ has not been downloaded yet.
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -246,2 +284,6 @@ has not been downloaded yet.
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -262,6 +304,2 @@ has not been downloaded yet.
     <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>
@@ -296,2 +334,6 @@ reviewed by double clicking the entry.</source>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
@@ -419,2 +461,26 @@ Press and hold for more options.</source>
     </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>
@@ -529,2 +595,10 @@ and be valid emailaddresses</source>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>