[MERGE]: Merged with team1.

bzr revid: uco@tinyerp.com-20101104050443-irgsg5tbe3k3rmam

4 files changed, 12 insertions, 14 deletions

diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 4da6c4bbdd1..75d6dd0d465 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -52,14 +52,14 @@ class email_server(osv.osv):
             ('imap', 'IMAP Server'),
         ], 'Server Type', select=True, readonly=False),
         'is_ssl':fields.boolean('SSL ?', required=False),
-        'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches attachments from mail if true."),
+        'attach':fields.boolean('Add Attachments ?', required=False, help="Fetches mail with attachments if true."),
         'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
         'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly', False)]}),
         'note': fields.text('Description'),
         'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]", 
-                                    help="A reply e-mail will be sent to specified email address here whenever an e-mail is fetched from server."),
-        'object_id': fields.many2one('ir.model', "Model", required=True, help="Generates a record for each mail in selected model."),
+                                    help="A Email Server Action. It will be run whenever an e-mail is fetched from server."),
+        'object_id': fields.many2one('ir.model', "Model", required=True, help="OpenObject Model. Generates a record of this model."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Priority between 0 to 10, select define the order of Processing"),
         'user_id':fields.many2one('res.users', 'User', required=False),
     }
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 1d0cf21be08..b49161eacc7 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -128,8 +128,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'imap'}</field>
-            <field name="domain">[('type','=','imap')]</field>
+            <field name="context">{'server_type':'imap'}</field>
         </record>
         
         <menuitem 
@@ -143,8 +142,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="mailgate_message_tree_view"/>
-            <field name="context">{'type':'pop'}</field>
-            <field name="domain">[('type','=','pop')]</field>
+            <field name="context">{'server_type':'pop'}</field>
         </record>
         
         <menuitem 
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index 2860d5b9710..0d27c782105 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-01 10:01+0000\n"
+"PO-Revision-Date: 2010-11-02 07:21+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-02 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-11-03 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index 18ab1e967f0..a5ad860b4d7 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-29 09:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-02 13:54+0000\n"
+"Last-Translator: Jarosław Ogrodnik <nobodythere@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-11-03 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -180,7 +180,7 @@ msgstr "Parametr Procesu"
 #. module: fetchmail
 #: field:email.server,is_ssl:0
 msgid "SSL ?"
-msgstr ""
+msgstr "SSL ?"
 
 #. module: fetchmail
 #: selection:email.server,type:0
@@ -228,7 +228,7 @@ msgstr "Serwer POP"
 #. module: fetchmail
 #: field:email.server,port:0
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #. module: fetchmail
 #: model:ir.module.module,description:fetchmail.module_meta_information