diff --git a/addons/account/account.py b/addons/account/account.py
index 3abbe4cef2e..a2b8d228b1c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -424,7 +424,7 @@ class account_account(osv.osv):
             context = {}
         accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
-            if account.child_id and account.type != 'view':
+            if account.child_id and account.type not in ('view', 'consolidation'):
                 return False
         return True
 
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 1d1d51e5028..d89c7eb6e06 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 12:10+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-02-13 22:46+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-19 04:43+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4630,7 +4629,7 @@ msgstr "Fehler"
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
 msgid "End of period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: view:res.partner:0
@@ -9782,7 +9781,7 @@ msgstr "Rechnungspositionen"
 #: field:account.report.general.ledger,period_to:0
 #: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr "Ende der Periode"
+msgstr "Ende Periode"
 
 #. module: account
 #: code:addons/account/account_move_line.py:738
diff --git a/addons/anonymization/__terp__.py b/addons/anonymization/__openerp__.py
similarity index 100%
rename from addons/anonymization/__terp__.py
rename to addons/anonymization/__openerp__.py
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index e5cff943f2f..f8ac4c46885 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1473,7 +1473,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
             if not real_event_id in new_ids:
                 new_ids.append(real_event_id)
 
-        if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
+        if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
         updated_vals = self.onchange_dates(cr, uid, new_ids,
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
index 9b92a751cdc..065e69c171b 100644
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ b/addons/base_module_record/wizard/base_module_record_objects.py
@@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context):
         for s_id in search_ids:
              args=(cr.dbname,uid,obj_name,'copy',s_id,{},context)
              mod.recording_data.append(('query',args, {}, s_id))
-    return {'type': 'ir.actions.act_window_close'}
+    return {}
 
 def inter_call(self,cr,uid,data,context):
     res=base_module_save._create_module(self,cr, uid, data, context)
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index fdf444d58c1..b6c094c0a5c 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -77,7 +77,7 @@ intro_save_form = '''<?xml version="1.0"?>
     <newline/>
     <field name="module_file" filename="module_filename"/>
     <separator string="Information" colspan="4"/>
-     <label string="If you think your module could interest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
+     <label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
     <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
 </form>'''
 
@@ -161,7 +161,7 @@ def _create_module(self, cr, uid, data, context):
 } """ % data['form']
     filewrite = {
         '__init__.py':'#\n# Generated by the OpenERP module recorder !\n#\n',
-        '__terp__.py':_terp,
+        '__openerp__.py':_terp,
         dname+'_data.xml': res_xml
     }
     for name,datastr in filewrite.items():
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 64042c8954d..3dfdd7409ea 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -270,6 +270,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         defaults.update({
             'subject' : '%s: %s' % (_('Fwd'), lead.name),
             'body' : body,
+            'email_cc' : ''
         })
         return defaults
 
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 08d3db01703..6e182082aeb 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -47,7 +47,7 @@ class document_ftp_browse(osv.osv_memory):
                     url = url[:-1]
             else:
                 url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
-            res['url'] = 'ftp://%s@%s/%s'%(current_user.login, url, cr.dbname)
+            res['url'] = 'ftp://%s@%s'%(current_user.login, url)
         return res
 
     def browse_ftp(self, cr, uid, ids, context=None):
diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml
index 00429efc16c..75111e626e5 100644
--- a/addons/email_template/email_template_account_view.xml
+++ b/addons/email_template/email_template_account_view.xml
@@ -96,7 +96,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
             <field name="view_id" ref="email_template_account_tree" />
-            <field name="context">{'group_by': [], 'search_default_draft': 1, 'search_default_my': 1}</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_my': 1}</field>
             <field name="search_view_id" ref="view_email_template_account_search"/>
         </record>
 
diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
index bb84ad5d890..0d1b3b0a2bf 100644
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -105,7 +105,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_template_mailbox_tree" />
-            <field name="context">{'group_by': [], 'search_default_outbox': 1}</field>
+            <field name="context">{'search_default_outbox': 1}</field>
             <field name="help">An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically.</field>
             <field name="search_view_id" ref="view_email_template_mailbox_search"/>
         </record>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index a1209492490..41f84cfdedd 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -28,6 +28,7 @@ from poplib import POP3_SSL
 
 import netsvc
 from osv import osv, fields
+import tools
 
 logger = netsvc.Logger()
 
@@ -201,7 +202,7 @@ class email_server(osv.osv):
                     logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
 
             except Exception, e:
-                logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
+                logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
 
         return True
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c2b738351aa..cf7fe75e986 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -82,7 +82,6 @@
             <field name="name">hr.employee.tree</field>
             <field name="model">hr.employee</field>
             <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
                 <tree string="Employees">
                     <field name="name"/>
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index 27cd2f675b7..141d77c91c0 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2009-11-09 13:50+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-02-14 13:44+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:32+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: hr_timesheet
 #: model:product.template,name:hr_timesheet.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Pelayanan Timesheet"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
@@ -31,18 +31,18 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(Tetap kosongkan untuk waktu saat ini)"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr ""
+msgstr "Tidak ada karyawan yang didefinisikan  untuk  user Anda!"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -66,18 +66,18 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Berhenti Bekerja"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Karyawan Timesheet"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Status Pekerjaan yang dilakukan"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -96,12 +96,12 @@ msgstr ""
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Mon"
-msgstr ""
+msgstr "Senin"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in"
-msgstr ""
+msgstr "Login"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -115,23 +115,24 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Jumlah Minimum Analitik"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Timesheet Bulanan Karyawan"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Pekerjaan yang dilakukan  dalam periode terakhir"
 
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Error! Anda tidak dapat memilih  departemen  yang karyawan adalah manajer."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -186,7 +187,7 @@ msgstr ""
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Peringatan"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -197,32 +198,32 @@ msgstr ""
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "Sign In/Out By Project"
-msgstr ""
+msgstr "Sign In / Out Berdasarkan Proyek"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sat"
-msgstr ""
+msgstr "Sabtu"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:42
 #: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sun"
-msgstr ""
+msgstr "Minggu"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
 msgid "Print"
-msgstr ""
+msgstr "Cetak"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Baris Timesheet"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -233,25 +234,25 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Timesheet Bulanan Karyawan"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Tanggal Awal"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategori"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -265,6 +266,8 @@ msgid ""
 "Through Working Hours you can register your working hours by project every "
 "day."
 msgstr ""
+"Melalui Jam Kerja Anda dapat mendaftarkan jam kerja Anda menurut proyek "
+"setiap hari"
 
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
@@ -281,31 +284,46 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Modul ini menerapkan sistem Timesheet. Setiap karyawan yang dapat "
+"mengkodekan  dan\n"
+"melacak waktu mereka yang digunakan pada proyek yang berbeda. Sebuah proyek "
+"merupakan suatu\n"
+"akun analitik dan waktu yang dihabiskan untuk proyek menghasilkan biaya "
+"pada\n"
+"akun analitik.\n"
+"\n"
+"Banyak pelaporan tepat waktu dan pelacakan karyawan yang disediakan.\n"
+"\n"
+"Ia sepenuhnya terintegrasi dengan modul akuntansi biaya. Ini memungkinkan "
+"Anda\n"
+"untuk mengatur manajemen dengan adil.\n"
+"    "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Total biaya"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
 #: selection:hr.analytical.timesheet.users,month:0
 msgid "décembre"
-msgstr ""
+msgstr "Desember"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:39
 #: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
@@ -315,12 +333,12 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "Karyawan"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Status Berdasarkan Bulan"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 1d1742c0add..737652fbccd 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -61,23 +61,25 @@ class report_custom(report_rml):
         date_xml.append('</days>')
         date_xml.append('<cols>2.5cm%s,2cm</cols>\n' % (',0.7cm' * lengthmonth(som.year, som.month)))
 
-        # Computing the attendence by analytical account
-        cr.execute(
-            "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\
-            "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
-            "account_analytic_account as account, product_uom as unit "\
-            "where hr.line_id=line.id and line.account_id=account.id "\
-            "and product_uom_id = unit.id "\
-            "and line.user_id=%s and line.date >= %s and line.date < %s "
-            "order by line.date",
-            (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
-
         # Sum attendence by account, then by day
         accounts = {}
-        for presence in cr.dictfetchall():
-            day = int(presence['date'][-2:])
-            account = accounts.setdefault((presence['account_id'], presence['name']), {})
-            account[day] = account.get(day, 0.0) + presence['amount']
+        header_xml = ''
+        if user_id:
+            # Computing the attendence by analytical account
+            cr.execute(
+                "select line.date, (unit_amount * unit.factor) as amount, account_id, account.name "\
+                "from account_analytic_line as line, hr_analytic_timesheet as hr, "\
+                "account_analytic_account as account, product_uom as unit "\
+                "where hr.line_id=line.id and line.account_id=account.id "\
+                "and product_uom_id = unit.id "\
+                "and line.user_id=%s and line.date >= %s and line.date < %s "
+                "order by line.date",
+                (user_id, som.strftime('%Y-%m-%d'), eom.strftime('%Y-%m-%d')))
+
+            for presence in cr.dictfetchall():
+                day = int(presence['date'][-2:])
+                account = accounts.setdefault((presence['account_id'], presence['name']), {})
+                account[day] = account.get(day, 0.0) + presence['amount']
 
         xml = '''
         <time-element date="%s">
@@ -85,13 +87,14 @@ class report_custom(report_rml):
         </time-element>
         '''
         rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee')
-        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
-        header_xml = '''
-        <header>
-        <date>%s</date>
-        <company>%s</company>
-        </header>
-        ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
+        rml_obj = report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
+        if user_id:
+            header_xml = '''
+            <header>
+            <date>%s</date>
+            <company>%s</company>
+            </header>
+            ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
 
         account_xml = []
         for account, telems in accounts.iteritems():
diff --git a/addons/l10n_ca/i18n/ca.po b/addons/l10n_ca/i18n/ca.po
index 896eb07632c..deeadfb2c82 100644
--- a/addons/l10n_ca/i18n/ca.po
+++ b/addons/l10n_ca/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_ca
diff --git a/addons/l10n_de/i18n/gl.po b/addons/l10n_de/i18n/gl.po
index 96bb04d89aa..72e2fcb2e5a 100644
--- a/addons/l10n_de/i18n/gl.po
+++ b/addons/l10n_de/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2011-02-08 10:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-02-14 10:51+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galician <gl@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: 2011-02-09 04:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
@@ -33,7 +33,7 @@ msgstr "Cliente da Comunidade Europea (sen USt-ID)"
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr04
 msgid "Lieferant Ausland"
-msgstr ""
+msgstr "Proveedor Estranxeiro"
 
 #. module: l10n_de
 #: model:ir.module.module,shortdesc:l10n_de.module_meta_information
@@ -45,22 +45,22 @@ msgstr "Alemaña - SKR03 e SKR04"
 msgid ""
 "Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
 "SKR03."
-msgstr ""
+msgstr "Este módulo implementa un sistema contable Alemán basado no SKR03."
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr04
 msgid "Lieferant EU Unternehmen (mit USt-ID)"
-msgstr ""
+msgstr "Proveedores da UE (con CIF/NIF)"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr04
 msgid "Lieferant EU (ohne Ust-ID)"
-msgstr ""
+msgstr "Proveedores da UE (sen CIF/NIF)"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr03
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
 msgid "Kunde EU Unternehmen (mit USt-ID)"
-msgstr ""
+msgstr "Clientes da UE (con CIF/NIF)"
diff --git a/addons/l10n_es/i18n/gl.po b/addons/l10n_es/i18n/gl.po
new file mode 100644
index 00000000000..4804855c87b
--- /dev/null
+++ b/addons/l10n_es/i18n/gl.po
@@ -0,0 +1,49 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 11:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_es
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
+msgstr "Plan Contable Español (PGCE 2008)"
+
+#. module: l10n_es
+#: model:ir.module.module,description:l10n_es.module_meta_information
+msgid ""
+"Spanish Charts of Accounts (PGCE 2008)\n"
+"\n"
+"* Defines the following chart of account templates:\n"
+"        * Spanish General Chart of Accounts 2008.\n"
+"        * Spanish General Chart of Accounts 2008 for small and medium "
+"companies.\n"
+"* Defines templates for sale and purchase VAT.\n"
+"* Defines tax code templates.\n"
+"\n"
+"Note: You should install the l10n_ES_account_balance_report module\n"
+"for yearly account reporting (balance, profit & losses).\n"
+msgstr ""
+"Plan Contable Español (PGCE 200(\n"
+"\n"
+"* Define o seguinte plan de contas:\n"
+"        * Plan Contable Español 2008.\n"
+"        * Plan Contable Español 2008 para pequenas e medianas empresas.\n"
+"* Define as plantillas para os impostos de venta e compra.\n"
+"* Define as plantillas para os códigos dos impostos.\n"
+"\n"
+"Nota: Debería instalá-lo módulo \"l10n_ES_account_balance_report\"\n"
+"para os informes financieros anuales (balance, pérdidas e ganancias).\n"
diff --git a/addons/l10n_gr/i18n/ca.po b/addons/l10n_gr/i18n/ca.po
index 7e09f6702a3..622d05f5a06 100644
--- a/addons/l10n_gr/i18n/ca.po
+++ b/addons/l10n_gr/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_gr
diff --git a/addons/l10n_gr/i18n/gl.po b/addons/l10n_gr/i18n/gl.po
new file mode 100644
index 00000000000..c805697071f
--- /dev/null
+++ b/addons/l10n_gr/i18n/gl.po
@@ -0,0 +1,47 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 10:53+0000\n"
+"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
+"Language-Team: Galician <gl@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: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_gr
+#: model:ir.module.module,description:l10n_gr.module_meta_information
+msgid "This is the base module to manage the accounting chart for Greece."
+msgstr "Este é o módulo base para xestiona-lo plan contable de Grecia"
+
+#. module: l10n_gr
+#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
+msgid "Greece - minimal"
+msgstr "Grecia - mínimo"
+
+#. module: l10n_gr
+#: model:ir.actions.todo,note:l10n_gr.config_call_account_template_gr
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Xera un plan de contas a partir dun modelo xenérico. Pediráselle o nome da "
+"compañía, o modelo contable a seguir, o número de díxitos para xera-lo "
+"código das súas contas e da súa conta e divisa bancaria para crea-los "
+"diarios. Así, xerarase unha copia íntegra do modelo contable.\n"
+"\t Este é o mesmo asistente que se executa desde 'Xestión "
+"Financieira/Configuración/Contabilidade Financieira/Contas "
+"Financieiras/Xerar plan de contas dende un modelo base."
diff --git a/addons/l10n_gt/i18n/ca.po b/addons/l10n_gt/i18n/ca.po
index 538c6e259fe..a5327419770 100644
--- a/addons/l10n_gt/i18n/ca.po
+++ b/addons/l10n_gt/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_gt
diff --git a/addons/l10n_in/i18n/ca.po b/addons/l10n_in/i18n/ca.po
index e90a4c08243..be68e4ce026 100644
--- a/addons/l10n_in/i18n/ca.po
+++ b/addons/l10n_in/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_in
diff --git a/addons/l10n_ma/i18n/ca.po b/addons/l10n_ma/i18n/ca.po
index aa0ed89d6c9..a2d7e568bba 100644
--- a/addons/l10n_ma/i18n/ca.po
+++ b/addons/l10n_ma/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:38+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: l10n_ma
diff --git a/addons/l10n_ma/i18n/gl.po b/addons/l10n_ma/i18n/gl.po
new file mode 100644
index 00000000000..8272eec36cd
--- /dev/null
+++ b/addons/l10n_ma/i18n/gl.po
@@ -0,0 +1,89 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-14 11:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-02-15 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
+msgstr "¡O nome da variable debe ser único!"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,definition:0
+msgid "Definition"
+msgstr "Definición"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr "Informe para 'l10n_ma_kzc'"
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,name:0
+#: field:l10n.ma.report,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: l10n_ma
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid ""
+"Ce  Module charge le modèle du plan de comptes standard Marocain et permet "
+"de générer les états comptables aux normes marocaines (Bilan, CPC (comptes "
+"de produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet "
+"d'expertise comptable Seddik au cours du troisième trimestre 2010"
+msgstr ""
+"Este módulo soporta o modelo do Plan Contable estándar de Marrocos e pode "
+"xerar extractos contables estándar (balance, CPC (contas de ingresos e "
+"gastos), balance xeral con ata 6 columnas de contabilidade acumulada...). A "
+"integración contable validouse coa axuda da firma contable Seddik no "
+"terceiro cuarto do 2010."
+
+#. module: l10n_ma
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
+msgstr "Liñas"
+
+#. module: l10n_ma
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
+msgstr "¡O código do informe debe ser único!"
+
+#. module: l10n_ma
+#: model:ir.model,name:l10n_ma.model_l10n_ma_line
+msgid "Report Lines for l10n_ma"
+msgstr "Liñas de informe para 'l10n_ma'"
+
+#. module: l10n_ma
+#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
+msgid "Maroc - Plan Comptable Général"
+msgstr "Marrocos - Plan Contable Xeral"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
+msgstr "Informe"
+
+#. module: l10n_ma
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
+msgstr "Nome da Variable"
diff --git a/addons/mail_gateway/i18n/ca.po b/addons/mail_gateway/i18n/ca.po
new file mode 100644
index 00000000000..7704546c71f
--- /dev/null
+++ b/addons/mail_gateway/i18n/ca.po
@@ -0,0 +1,356 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-13 21:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: mail_gateway
+#: field:mailgate.message,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
+#, python-format
+msgid "Method is not implemented"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,message_id:0
+msgid "Message Id"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,ref_id:0
+msgid "Reference Id"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgateway History"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:249
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail_gateway
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,message_id:0
+msgid "Message Id on Email."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_to:0
+msgid "Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Details"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Mailgate History"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_email_server_tools
+msgid "Email Server Tools"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Followers"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_res_partner
+#: view:mailgate.message:0
+#: field:mailgate.message,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:242
+#, python-format
+msgid " wrote on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,description:0
+#: field:mailgate.message,message:0
+msgid "Description"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,references:0
+msgid "References emails."
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_cc:0
+msgid "Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,shortdesc:mail_gateway.module_meta_information
+msgid "Email Gateway System"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,model:0
+msgid "Object Name"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Partner Name"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
+msgid "Mailgateway Threads"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:247
+#, python-format
+msgid "Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_message
+#: view:mailgate.message:0
+#: field:res.partner,emails:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:252
+#, python-format
+msgid "Stage"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:250
+#, python-format
+msgid " added note on "
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_from:0
+msgid "Email From"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_message
+msgid "Mailgateway Message"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.action_view_mail_message
+#: field:mailgate.thread,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,user_id:0
+msgid "User Responsible"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:248
+#, python-format
+msgid "Converted to Opportunity"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_bcc:0
+msgid "Bcc"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,history:0
+msgid "Is History?"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,email_bcc:0
+msgid "Blind Carbon Copy Email Recipients"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "mailgate message"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:148
+#: view:mailgate.thread:0
+#: view:res.partner:0
+#, python-format
+msgid "History"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.model,name:mail_gateway.model_mailgate_thread
+#: view:mailgate.thread:0
+msgid "Mailgateway Thread"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.actions.act_window,name:mail_gateway.act_res_partner_open_email
+#: view:mailgate.message:0
+#: field:mailgate.message,attachment_ids:0
+#: view:mailgate.thread:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Open Document"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.thread:0
+msgid "Email Details"
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:246
+#, python-format
+msgid " on "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Month"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:561
+#, python-format
+msgid "receive"
+msgstr ""
+
+#. module: mail_gateway
+#: model:ir.module.module,description:mail_gateway.module_meta_information
+msgid ""
+"The generic email gateway system allows to send and receive emails\n"
+"    * History for Emails\n"
+"    * Easy Integration with any Module"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:255
+#, python-format
+msgid "Changed Status to: "
+msgstr ""
+
+#. module: mail_gateway
+#: field:mailgate.message,display_text:0
+msgid "Display Text"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail_gateway
+#: code:addons/mail_gateway/mail_gateway.py:253
+#, python-format
+msgid "Changed Stage to: "
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail_gateway
+#: view:mailgate.message:0
+#: field:mailgate.message,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail_gateway
+#: help:mailgate.message,ref_id:0
+msgid "Message Id in Email Server."
+msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/i18n/ca.po b/addons/marketing_campaign_crm_demo/i18n/ca.po
index 873f13aa695..9475c4bc0c4 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ca.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/outlook/i18n/ca.po b/addons/outlook/i18n/ca.po
index 25abe5874e2..78bffa868a2 100644
--- a/addons/outlook/i18n/ca.po
+++ b/addons/outlook/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: outlook
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 1d264a91674..a05220ad7e0 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -167,10 +167,6 @@ global name
 name=''
 global email
 email=''
-global web_server
-web_server = 'localhost'
-global web_server_port
-web_server_port = '8080'
 global country_ref
 country_ref = ""
 global state_ref
@@ -198,7 +194,7 @@ def resetConnAttribs(window):
     config = window.manager.LoadConfig()
     NewConn.setitem('_server', config['server'])
     NewConn.setitem('_port', config['port'])
-#    NewConn.setitem('protocol', config['protocol'])
+    NewConn.setitem('protocol', config['protocol'])
     NewConn.setitem('_uri', "http://" + config['server'] + ":" + str(config['port']))
     NewConn.setitem('_obj_list', config['objects'])
     NewConn.setitem('_dbname', config['database'])
@@ -207,6 +203,7 @@ def resetConnAttribs(window):
     NewConn.setitem('_login', str(config['login']))
     NewConn.setitem('_webserver',manager.config['webserver'])
     NewConn.setitem('_webport',manager.config['webport'])
+    NewConn.setitem('_webportocol',manager.config['webportocol'])
     return
 
 def setConnAttribs(server, port, manager):
@@ -228,6 +225,7 @@ def setConnAttribs(server, port, manager):
     NewConn.setitem('_obj_list', manager.config['objects'])
     NewConn.setitem('_webserver',manager.config['webserver'])
     NewConn.setitem('_webport',manager.config['webport'])
+    NewConn.setitem('_webprotocol',manager.config['webprotocol'])
     return
 
 def getConnAttributes(manager):
@@ -241,7 +239,9 @@ def getConnAttributes(manager):
     manager.config['login'] = NewConn.getitem('_login')
     manager.config['webserver'] = NewConn.getitem('_webserver')
     manager.config['webport'] = NewConn.getitem('_webport')
+    manager.config['webprotocol'] = NewConn.getitem('_webprotocol')
     return
+
 def setWebConnAttribs(server, port, manager):
     manager.config = manager.LoadConfig()
     NewConn.setitem('_webserver',server)
@@ -272,6 +272,11 @@ class OKButtonProcessor(ButtonProcessor):
 
     def OnClicked(self, id):
         server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
+        protocol = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[3])
+        if not protocol:
+            win32ui.MessageBox("Invalid Protocol !\nPlease select Protocol from Connection Protocol List.", "OpenERP Connection", flag_excl)
+            return
+        NewConn.setitem('protocol', protocol)
         try:
             port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
         except ValueError, e:
@@ -306,9 +311,16 @@ class WEBOKButtonProcessor(ButtonProcessor):
         ControlProcessor.__init__(self, window, control_ids)
 
     def OnClicked(self, id):
-        global web_server
-        global web_server_port
+#        global web_server
+#        global web_server_port
         server = win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[0])
+        web_protocol = 'http:\\\\'
+
+        hwnd = win32gui.GetDlgItem(self.window.hwnd, self.other_ids[2])
+        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
+        if chk:
+            web_protocol = 'https:\\\\'
+        NewConn.setitem('_webprotocol', web_protocol)
         try:
             port = int(win32gui.GetDlgItemText(self.window.hwnd, self.other_ids[1]))
         except ValueError:
@@ -318,10 +330,21 @@ class WEBOKButtonProcessor(ButtonProcessor):
             win32ui.MessageBox("Invalid web Server address.", "OpenERP Connection", flag_excl)
             return
         setWebConnAttribs(server, port, self.mngr)
-        web_server = server
-        web_server_port = port
         win32gui.EndDialog(self.window.hwnd, id)
 
+class WEBCHKProcessor(ButtonProcessor):
+    def __init__(self, window, control_ids):
+        self.mngr = window.manager
+        ControlProcessor.__init__(self, window, control_ids)
+
+    def OnClicked(self, id):
+        web_protocol = 'http:\\\\'
+        hwnd = self.GetControl()
+        chk = win32gui.SendMessage(hwnd, win32con.BM_GETCHECK)
+        if chk:
+            web_protocol = 'https:\\\\'
+        NewConn.setitem('_webprotocol', web_protocol)
+
 class MessageProcessor(ControlProcessor):
     def Init(self):
         text = "  This Outlook Plugin for OpenERP has been developed by OpenERP s.a.\n\n \
@@ -851,9 +874,6 @@ def CreateContact(btnProcessor,*args):
     win32gui.EndDialog(btnProcessor.window.hwnd, btnProcessor.id)
 
 def SetAllText(txtProcessor,*args):
-    # Set values for url, uname, pwd from config file
-    global web_server
-    global web_server_port
     url = NewConn.getitem('_uri')
     tbox = txtProcessor.GetControl()
     win32gui.SendMessage(tbox, win32con.WM_SETTEXT, 0, str(url))
@@ -866,9 +886,7 @@ def SetAllText(txtProcessor,*args):
     pwd = NewConn.getitem('_pwd')
     win32gui.SendMessage(passbox, win32con.WM_SETTEXT, 0, str(pwd))
     serverBox = txtProcessor.GetControl(txtProcessor.other_ids[2])
-    web_server = NewConn.getitem('_webserver')
-    web_server_port = NewConn.getitem('_webport')
-    webstr = "http:\\\\"+str(web_server)+":"+str(web_server_port)
+    webstr = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
     win32gui.SendMessage(serverBox, win32con.WM_SETTEXT, 0, str(webstr))
 
 def SetDefaultList(listProcessor,*args):
@@ -1378,29 +1396,24 @@ def OpenPartnerForm(txtProcessor,*args):
     partner_text = ""
     try:
     	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
-        sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
+        sender_mail = ustr(mail.SenderEmailAddress).strip()
     except Exception:
     	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
     	pass
     vals = NewConn.SearchPartner(sender_mail)
-    if vals:
+    if not vals:
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+"  email address, but no partner is linked to contact>")
         txtProcessor.init_done=True
         return
-    if vals == None:
-    	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< No Partner found linked to "+str(partner_text)+"  email address.>")
-    	txtProcessor.init_done=True
-    	return
-    global web_server
-    global web_server_port
-    if web_server.strip() == "" or web_server.strip() == "http:\\\\":
+
+    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
     	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
     	txtProcessor.init_done=True
     	return
     try:
         import urllib
         next =  urllib.urlencode({'next' : '/openerp/form/view?model=res.partner&id=' +str(vals) })
-        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
         linktopartner = weburl + '?' + next
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, str(linktopartner))
     except Exception,e:
@@ -1416,8 +1429,8 @@ def SerachOpenDocuemnt(txtProcessor,*args):
     b = check()
     if not b:
         return
-    global web_server
-    global web_server_port
+#    global web_server
+#    global web_server_port
     #Reading Current Selected Email.
     ex = txtProcessor.window.manager.outlook.ActiveExplorer()
     assert ex.Selection.Count == 1
@@ -1425,8 +1438,8 @@ def SerachOpenDocuemnt(txtProcessor,*args):
     #Acquiring control of the text box
     link_box = txtProcessor.GetControl()
     #Checking for the web server Parameters
-    if web_server.strip() == "" or web_server.strip() == "http:\\\\":
-        win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
+    if NewConn.getitem('_webserver') == "" or NewConn.getitem('_webserver') in ["http:\\\\","https:\\\\"]:
+        win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, " <Invalid Server Address>")
         txtProcessor.init_done=True
         return
     linktodoc = ""
@@ -1460,7 +1473,7 @@ def SerachOpenDocuemnt(txtProcessor,*args):
     try:
         import urllib
         next =  urllib.urlencode({'next' : '/openerp/form/view?model='+vals[0][1]+'&id='+str(vals[1][1])})
-        weburl = 'http://'+web_server+':'+str(web_server_port)+'/'
+        weburl = NewConn.getitem('_webprotocol')+NewConn.getitem('_webserver')+":"+str(NewConn.getitem('_webport'))
         linktodoc = weburl + '?' + next
         win32gui.SendMessage(link_box, win32con.WM_SETTEXT, 0, str(linktodoc))
     except Exception,e:
@@ -1611,7 +1624,6 @@ def SetStateList(listProcessor,*args):
     listProcessor.init_done = True
 
 def SelectStateFromList(btnProcessor,*args):
-
     hwndList = win32gui.GetDlgItem(btnProcessor.window.hwnd, btnProcessor.other_ids[0])
     sel_count = win32gui.SendMessage(hwndList, commctrl.LVM_GETSELECTEDCOUNT)
     sel_text = ''
@@ -1645,7 +1657,41 @@ def SelectStateFromList(btnProcessor,*args):
         win32ui.MessageBox("Multiple selection is not allowed.","Search Fed.State")
         return
 
+def SetWebDefaultVals(txtProcessor,*args):
+    import win32con
+    #Acquiring control of the text box
+    chk_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
+    try:
+        web_server = NewConn.getitem('_webserver')
+        web_port =  NewConn.getitem('_webport')
+        web_protocol =  NewConn.getitem('_webprotocol')
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
+        if web_protocol == "https:\\\\":
+            win32gui.SendMessage(chk_hwnd , win32con.BM_SETCHECK, 1, 0);
+    except Exception, e:
+        txtProcessor.init_done=True
+    #Reading Current Selected Email.
+    txtProcessor.init_done=True
 
+def SetServerDefaultVals(txtProcessor,*args):
+    import win32con
+    select = 1
+    #Acquiring control of the text box
+    cbprotocol_hwnd =  win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
+    try:
+        web_server = NewConn.getitem('_server')
+        web_port =  NewConn.getitem('_port')
+        web_protocol =  NewConn.getitem('protocol')
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.control_id, web_server)
+        win32gui.SetDlgItemText(txtProcessor.window.hwnd, txtProcessor.other_ids[0], web_port)
+        if web_protocol == "XML-RPCS":
+            select = 2
+        win32gui.SendMessage(cbprotocol_hwnd, win32con.CB_SETCURSEL, select, 0)
+    except Exception, e:
+        txtProcessor.init_done=True
+    #Reading Current Selected Email.
+    txtProcessor.init_done=True
 
 dialog_map = {
                 "IDD_MANAGER" :            (
@@ -1679,8 +1725,14 @@ dialog_map = {
                 ),
 
                 "IDD_SERVER_PORT_DIALOG" : (
+                    (TextProcessor,           "ID_SERVER ID_PORT ID_DROPDOWNLIST_PROTOCOL", SetServerDefaultVals, ()),
+                    (ProtocolComboProcessor,  "ID_DROPDOWNLIST_PROTOCOL", GetConn, ()),
                     (CloseButtonProcessor,    "IDCANCEL"),
-                    (OKButtonProcessor,  "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL"),
+                    (OKButtonProcessor,       "IDOK ID_SERVER ID_PORT IDR_XML_PROTOCOL ID_DROPDOWNLIST_PROTOCOL"),
+#
+#                    (RadioButtonProcessor,    "IDR_XML_PROTOCOL", GetConn, ()),
+#                    (RadioButtonProcessor,    "IDR_XMLS_PROTOCOL", GetConn, ()),
+#                    (RadioButtonProcessor,    "IDR_NETRPC_PROTOCOL", GetConn, ()),
                 ),
 
                 "IDD_SYNC" :               (
@@ -1738,8 +1790,11 @@ dialog_map = {
                     (TextProcessor,             "IDEB_OPENDOC_LINK_TEXT", SerachOpenDocuemnt,()),
                 ),
                 "IDD_WEB_SERVER_PORT_DIALOG" :(
+                     (TextProcessor,             "IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE", SetWebDefaultVals, ()),
                      (CloseButtonProcessor,      "IDCANCEL"),
-                     (WEBOKButtonProcessor,      "ID_WEB_OK IDET_WEB_SERVER IDET_WEB_PORT")
+                     (WEBOKButtonProcessor,      "ID_WEB_OK IDET_WEB_SERVER IDET_WEB_PORT IDCB_WEB_SECURE"),
+                     (WEBCHKProcessor,           "IDCB_WEB_SECURE"),
+
                 ),
                 "IDD_SELECT_COUNTRY" : (
                     (CommandButtonProcessor,     "IDPB_SEARCH_COUNTRY IDET_COUNTRY_SEARCH_NAME IDC_LIST_COUNTRY" , SearchCountry, ()),
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
index ac64724da84..7a4970491b0 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/opt_processors.py
@@ -225,12 +225,6 @@ class CSComboProcessor(ComboProcessor):
         try:
             list=['CRM Lead']#, 'CRM Helpdesk', 'CRM Lead', 'CRM Meeting', 'CRM Opportunity', 'CRM Phonecall']
             objlist = conn.GetAllObjects()
-#            if 'crm.claim' in objlist:
-#                list.append('CRM Claim')
-#            if 'crm.helpdesk' in objlist:
-#                list.append('CRM Helpdesk')
-#            if 'crm.fundraising' in objlist:
-#                list.append('CRM Fundraising')
             if'hr.applicant' in objlist:
                 list.append('HR Applicant')
             if'project.issue' in objlist:
@@ -305,4 +299,20 @@ class GroupProcessor(OptionControlProcessor):
     def UpdateControl_FromValue(self):
         pass
     def UpdateValue_FromControl(self):
-        pass
\ No newline at end of file
+        pass
+
+
+class ProtocolComboProcessor(ComboProcessor):
+    def Init(self):
+        self.UpdateControl_FromValue()
+
+    def UpdateControl_FromValue(self):
+        combo = self.GetControl()
+        list = ['XML-RPC', 'XML-RPCS']
+        win32gui.ShowWindow(combo, True)
+        win32gui.SendMessage(combo, win32con.CB_RESETCONTENT, 0, 0);
+        for item in list:
+            win32gui.SendMessage(combo, win32con.CB_ADDSTRING, 0, str(item))
+        if sel == -1:
+            win32gui.SendMessage(combo, win32con.CB_SETCURSEL, 1, 0)
+        self.active_control_id = self.control_id
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
index a816b9838ab..2bf0d1aec48 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.h
@@ -208,6 +208,8 @@
 #define IDPB_NC_SEARCH_STATE1			2107
 #define IDET_NC_PARTNER_COUNTRY			2108
 #define IDPB_NC_SEARCH_COUNTRY1			2109
+#define ID_DROPDOWNLIST_PROTOCOL		2110
+#define IDCB_WEB_SECURE					2111
 // Next default values for new objects
 //
 #ifdef APSTUDIO_INVOKED
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
index 323f93e4cc2..247b9c7a533 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.py
@@ -1,11 +1,11 @@
-#C:\workspace\openerp-outlook-plugin-lst\dialogs\resources\dialogs.py
-#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin-lst\dialogs\resources\dialogs.rc instead.
-_rc_size_=15985
-_rc_mtime_=1289450705
+#C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.py
+#This is a generated file. Please edit C:\workspace\openerp-outlook-plugin\dialogs\resources\dialogs.rc instead.
+_rc_size_=16350
+_rc_mtime_=1296563638
 class FakeParser:
-	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 2091, (60, 35, 45, 14), 1342242817]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 55), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 35, 45, 14), 1342242816], [128, 'OK', 1, (60, 35, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
-	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
-	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
+	dialogs = {'IDD_OPEN_DOCUEMNT_DIALOG': [['Open Document', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Document : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2086, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 14), 1342242816]], 'IDD_VIEW_PARTNER_DIALOG': [['Open Contact', (0, 0, 350, 215), -1865940928, 1024, (8, 'Tahoma')], [130, 'Email ID : ', -1, (32, 17, 40, 12), 1342177280], [129, '', 2051, (70, 15, 200, 12), 1350631552], [128, 'Search Contact ', 2052, (280, 15, 60, 14), 1342242816], [130, 'Partner Name : ', -1, (13, 42, 50, 17), 1342177280], [129, '', 2064, (70, 42, 150, 12), 1350568064], [128, 'Search Partner', 2070, (225, 41, 60, 14), 1342242816], [128, 'New Partner', 2093, (290, 41, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 65, 175, 125), 1342177287], [130, 'Contact Name : ', -1, (18, 83, 50, 17), 1342177280], [129, '', 2046, (76, 82, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 97, 50, 17), 1342177280], [129, '', 2053, (76, 96, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 112, 50, 17), 1342177280], [129, '', 2054, (76, 111, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 126, 50, 14), 1342177280], [129, '', 40010, (76, 125, 100, 12), 1350631552], [130, 'City : ', -1, (18, 140, 50, 17), 1342177280], [129, '', 40011, (76, 139, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 154, 50, 17), 1342177280], [129, '', 2062, (76, 153, 54, 12), 1350568064], [128, 'Search', 2104, (135, 153, 40, 12), 1342242816], [130, 'Country :', -1, (18, 169, 35, 17), 1342177280], [129, '', 2063, (76, 168, 54, 12), 1350568064], [128, 'Search', 2105, (135, 168, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 65, 152, 125), 1342177287], [130, 'Phone : ', -1, (194, 83, 30, 17), 1342177280], [129, '', 2048, (224, 82, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 97, 30, 17), 1342177280], [129, '', 2050, (224, 96, 100, 12), 1350631552], [130, 'Email : ', -1, (194, 111, 30, 17), 1342177280], [129, '', 2058, (224, 110, 100, 12), 1350568064], [130, 'Fax : ', -1, (194, 125, 30, 17), 1342177280], [129, '', 2047, (224, 124, 100, 12), 1350631552], [128, 'Create a New Contact', 2071, (124, 195, 82, 14), 1342242816], [128, 'Save', 2059, (213, 195, 60, 14), 1342242816], [128, 'Cancel', 2, (281, 195, 60, 14), 1342242816]], 'IDD_OPEN_PARTNER_DIALOG': [['Open Partner', (0, 0, 200, 65), -1865940928, 1024, (8, 'Tahoma')], [130, 'Link to Partner : (If this link does not opens directly in web browser then copy an the link and paste in web browser.) ', -1, (5, 3, 190, 25), 1342177280], [129, '', 2085, (5, 31, 190, 12), 1350631552], [128, 'Ok', 2, (150, 45, 45, 13), 1342242816]], 'IDD_SELECT_STATE': [['Search Fed. State', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2100, (55, 10, 100, 12), 1350631552], [128, 'Search', 40012, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2101, (8, 40, 200, 185), 1353711657], [128, 'Select', 2102, (170, 230, 40, 14), 1342242816]], 'IDD_GENERAL': [['Connection Parameters', (0, 0, 430, 210), 1355284544, None, (8, 'Tahoma')], [128, 'Connection Parameters', 2024, (10, 10, 250, 130), 1342177287], [130, 'Server   : ', -1, (30, 30, 100, 17), 1342177280], [129, '', 2003, (85, 30, 120, 12), 1350633472], [128, 'Change', 2021, (210, 30, 30, 13), 1342242816], [130, 'Database : ', -1, (30, 50, 100, 17), 1342177280], [133, '', 2004, (85, 50, 154, 40), 1344339971], [130, 'Username : ', -1, (30, 70, 100, 17), 1342177280], [129, '', 2005, (85, 70, 154, 12), 1350631552], [130, 'Password : ', -1, (30, 90, 100, 17), 1342177280], [129, '', 2006, (85, 90, 154, 12), 1350631584], [128, 'Connect', 2007, (179, 110, 60, 13), 1342242816], [128, 'WebServer Parameters', 2024, (270, 10, 150, 130), 1342177287], [130, 'Server : ', -1, (280, 30, 50, 15), 1342177280], [129, '', 2080, (310, 29, 90, 12), 1350568064], [128, 'Change', 2082, (295, 50, 50, 12), 1342242816], [128, 'Connect', 2083, (350, 50, 50, 12), 1342242816]], 'IDD_OBJECT_SETTINGS': [['Documents Setting', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'Document Attributes', 2024, (2, 2, 343, 32), 1342177287], [130, 'Title:', -1, (5, 16, 30, 17), 1342177280], [129, '', 2013, (22, 14, 57, 12), 1350631552], [130, 'Document Name:', -1, (83, 16, 60, 17), 1342177280], [129, '', 2014, (138, 14, 57, 12), 1350631552], [130, 'Image:', -1, (200, 16, 22, 17), 1342177280], [129, '', 2015, (223, 14, 57, 12), 1350631552], [128, 'Load Image', 2010, (289, 13, 50, 15), 1342242816], [128, 'Add', 2011, (350, 13, 38, 15), 1342242816], [128, 'Delete', 2012, (392, 13, 38, 15), 1342242816], ['SysListView32', 'List1', 2016, (8, 40, 535, 160), 1353711657]], 'IDD_NEW_PARTNER_DIALOG': [['Create a New Partner', (0, 0, 140, 40), -1865940928, 1024, (8, 'Tahoma')], [130, 'Name : ', -1, (5, 3, 100, 17), 1342177280], [129, '', 2036, (40, 3, 94, 12), 1350631552], [128, 'Cancel', 2, (90, 22, 45, 14), 1342242816], [128, 'Save', 2035, (40, 22, 45, 14), 1342242817]], 'IDD_MANAGER': [['OpenERP Configuration', (0, 0, 460, 260), -1865940800, None, (8, 'Tahoma')], [128, 'Close', 2008, (400, 239, 50, 14), 1342177281], ['SysTabControl32', '', 1068, (8, 7, 440, 228), 1342177280], ['SysListView32', '', 2016, (0, 0, 0, 0), 1353711657]], 'IDD_WEB_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 80), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2089, (40, 3, 100, 12), 1350631552], [130, 'Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2090, (40, 18, 100, 12), 1350631552], [128, 'Close', 2, (110, 50, 45, 14), 1342242816], [128, 'OK', 2091, (50, 50, 50, 14), 1342242817], [128, 'SSL (https)', 2111, (20, 35, 100, 14), 1342242819]], 'IDD_ABOUT': [['About', (0, 0, 430, 210), 1355284672, 1024, (8, 'Tahoma')], [128, 'About Plugin', -1, (7, 3, 422, 200), 1342177287], [130, '1062', 1062, (60, 30, 20, 20), 1342179342], [130, '', 2028, (80, 90, 300, 100), 1342177280]], 'IDD_NEW_CONTACT_DIALOG': [['Create a New Contact', (0, 0, 350, 180), -1865940928, 1024, (8, 'Tahoma')], [130, 'Select Partner : ', -1, (13, 20, 50, 17), 1342177280], [129, '', 2079, (70, 18, 150, 12), 1350568064], [128, 'Search Partner', 2033, (225, 17, 60, 14), 1342242816], [128, 'New Partner', 2092, (290, 17, 50, 14), 1342242816], [128, 'Postal Address ', 2024, (10, 35, 175, 123), 1342177287], [130, 'Contact Name : ', -1, (18, 53, 100, 17), 1342177280], [129, '', 40005, (76, 52, 100, 12), 1350631552], [130, 'Street : ', -1, (18, 67, 40, 17), 1342177280], [129, '', 2062, (76, 66, 100, 12), 1350631552], [130, 'Street2 : ', -1, (18, 81, 40, 17), 1342177280], [129, '', 2063, (76, 80, 100, 12), 1350631552], [130, 'Zip : ', -1, (18, 94, 50, 17), 1342177280], [129, '', 2068, (76, 93, 100, 12), 1350631552], [130, 'City : ', -1, (18, 106, 50, 17), 1342177280], [129, '', 2067, (76, 107, 100, 12), 1350631552], [130, 'Fed. State : ', -1, (18, 134, 50, 15), 1342177280], [129, '', 2106, (76, 135, 54, 12), 1350568064], [128, 'Search', 2107, (135, 136, 40, 12), 1342242816], [130, 'Country :', -1, (18, 121, 35, 15), 1342177280], [129, '', 2108, (76, 122, 54, 12), 1350568064], [128, 'Search', 2109, (135, 121, 40, 12), 1342242816], [128, 'Communication ', 2024, (188, 35, 150, 123), 1342177287], [130, 'Office : ', -1, (194, 53, 30, 17), 1342177280], [129, '', 40006, (224, 52, 100, 12), 1350631552], [130, 'Mobile : ', -1, (194, 67, 30, 17), 1342177280], [129, '', 40007, (224, 66, 100, 12), 1350631552], [130, 'Fax : ', -1, (194, 81, 30, 17), 1342177280], [129, '', 2066, (224, 80, 100, 12), 1350631552], [130, 'Email  : ', -1, (194, 95, 30, 17), 1342177280], [129, '', 40008, (224, 94, 100, 12), 1350631552], [128, 'Cancel', 2, (290, 162, 45, 13), 1342242816], [128, 'Save', 40009, (240, 162, 45, 13), 1342242816]], 'IDD_SERVER_PORT_DIALOG': [['OpenERP Connection', (0, 0, 160, 90), -1865940928, 1024, (8, 'Tahoma')], [130, 'Server : ', -1, (5, 3, 150, 17), 1342177280], [129, '', 2001, (45, 3, 100, 12), 1350631552], [130, '  Port   : ', -1, (5, 18, 100, 17), 1342177280], [129, '', 2002, (45, 18, 100, 12), 1350631552], [128, '', 2024, (5, 35, 150, 5), 1342177287], [130, 'Protocol Connection :', -1, (5, 45, 80, 17), 1342177280], [133, '', 2110, (75, 43, 75, 50), 1344339971], [128, 'Close', 2, (60, 70, 45, 14), 1342242816], [128, 'OK', 1, (110, 70, 45, 14), 1342242817]], 'IDD_SELECT_PARTNER': [['Search Partner', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2076, (55, 10, 100, 12), 1350631552], [128, 'Search', 2077, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2072, (8, 40, 200, 185), 1353711657], [128, 'Create New Partner', 2078, (10, 230, 100, 14), 1342242816], [128, 'Select', 2075, (170, 230, 40, 14), 1342242816]], 'IDD_SYNC': [['Push to OpenERP', (0, 0, 470, 320), -1865940928, 1024, (8, 'Tahoma')], [128, 'Link to an Existing Documents ', 2024, (8, 5, 250, 290), 1342242823], [130, 'Search : ', -1, (15, 17, 40, 12), 1342177280], [129, '', 40003, (60, 15, 120, 12), 1350631552], [128, 'Search', 40004, (187, 15, 40, 14), 1342242816], [130, 'Documents : ', -1, (15, 140, 100, 14), 1342177280], ['SysListView32', 'List1', 2026, (15, 150, 234, 110), 1350631433], [128, 'Push', 2019, (160, 270, 85, 14), 1342242816], [128, ' Create a New Document ', 2024, (263, 5, 202, 100), 1342242823], [130, 'Type of Document : ', -1, (266, 25, 100, 12), 1342177280], [133, '', 2025, (332, 24, 75, 45), 1344339971], [128, 'Create', 2020, (412, 23, 50, 14), 1342242816], [128, ' Create a New Contact ', 2024, (263, 110, 202, 185), 1342242823], [130, 'Create a New Contact : ', -1, (280, 140, 100, 12), 1342177280], [128, 'Create Contact', 2018, (360, 138, 60, 14), 1342242816], [128, 'Close', 2, (385, 300, 60, 14), 1342242816]], 'IDD_SELECT_COUNTRY': [['Search Country', (0, 0, 220, 250), -1865940928, 1024, (8, 'Tahoma')], [130, 'Enter Name : ', -1, (8, 12, 80, 17), 1342177280], [129, '', 2095, (55, 10, 100, 12), 1350631552], [128, 'Search', 2098, (160, 10, 50, 14), 1342242816], ['SysListView32', 'List1', 2096, (8, 40, 200, 185), 1353711657], [128, 'Select', 2097, (170, 230, 40, 14), 1342242816]]}
+	ids = {'IDC_BUT_DEL_OBJECT': 2012, 'IDD_OPEN_PARTNER_DIALOG': 2084, 'IDD_SELECT_STATE': 2099, 'IDC_DELAY1_SLIDER': 1056, 'IDC_PROGRESS': 1000, 'IDD_MANAGER': 101, 'IDC_ABOUT': 2028, 'IDD_DIAGNOSTIC': 113, 'IDET_PARTNER_COUNTRY': 2063, 'IDD_TRAINING': 102, 'ID_CONTACT_EMAIL_TEXT': 40008, 'IDC_DELAY2_TEXT': 1059, 'IDC_DELAY1_TEXT': 1057, 'IDD_WIZARD': 114, 'IDC_CHKBX': 2023, 'IDC_STATIC_HAM': 1002, 'IDC_PROGRESS_TEXT': 1001, 'IDR_XMLS_PROTOCOL': 2042, 'IDD_GENERAL': 108, 'IDD_ABOUT': 2027, 'IDD_SYNC': 40002, 'IDC_TAB': 1068, 'IDC_FOLDER_UNSURE': 1033, '_APS_NEXT_SYMED_VALUE': 101, 'IDC_VERBOSE_LOG': 1061, 'IDC_EDIT1': 1094, 'IDC_BROWSE': 1037, 'ID_DB_DROPDOWNLIST': 2004, 'IDC_BACK_BTN': 1069, 'ID_CONTACT_NAME_TEXT': 40005, 'IDPB_PARTNER_SEARCH': 2077, 'IDD_WIZARD_FINISHED_UNCONFIGURED': 119, 'IDC_ACTION_CERTAIN': 1025, 'IDC_BUT_ACT_ALL': 1019, 'IDD_FILTER_NOW': 104, 'IDET_WED_SERVER': 2080, 'ID_WEB_OK': 2091, 'ID_PROTOCOL_GRP': 2040, 'IDC_HEADER': 2017, 'IDC_MARK_SPAM_AS_READ': 1047, 'IDPB_NEW_PARTNER_BUTTON': 2092, 'ID_PARTNER_NAME_TEXT': 2036, 'IDC_RECOVER_RS': 1075, 'IDC_NAME_LIST1': 2037, 'ID_CONTACT_OFFICE_TEXT': 40006, 'IDC_STATIC': -1, 'IDC_PAGE_PLACEHOLDER': 1078, 'IDC_BROWSE_WATCH': 1039, 'IDET_ZIP': 40010, 'IDET_PARTNER_CITY': 40011, 'IDET_PARTNER_LINK_TEXT': 2085, 'IDC_FOLDER_HAM': 1083, 'IDC_LIST_COUNTRY': 2096, 'IDD_WIZARD_FOLDERS_REST': 117, 'IDC_SHOW_DATA_FOLDER': 1071, 'IDC_BUT_ACT_SCORE': 1018, 'IDET_STATE_SEARCH_NAME': 2100, 'IDET_WEB_SERVER': 2089, '_APS_NEXT_RESOURCE_VALUE': 128, 'ID_SET_WEB_CONNECTION': 2082, 'ID_DROPDOWNLIST_PROTOCOL': 2110, 'IDC_LIST_STATE': 2101, 'IDC_CONTACT_LIST': 2029, 'IDC_SLIDER_CERTAIN': 1023, 'IDET_PARTNER_STREET': 2053, 'IDC_BUT_UNREAD': 1020, 'ID_PARTNER_DROPDOWNLIST': 2032, 'ID_COUNTRY_DROPLIST': 2065, 'IDC_BUT_ABOUT': 1017, 'IDC_BUT_RESCORE': 1008, 'IDC_BUT_SEARCHSUB': 1041, 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER': 1010, 'IDET_PARTNER_MOBILENO': 2050, 'ID_CONTACT_MOBILE_TEXT': 40007, 'IDD_VIEW_PARTNER_DIALOG': 2044, 'IDD_WIZARD_FOLDERS_TRAIN': 120, 'IDC_BUT_FILTER_ENABLE': 1013, 'IDPB_WEB_CONNECTION': 2083, 'IDC_ABOUT_BTN': 1072, 'IDD_WIZARD_FINISHED_TRAINED': 122, 'ID_SERVER': 2001, 'IDD_SELECT_PARTNER': 2073, 'IDET_NC_PARTNER_STATE': 2106, 'IDD_FOLDER_SELECTOR': 105, 'IDC_BUT_SET_SERVER_PORT': 2021, 'ID_DONE': 2008, 'IDC_LIST_FOLDERS': 1040, 'IDC_IMAGE_PATH': 2015, 'IDB_SBWIZLOGO': 125, 'IDB_OPENERPLOGO': 1062, 'ID_ZIP_TEXT': 2068, 'IDEB_OPENDOC_LINK_TEXT': 2086, 'IDD_NEW_PARTNER_DIALOG': 2034, 'ID_PARTNER_DROPLIST': 2069, 'IDC_BUT_VIEW_LOG': 1093, 'IDC_STATUS2': 1044, 'IDC_STATUS1': 1043, 'IDCANCEL': 2, 'IDC_BROWSE_HAM': 1004, 'ID_BUT_TESTCONNECTION': 2007, 'IDR_NETRPC_PROTOCOL': 2043, 'IDC_BROWSE_SPAM': 1005, 'IDCB_WEB_SECURE': 2111, 'IDD_OPEN_DOCUEMNT_DIALOG': 2087, 'IDD_WIZARD_FINISHED_UNTRAINED': 116, 'IDC_MARK_UNSURE_AS_READ': 1051, 'IDPB_SEARCH_COUNTRY1': 2105, 'ID_PARTNER_CITY_TEXT': 2067, 'IDC_BUT_WIZARD': 1070, 'IDC_VERSION': 1009, 'ID_NEW_PARTNER_BUTTON': 2033, 'IDC_FOLDER_NAMES': 1036, 'ID_ATT_METHOD_DROPDOWNLIST': 2025, 'IDC_BUT_TIMER_ENABLED': 1091, 'IDPB_WRITE_CHANGES': 2059, 'IDC_SLIDER_UNSURE': 1029, 'IDC_BUT_NEW': 1046, 'IDC_FOLDER_WATCH': 1038, 'IDPB_CREATE_NEW_PARTNER': 2078, 'IDC_BUT_UNTRAINED': 1088, 'IDC_STATIC_SPAM': 1003, 'IDD_NEW_CONTACT_DIALOG': 2031, 'IDC_EDIT_UNSURE': 1030, 'IDC_BUT_CLEARALL': 1042, 'IDC_BUT_UNSEEN': 1021, 'IDC_OBJECT_NAME': 2014, 'IDD_WIZARD_FOLDERS_WATCH': 118, 'IDPB_SEARCH_STATE': 2103, 'IDET_COUNTRY_SEARCH_NAME': 2095, 'IDC_BUT_SAVE_OBJECT': 2011, 'ID_FED_STATE_DROPLIST': 2064, 'ID_ALL_COUNTRY_DROPDOWNLIST': 2061, 'IDC_EDIT_CERTAIN': 1024, 'IDC_BUT_FILTER_DEFINE': 1016, 'ID_NEW_PART_BUTTON': 2070, 'ID_FAX_TEXT': 2066, 'IDD_WIZARD_TRAINING_IS_IMPORTANT': 123, 'ID_ALL_STATE_DROPDOWNLIST': 2060, 'IDPB_SEARCH_STATE1': 2104, 'IDC_INBOX_TIMER_ONLY': 1060, 'IDPB_SEARCH_PARTNER': 2052, 'ID_USERNAME': 2005, '_APS_NEXT_CONTROL_VALUE': 1096, 'IDC_WIZ_GRAPHIC': 1092, 'IDD_OBJECT_SETTINGS': 2009, 'IDD_FILTER_UNSURE': 111, 'IDC_DEL_SPAM_RS': 1074, 'IDD_SELECT_COUNTRY': 2094, 'ID_SERVER_PORT': 2003, 'IDR_XML_PROTOCOL': 2041, 'IDET_PARTNER_OFFICENO': 2048, 'IDB_FOLDERS': 127, 'IDC_BUT_PREPARATION': 1081, 'ID_STREET2_TEXT': 2063, 'IDC_DELAY2_SLIDER': 1058, 'IDET_PARTNER': 2064, 'IDC_SAVE_SPAM_SCORE': 1048, 'IDC_OBJECT_TITLE': 2013, 'IDC_FOLDER_CERTAIN': 1027, 'IDET_WEB_PORT': 2090, 'IDC_BROWSE_UNSURE': 1034, 'IDC_STATISTICS': 1095, 'IDPB_STATE_SEARCH': 40012, 'ID_MAKE_ATTACHMENT': 2019, 'IDC_BUT_LOAD_IMAGE': 2010, 'IDC_NAME_LIST': 2026, 'IDC_BUT_TRAIN_TO_SPAM_FOLDER': 1011, 'IDET_PARTNER_SEARCH_NAME': 2076, 'IDC_BUT_RESET': 1073, 'ID_SEARCH': 40004, 'IDET_PARTNER_CONTACT_NAME': 2046, 'IDPB_SELECT_STATE': 2102, 'IDC_ACTION_UNSURE': 1031, 'IDD_WIZARD_TRAIN': 121, 'IDC_STATIC_GROUP': 2024, 'IDPB_NEWPARTNER_BUTTON': 2071, 'ID_PARTNER_TEXT': 2079, 'IDD_WIZARD_FINISHED_TRAIN_LATER': 124, 'IDET_PARTNER_NAME': 2045, 'IDPB_NEW_PART_BUTTON': 2093, 'IDC_BUT_REBUILD': 1007, 'IDET_PARTNER_STREET2': 2054, 'IDPB_SEARCH_COUNTRY': 2098, 'ID_SAVE_PARTNER_BUTTON': 2035, 'IDPB_SELECT_PARTNER': 2075, 'ID_STREET_TEXT': 2062, '_APS_NEXT_COMMAND_VALUE': 40001, 'IDET_SEARCH_PARTNER': 2051, 'IDC_LIST_PARTNER': 2072, 'IDD_WEB_SERVER_PORT_DIALOG': 2088, 'ID_PORT': 2002, 'IDD_SERVER_PORT_DIALOG': 2022, 'IDET_PARTNER_STATE': 2062, 'IDPB_SELECT_COUNTRY': 2097, 'ID_SEARCH_TEXT': 40003, 'IDET_NC_PARTNER_COUNTRY': 2108, 'ID_CREATE_CONTACT': 2018, 'IDC_FORWARD_BTN': 1077, 'IDC_TRAINING_STATUS': 1035, 'IDD_WIZARD_WELCOME': 115, 'IDET_PARTNER_FAX': 2058, 'IDC_BUT_TRAIN': 1089, 'IDC_LIST': 2016, 'ID_CREATE_CASE': 2020, 'IDET_PARTNER_EMAIL': 2047, 'IDC_START': 1006, 'IDD_FILTER': 103, 'IDC_RELOAD': 2038, 'ID_PASSWORD': 2006, 'ID_NAME_TEXT': 2030, 'IDC_FILTER_STATUS': 1014, 'IDPB_NC_SEARCH_STATE1': 2107, 'ID_CONTACT_SAVE_BUTTON': 40009, 'IDOK': 1, 'IDC_BROWSE_CERTAIN': 1028, 'IDC_BUT_SHOW_DIAGNOSTICS': 1080, 'IDC_BUT_TRAIN_NOW': 1012, 'IDPB_NC_SEARCH_COUNTRY1': 2109}
+	names = {1024: 'IDC_EDIT_CERTAIN', 1: 'IDOK', 2: 'IDCANCEL', 1027: 'IDC_FOLDER_CERTAIN', 1028: 'IDC_BROWSE_CERTAIN', 1029: 'IDC_SLIDER_UNSURE', 1030: 'IDC_EDIT_UNSURE', 1031: 'IDC_ACTION_UNSURE', 1033: 'IDC_FOLDER_UNSURE', 1034: 'IDC_BROWSE_UNSURE', 1035: 'IDC_TRAINING_STATUS', 1036: 'IDC_FOLDER_NAMES', 1037: 'IDC_BROWSE', 1038: 'IDC_FOLDER_WATCH', 1039: 'IDC_BROWSE_WATCH', 1040: 'IDC_LIST_FOLDERS', 1041: 'IDC_BUT_SEARCHSUB', 1042: 'IDC_BUT_CLEARALL', 1043: 'IDC_STATUS1', 1044: 'IDC_STATUS2', 2069: 'ID_PARTNER_DROPLIST', 1046: 'IDC_BUT_NEW', 1047: 'IDC_MARK_SPAM_AS_READ', 1048: 'IDC_SAVE_SPAM_SCORE', 2052: 'IDPB_SEARCH_PARTNER', 1051: 'IDC_MARK_UNSURE_AS_READ', 2076: 'IDET_PARTNER_SEARCH_NAME', 2077: 'IDPB_PARTNER_SEARCH', 2078: 'IDPB_CREATE_NEW_PARTNER', 2053: 'IDET_PARTNER_STREET', 1056: 'IDC_DELAY1_SLIDER', 1057: 'IDC_DELAY1_TEXT', 1058: 'IDC_DELAY2_SLIDER', 1059: 'IDC_DELAY2_TEXT', 1060: 'IDC_INBOX_TIMER_ONLY', 1061: 'IDC_VERBOSE_LOG', 1062: 'IDB_OPENERPLOGO', 2047: 'IDET_PARTNER_EMAIL', 2088: 'IDD_WEB_SERVER_PORT_DIALOG', 2089: 'IDET_WEB_SERVER', 2090: 'IDET_WEB_PORT', 2091: 'ID_WEB_OK', 1068: 'IDC_TAB', 1069: 'IDC_BACK_BTN', 1070: 'IDC_BUT_WIZARD', 1071: 'IDC_SHOW_DATA_FOLDER', 1072: 'IDC_ABOUT_BTN', 1073: 'IDC_BUT_RESET', 1074: 'IDC_DEL_SPAM_RS', 1075: 'IDC_RECOVER_RS', 2100: 'IDET_STATE_SEARCH_NAME', 1077: 'IDC_FORWARD_BTN', 1078: 'IDC_PAGE_PLACEHOLDER', 2057: 'IDET_PARTNER_COUNTRY', 1080: 'IDC_BUT_SHOW_DIAGNOSTICS', 1081: 'IDC_BUT_PREPARATION', 2106: 'IDET_NC_PARTNER_STATE', 1083: 'IDC_FOLDER_HAM', 2108: 'IDET_NC_PARTNER_COUNTRY', 2058: 'IDET_PARTNER_FAX', 2110: 'ID_DROPDOWNLIST_PROTOCOL', 2111: 'IDCB_WEB_SECURE', 1088: 'IDC_BUT_UNTRAINED', 1089: 'IDC_BUT_TRAIN', 40002: 'IDD_SYNC', 1091: 'IDC_BUT_TIMER_ENABLED', 1025: 'IDC_ACTION_CERTAIN', 1093: 'IDC_BUT_VIEW_LOG', 1094: 'IDC_EDIT1', 1095: 'IDC_STATISTICS', 1096: '_APS_NEXT_CONTROL_VALUE', 2060: 'ID_ALL_STATE_DROPDOWNLIST', 40010: 'IDET_ZIP', 40011: 'IDET_PARTNER_CITY', 40012: 'IDPB_STATE_SEARCH', 2061: 'ID_ALL_COUNTRY_DROPDOWNLIST', 2062: 'IDET_PARTNER_STATE', 2063: 'IDET_PARTNER_COUNTRY', 2064: 'IDET_PARTNER', 101: 'IDD_MANAGER', 102: 'IDD_TRAINING', 103: 'IDD_FILTER', 104: 'IDD_FILTER_NOW', 105: 'IDD_FOLDER_SELECTOR', 106: 'IDD_ABOUT', 108: 'IDD_GENERAL', 2066: 'ID_FAX_TEXT', 111: 'IDD_FILTER_UNSURE', 113: 'IDD_DIAGNOSTIC', 114: 'IDD_WIZARD', 115: 'IDD_WIZARD_WELCOME', 116: 'IDD_WIZARD_FINISHED_UNTRAINED', 117: 'IDD_WIZARD_FOLDERS_REST', 118: 'IDD_WIZARD_FOLDERS_WATCH', 119: 'IDD_WIZARD_FINISHED_UNCONFIGURED', 120: 'IDD_WIZARD_FOLDERS_TRAIN', 121: 'IDD_WIZARD_TRAIN', 122: 'IDD_WIZARD_FINISHED_TRAINED', 123: 'IDD_WIZARD_TRAINING_IS_IMPORTANT', 124: 'IDD_WIZARD_FINISHED_TRAIN_LATER', 125: 'IDB_SBWIZLOGO', 127: 'IDB_FOLDERS', 2067: 'ID_PARTNER_CITY_TEXT', 2050: 'IDET_PARTNER_MOBILENO', 2070: 'ID_NEW_PART_BUTTON', 2071: 'IDPB_NEWPARTNER_BUTTON', 2072: 'IDC_LIST_PARTNER', 2073: 'IDD_SELECT_PARTNER', 2068: 'ID_ZIP_TEXT', 2051: 'IDET_SEARCH_PARTNER', 2075: 'IDPB_SELECT_PARTNER', 2079: 'ID_PARTNER_TEXT', 2080: 'IDET_WED_SERVER', 2081: 'IDET_WEB_PORT', 2082: 'ID_SET_WEB_CONNECTION', 2083: 'IDPB_WEB_CONNECTION', 2084: 'IDD_OPEN_PARTNER_DIALOG', 2085: 'IDET_PARTNER_LINK_TEXT', 40004: 'ID_SEARCH', 2086: 'IDEB_OPENDOC_LINK_TEXT', 2087: 'IDD_OPEN_DOCUEMNT_DIALOG', 2046: 'IDET_PARTNER_CONTACT_NAME', 2105: 'IDPB_SEARCH_COUNTRY1', 2054: 'IDET_PARTNER_STREET2', 128: '_APS_NEXT_RESOURCE_VALUE', 2092: 'IDPB_NEW_PARTNER_BUTTON', 2093: 'IDPB_NEW_PART_BUTTON', 2094: 'IDD_SELECT_COUNTRY', 2095: 'IDET_COUNTRY_SEARCH_NAME', 2096: 'IDC_LIST_COUNTRY', 2097: 'IDPB_SELECT_COUNTRY', 2098: 'IDPB_SEARCH_COUNTRY', 2099: 'IDD_SELECT_STATE', 2101: 'IDC_LIST_STATE', 2102: 'IDPB_SELECT_STATE', 2103: 'IDPB_SEARCH_STATE', 2104: 'IDPB_SEARCH_STATE1', 2040: 'ID_PROTOCOL_GRP', 2065: 'ID_COUNTRY_DROPLIST', 2048: 'IDET_PARTNER_OFFICENO', 2107: 'IDPB_NC_SEARCH_STATE1', 2109: 'IDPB_NC_SEARCH_COUNTRY1', 2024: 'IDC_STATIC_GROUP', 2041: 'IDR_XML_PROTOCOL', 2025: 'ID_ATT_METHOD_DROPDOWNLIST', 2026: 'IDC_NAME_LIST', 2027: 'IDD_ABOUT', 40001: '_APS_NEXT_COMMAND_VALUE', 2028: 'IDC_ABOUT', 2029: 'IDC_CONTACT_LIST', 2059: 'IDPB_WRITE_CHANGES', 2042: 'IDR_XMLS_PROTOCOL', 40003: 'ID_SEARCH_TEXT', 2030: 'ID_NAME_TEXT', 1092: 'IDC_WIZ_GRAPHIC', 2031: 'IDD_NEW_CONTACT_DIALOG', 40005: 'ID_CONTACT_NAME_TEXT', 2032: 'ID_PARTNER_DROPDOWNLIST', 40006: 'ID_CONTACT_OFFICE_TEXT', 2033: 'ID_NEW_PARTNER_BUTTON', 40007: 'ID_CONTACT_MOBILE_TEXT', 2034: 'IDD_NEW_PARTNER_DIALOG', 2043: 'IDR_NETRPC_PROTOCOL', 40008: 'ID_CONTACT_EMAIL_TEXT', 2035: 'ID_SAVE_PARTNER_BUTTON', 40009: 'ID_CONTACT_SAVE_BUTTON', 2036: 'ID_PARTNER_NAME_TEXT', 2037: 'IDC_NAME_LIST1', 2038: 'IDC_RELOAD', 2044: 'IDD_VIEW_PARTNER_DIALOG', 2001: 'ID_SERVER', 2002: 'ID_PORT', 2003: 'ID_SERVER_PORT', 2004: 'ID_DB_DROPDOWNLIST', 2005: 'ID_USERNAME', 2006: 'ID_PASSWORD', 2007: 'ID_BUT_TESTCONNECTION', 2008: 'ID_DONE', 2009: 'IDD_OBJECT_SETTINGS', 2010: 'IDC_BUT_LOAD_IMAGE', 2011: 'IDC_BUT_SAVE_OBJECT', 2012: 'IDC_BUT_DEL_OBJECT', 2013: 'IDC_OBJECT_TITLE', 2014: 'IDC_OBJECT_NAME', 2015: 'IDC_IMAGE_PATH', 2016: 'IDC_LIST', 2017: 'IDC_HEADER', 2018: 'ID_CREATE_CONTACT', 2019: 'ID_MAKE_ATTACHMENT', 2020: 'ID_CREATE_CASE', 2021: 'IDC_BUT_SET_SERVER_PORT', 2022: 'IDD_SERVER_PORT_DIALOG', 2023: 'IDC_CHKBX', 1000: 'IDC_PROGRESS', 1001: 'IDC_PROGRESS_TEXT', 1002: 'IDC_STATIC_HAM', 1003: 'IDC_STATIC_SPAM', 1004: 'IDC_BROWSE_HAM', 1005: 'IDC_BROWSE_SPAM', 1006: 'IDC_START', 1007: 'IDC_BUT_REBUILD', 1008: 'IDC_BUT_RESCORE', 1009: 'IDC_VERSION', 1010: 'IDC_BUT_TRAIN_FROM_SPAM_FOLDER', 1011: 'IDC_BUT_TRAIN_TO_SPAM_FOLDER', 1012: 'IDC_BUT_TRAIN_NOW', 1013: 'IDC_BUT_FILTER_ENABLE', 1014: 'IDC_FILTER_STATUS', 2045: 'IDET_PARTNER_NAME', 1016: 'IDC_BUT_FILTER_DEFINE', 1017: 'IDC_BUT_ABOUT', 1018: 'IDC_BUT_ACT_SCORE', 1019: 'IDC_BUT_ACT_ALL', 1020: 'IDC_BUT_UNREAD', 1021: 'IDC_BUT_UNSEEN', -1: 'IDC_STATIC', 1023: 'IDC_SLIDER_CERTAIN'}
 	bitmaps = {'IDB_OPENERPLOGO': 'OpenERP_Logo.bmp'}
 def ParseDialogs(s):
 	return FakeParser()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
index 6b620127a33..b402e4b7958 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/resources/dialogs.rc
@@ -97,18 +97,23 @@ BEGIN
     LTEXT           "",IDC_ABOUT,80,90,300,100
 END
 
-IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 55
+IDD_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 90
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "OpenERP Connection"
 FONT 8, "Tahoma", 400, 0, 0x0
 BEGIN
     LTEXT           "Server : ",IDC_STATIC,5,3,150,17
-    EDITTEXT        ID_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
-    EDITTEXT        ID_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,110,35,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,60,35,45,14,WS_TABSTOP
+    EDITTEXT        ID_SERVER, 45, 3, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
+    LTEXT           "  Port   : ",IDC_STATIC,5,18,100,17
+    EDITTEXT        ID_PORT, 45, 18, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
+
+    GROUPBOX        "", IDC_STATIC_GROUP, 5, 35, 150, 5
+    LTEXT           "Protocol Connection :", IDC_STATIC, 5, 45, 80, 17
+    COMBOBOX        ID_DROPDOWNLIST_PROTOCOL, 75, 43, 75, 50, CBS_DROPDOWNLIST |WS_VSCROLL | WS_VISIBLE | WS_TABSTOP
+
+    PUSHBUTTON      "Close",IDCANCEL,60,70,45,14,WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,110,70,45,14,WS_TABSTOP
 END
 
 IDD_SYNC DIALOGEX 0, 0, 470, 320
@@ -287,7 +292,7 @@ BEGIN
     PUSHBUTTON      "Ok",IDCANCEL,150,45,45,14,WS_TABSTOP
 END
 
-IDD_WEB_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 55
+IDD_WEB_SERVER_PORT_DIALOG DIALOGEX 0, 0, 160, 80
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTEXTHELP
 CAPTION "OpenERP Connection"
@@ -297,8 +302,9 @@ BEGIN
     EDITTEXT        IDET_WEB_SERVER,40,3,100,12,ES_AUTOHSCROLL | WS_TABSTOP
     LTEXT           "Port   : ",IDC_STATIC,5,18,100,17
     EDITTEXT        IDET_WEB_PORT,40,18,100,12,ES_AUTOHSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Close",IDCANCEL,110,35,45,14,WS_TABSTOP
-    DEFPUSHBUTTON   "OK",ID_WEB_OK,60,35,45,14,WS_TABSTOP
+    PUSHBUTTON      "Close",IDCANCEL,110,50,45,14,WS_TABSTOP
+    DEFPUSHBUTTON   "OK",ID_WEB_OK,50,50,50,14,WS_TABSTOP
+    PUSHBUTTON      "SSL (https)",IDCB_WEB_SECURE,20,35,100,14,BS_AUTOCHECKBOX | BST_CHECKED |WS_TABSTOP
 END
 
 IDD_SELECT_COUNTRY DIALOGEX 0, 0, 220, 250
@@ -311,7 +317,6 @@ BEGIN
     LTEXT           "Enter Name : ",IDC_STATIC,8,12,80,17
     EDITTEXT		IDET_COUNTRY_SEARCH_NAME, 55, 10, 100, 12, ES_AUTOHSCROLL | WS_TABSTOP
     PUSHBUTTON 		"Search", IDPB_SEARCH_COUNTRY, 160, 10, 50, 14, WS_TABSTOP
-
     CONTROL         "List1",IDC_LIST_COUNTRY,"SysListView32",WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL |
             		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
 	PUSHBUTTON 		"Select", IDPB_SELECT_COUNTRY, 170, 230, 40, 14, WS_TABSTOP
@@ -332,4 +337,3 @@ BEGIN
             		 LVS_SHOWSELALWAYS | LVS_EX_GRIDLINES | LVS_REPORT | LVS_EX_FULLROWSELECT, 8,40,200,185
 	PUSHBUTTON 		"Select", IDPB_SELECT_STATE, 170, 230, 40, 14, WS_TABSTOP
 END
-
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/manager.py b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
index 31afaf3c732..0c7e0e640fe 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/manager.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/manager.py
@@ -140,7 +140,7 @@ class OpenERPManager:
     def LoadConfig(self):
         import win32ui
         path = os.path.join(self.data_directory, 'tiny.ini')
-        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False,'webserver':'localhost','webport':'8080'}
+        data = {'server' : 'localhost', 'port' : '8069', 'protocol' : 'http://', 'database' : '', 'objects' : self.default_objects, 'uname':'admin', 'pwd':'a', 'login':False,'webserver':'localhost','webport':'8080', 'webprotocol' : 'http:\\'}
         if os.path.exists(path):
             fp = open(path, 'r')
             data = fp.readlines()
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 761f99487a8..7ecb2aea81f 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -80,7 +80,8 @@ class XMLRpcConn(object):
         self._iscrm=True
         self.partner_id_list=None
         self.protocol=None
-
+        self._webprotocol=None
+        self._weburi=None
 
     def getitem(self, attrib):
         v=self.__getattribute__(attrib)
@@ -442,16 +443,14 @@ class XMLRpcConn(object):
     	return country_list
 
     def SearchPartner(self, mail_id = ""):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
-    	if not address:
-    		return None
-    	else:
-    		add_rec = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'read', address[0])
-    		partner = add_rec.get('partner_id',False)
-    		if partner:
-    			return partner[0]
-        return True
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'search', [('email','=',ustr(mail_id))])
+        if not address:
+        	return False
+        add_rec = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'res.partner.address', 'read', address[0])
+        partner = add_rec.get('partner_id',False)
+        if partner:  return partner[0]
+        else:  return partner
 
     def SearchEmailResources(self, message_id):
         import win32ui
@@ -462,9 +461,7 @@ class XMLRpcConn(object):
     	if not mail_id:
             ref_mail_id = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message', 'search', [('references','=',message_id)])
             if ref_mail_id:
-                win32ui.MessageBox(str(ref_mail_id),"ref_mail_id")
                 address = execute( conn, 'execute', self._dbname, int(self._uid), self._pwd, 'mailgate.message','read',ref_mail_id[0],['model','res_id'])
-                win32ui.MessageBox(str(address),"address")
                 for key, vals in address.items():
                     res_vals.append([key,vals])
                 return res_vals
diff --git a/addons/pad/i18n/ca.po b/addons/pad/i18n/ca.po
index 3787ae35f79..7d12699a4e6 100644
--- a/addons/pad/i18n/ca.po
+++ b/addons/pad/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-13 04:38+0000\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
 "X-Generator: Launchpad (build 12351)\n"
 
 #. module: pad
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index 435f0dcb3f2..2b09639588b 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -149,7 +149,7 @@
             sequence="4"
         />
 
-        <menuitem name="Cash register management" parent="point_of_sale.menu_point_root"
+        <menuitem name="Cash Register Management" parent="point_of_sale.menu_point_root"
             id="menu_point_open_config" sequence="1"/>
         <menuitem
             name="Open Cash Registers" parent="menu_point_open_config"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 0c63698b209..23a361b0ff9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -58,7 +58,7 @@
                     <field name="user_id"/>
                     <field name="assigned_to" />
                         <group colspan="2" col="4">
-                            <field name="type_id" widget="selection" readonly="1"/>
+                            <field name="type_id" readonly="1"/>
                             <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                             <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                         </group>
diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po
index 181d6ede272..a291ad89b2e 100644
--- a/addons/project_planning/i18n/de.po
+++ b/addons/project_planning/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 16:53+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2011-02-13 08:18+0000\n"
+"Last-Translator: Steffi Frank (Bremskerl, DE) <Unknown>\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: 2011-01-15 05:58+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: project_planning
 #: constraint:account.analytic.account:0
@@ -66,7 +65,7 @@ msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 #. module: project_planning
 #: view:board.board:0
 msgid "My Project's planning"
-msgstr "Meine geplanten Projekte"
+msgstr "Meine Projektplanung"
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,timesheet:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2d8eaac1d84..f2ef17a183d 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -257,9 +257,12 @@ class purchase_order(osv.osv):
     def onchange_dest_address_id(self, cr, uid, ids, adr_id):
         if not adr_id:
             return {}
-        part_id = self.pool.get('res.partner.address').read(cr, uid, [adr_id], ['partner_id'])[0]['partner_id'][0]
-        loc_id = self.pool.get('res.partner').browse(cr, uid, part_id).property_stock_customer.id
-        return {'value':{'location_id': loc_id, 'warehouse_id': False}}
+        values = {'warehouse_id': False}
+        part_id = self.pool.get('res.partner.address').browse(cr, uid, adr_id).partner_id
+        if part_id:
+            loc_id = part_id.property_stock_customer.id
+            values.update({'location_id': loc_id})
+        return {'value':values}
 
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id):
         if not warehouse_id:
diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index c8e1788fac9..132d7c699c5 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -65,7 +65,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child1/action[@name='%(crm.act_my_oppor)d']" position="after">
+	            <xpath expr="/form/hpaned/child1/action[@string='My Open Opportunities']" position="after">
 		            <action
 		                string="My Quotations"
 		                name="%(action_quotation_for_sale_crm)d"
@@ -83,7 +83,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
+	            <xpath expr="/form/hpaned/child2/action[@string='My Win/Lost Ratio for the Last Year']" position="replace">
 	                <action
 		                string="Monthly Turnover"
 		                name="%(action_turnover_by_month)d"
@@ -99,7 +99,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_my_oppor_stage)d']" position="attributes">
+	            <xpath expr="/form/hpaned/child2/action[@string='My Planned Revenues by Stage']" position="attributes">
 	                <attribute name="string">Opportunities by Stage</attribute>
 	            </xpath>
             </field>
diff --git a/addons/share/web/controllers.py b/addons/share/web/controllers.py
index 13812e411a5..bac7a607cf0 100644
--- a/addons/share/web/controllers.py
+++ b/addons/share/web/controllers.py
@@ -12,18 +12,23 @@ class ShareWizardController(openerp.controllers.SecuredController):
     _cp_path = "/share"
 
     @expose()
-    def index(self, domain, search_domain, context, view_id):
+    def index(self, domain, search_domain, context, view_id, action_id=None):
         context = ast.literal_eval(context)
 
-        action_id = rpc.RPCProxy('ir.actions.act_window').search(
-            [('view_id','=',int(view_id))], context=context)
-        if not action_id: return ""
+        if not action_id:
+            # This should not be needed anymore, but just in case users are
+            # running the module with an order version of the web client...
+
+            # to remove soon-ish
+            action_id = rpc.RPCProxy('ir.actions.act_window').search(
+                [('view_id','=',int(view_id))], context=context)
+            if not action_id: return ""
+
+            action_id = action_id[0]
 
         domain = ast.literal_eval(domain)
         domain.extend(ast.literal_eval(search_domain))
 
-        action_id = action_id[0]
-
         scheme, netloc, _, _, _ = urlparse.urlsplit(cherrypy.request.base)
         share_root_url = urlparse.urlunsplit((
             scheme, netloc, '/openerp/login',
diff --git a/addons/share/web/editors.py b/addons/share/web/editors.py
index 28e7747083b..fd6199a4fd6 100644
--- a/addons/share/web/editors.py
+++ b/addons/share/web/editors.py
@@ -27,6 +27,7 @@ class ShareActionEditor(openobject.templating.TemplateEditor):
                                            context: jQuery("#_terp_context").val(),
                                            domain: jQuery("#_terp_domain").val(),
                                            view_id: jQuery("#_terp_view_id").val(),
+                                           action_id: jQuery("#_terp_action_id").val(),
                                            search_domain: jQuery("#_terp_search_domain").val(),
                                    }));
                                });
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 3868eff4059..eaf9784d30f 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/i18n/id.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-11-09 13:58+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-02-14 13:49+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-06 05:22+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Produk"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,description:stock_no_autopicking.module_meta_information
@@ -37,26 +37,39 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Modul ini memungkinkan proses memilih intermediate  untuk  menyediakan  "
+"bahan  baku\n"
+"     untuk pemesanan produksi.\n"
+"\n"
+"     Salah satu contoh penggunaan modul ini adalah untuk mengatur produksi "
+"yang dibuat menurut Anda\n"
+"     pemasok (sub-kontraktor). Untuk mencapai hal ini, mengatur produk "
+"dirakit\n"
+"     yang adalah sub-kontrak untuk \"Tidak Memilih-Auto\" dan menempatkan "
+"lokasi\n"
+"     pemasok dalam routing operasi perakitan.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Pesanan  Pabrikan"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "Pengambilan Otomatis"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "Otomatis mengambil bahan baku dari pemesanan produksi."
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ada Kesalahan !! kode EAN tidak sah"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -66,4 +79,4 @@ msgstr ""
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Order kuantitas tidak boleh negatif  atau nol!"
diff --git a/addons/sync_base/sync_base.py b/addons/sync_base/sync_base.py
index f6116225525..7f8b29a09f5 100644
--- a/addons/sync_base/sync_base.py
+++ b/addons/sync_base/sync_base.py
@@ -24,16 +24,10 @@ from osv import fields,osv,orm
 #framework to handle synchronization with multiple app
 # we will improve the code and function
 
-class res_partner_sync_base:
+class res_partner_sync_base(osv.osv):
+    
     _inherit = "res.partner.address"
 
-    _columns = {
-        'sync_google':fields.boolean('Synchronize with Google', required=False),     
-    }    
-    _defaults = {
-        'sync_google':lambda *a:True
-        }
-         
     def create(self, cr, uid, vals, context=None):
         id = super(res_partner_sync_base, self).create(cr, uid, vals, context=context)   
         return id 
@@ -53,7 +47,7 @@ class res_partner_sync_base:
     def sync_modify(self, cr, uid, ids, vals, context=None, synchronize=True):
         return True    
  
-    def sync_modify(self, cr, uid, ids,context=None, synchronize=True):
+    def sync_unlink(self, cr, uid, ids,context=None, synchronize=True):
         return True      
 
 res_partner_sync_base()
diff --git a/addons/sync_google_contact/__openerp__.py b/addons/sync_google_contact/__openerp__.py
index 5cb6ff4f436..df4c1f50a17 100644
--- a/addons/sync_google_contact/__openerp__.py
+++ b/addons/sync_google_contact/__openerp__.py
@@ -30,7 +30,7 @@
     'depends': ['base','sync_base','google_base_account',],
     'init_xml': [],
     'update_xml': [
-                  #'google_contact_view.xml',
+                  'sync_google_contact_view.xml',
                   'wizard/google_contact_import_view.xml'
                    ],
     'demo_xml': [],
diff --git a/addons/sync_google_contact/sync_google_contact.py b/addons/sync_google_contact/sync_google_contact.py
index f4ca8ce17b8..7bac97cb5d8 100644
--- a/addons/sync_google_contact/sync_google_contact.py
+++ b/addons/sync_google_contact/sync_google_contact.py
@@ -66,6 +66,16 @@ class google_lib(object):
         self.contact.DeleteContact(selected_entry.GetEditLink().href)        
         return True
 
+class res_partner_address(osv.osv):
+    
+    _inherit = "res.partner.address"
+    _columns = {
+        'sync_google':fields.boolean('Synchronize with Google'),   
+        'google_id': fields.char('Google Contact Id', size=128, readonly=True),  
+    }    
+    
+
+res_partner_address()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sync_google_contact/sync_google_contact_view.xml b/addons/sync_google_contact/sync_google_contact_view.xml
index ee3f3ec20d9..abbce4a2019 100644
--- a/addons/sync_google_contact/sync_google_contact_view.xml
+++ b/addons/sync_google_contact/sync_google_contact_view.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
-      
+    <record model="ir.ui.view" id="view_partner_address_form_google_inherited1">
+        <field name='name'>res.partner.address.google.form.inherited1</field>
+        <field name='model'>res.partner.address</field>
+        <field name="inherit_id" ref="base.view_partner_address_form1"/>
+        <field name='type'>form</field>
+        <field name='arch' type='xml'>
+			<field name="email" position="after">
+            	<field name="google_id"/>
+            </field>
+        </field>
+    </record>
     </data>
 </openerp>
diff --git a/addons/sync_google_contact/wizard/google_contact_import.py b/addons/sync_google_contact/wizard/google_contact_import.py
index f6fa61c22a1..43601ad8fa1 100644
--- a/addons/sync_google_contact/wizard/google_contact_import.py
+++ b/addons/sync_google_contact/wizard/google_contact_import.py
@@ -47,13 +47,15 @@ class google_contact_import(osv.osv_memory):
             addresses = []
             while contact:
                 for entry in contact.entry:
+                    google_id= entry.id.text
                     name = entry.title.text
                     phone_numbers = ','.join(phone_number.text for phone_number in entry.phone_number)
                     emails = ','.join(email.address for email in entry.email)
                     data = {
                             'name': name,
                             'phone': phone_numbers,
-                            'email': emails
+                            'email': emails,
+                            'google_id':google_id
                      }
                     contact_ids = addresss_obj.search(cr, uid, [('email','ilike',emails)])
                     if not contact_ids:
diff --git a/addons/thunderbird/plugin/openerp_plugin.xpi b/addons/thunderbird/plugin/openerp_plugin.xpi
index 6ac7d0f435f..eaa1c2bd4c7 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin.xpi and b/addons/thunderbird/plugin/openerp_plugin.xpi differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
index 753256e0247..98ebf9906f6 100644
Binary files a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar and b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
index 064f8453d28..6bc2a6e885f 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config.js
@@ -5,11 +5,22 @@ function config_close()
     window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
 
+
+function createMenuItem(aLabel, aValue) {
+    const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var item = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
+    item.setAttribute("label", aLabel);
+    item.setAttribute("value", aValue);
+    return item;
+}
 //set the value of the configuration fields
 function config_change_load()
 {
     var s = getServer();
     var a =s.split(':');
+    var popup = document.getElementById("dbprotocol_list");
+    popup.menupopup.appendChild(createMenuItem('XML-RPC','http://'));
+    popup.menupopup.appendChild(createMenuItem('XML-RPCS','https://'));
     if (String(a)=="" || String(a)=="undefined"){
         document.getElementById('txtcurl').value = "localhost"
         document.getElementById('txtcport').value = "8069"
@@ -91,6 +102,7 @@ function config_change_load_web()
 
 function config_ok()
 {
+    var protocol = document.getElementById("dbprotocol_list").value
     if (document.getElementById('txtcurl').value == '')
     {
         alert("You Must Enter Server Name!")
@@ -102,7 +114,12 @@ function config_ok()
         alert("You Must Enter Port!")
         return false;
     }
-    setServer("http://"+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
+    if (protocol == '')
+    {
+        alert("Invalid Porotocol!\nPlease Select protocol from Connection protocol list.")
+        return false;
+    }
+    setServer(document.getElementById("dbprotocol_list").value+document.getElementById('txtcurl').value +":" + document.getElementById('txtcport').value);
     window.close("chrome://openerp_plugin/content/config_change.xul", "", "chrome");
     window.open("chrome://openerp_plugin/content/config.xul", "", "chrome");
 }
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
index dece3457710..441c426c97d 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/config_change.xul
@@ -3,23 +3,33 @@
 <!DOCTYPE window SYSTEM "chrome://openerp_plugin/locale/config_change.dtd">
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"  onload="config_change_load();"
-	title="Openerp Connection" height="140" width="240">
+	title="Openerp Connection" height="180" width="320">
 <script type="text/javascript" src="chrome://openerp_plugin/content/tiny_xmlrpc.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/config.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/loaddata.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/static.js"></script>
 <script type="text/javascript" src="chrome://openerp_plugin/content/overlay.js"></script>
 	<hbox>
-	 <label  align="center" id="heading"  value="&lblheading.label;" style="padding-left:38px" />
+	 <label  align="left" id="heading"  value="&lblheading.label;" style="padding-left:38px" />
     </hbox>
-<groupbox id="gpData" width="200">
+    <vbox style="border:0.5px solid gray" width="190"/>
+	<groupbox id="gpData" width="200">
 	<hbox >
 		<label id="lblurl" control="txtcurl" value="&lblurl.label;" width="50"/>
-		<textbox id="txtcurl" width="140" />
+		<textbox id="txtcurl" width="170" />
 	</hbox>
 	<hbox>	
 		<label id="lblport" control="txtcport" value="&lblport.label;" width="50"/>
-		<textbox id="txtcport" width="140" />
+		<textbox id="txtcport" width="170" />
+	</hbox>
+
+	<hbox>
+		<label id="dbprotocol"  value="&lblprotocol.label;" width="97" />
+		<menulist id="dbprotocol_list" width="140">
+			<menupopup>
+				<menuitem label="" value=""/>
+			</menupopup>
+		</menulist>
 	</hbox>
     
 </groupbox>
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
index cd3cd90c1d0..7da3701b1f3 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
@@ -196,11 +196,12 @@ function getPredefinedFolder(type) {
 
 		var fname = msgDate8601string+"-"+subj+"-"+hdr.messageKey;
 	}
-	var rand1=Math.floor(Math.random()*100000)
-	var rand2=Math.floor(Math.random()*100000)
-	fname = rand1+'openerp-eml'+rand2
 	setFileName(fname)
 	fname = fname.replace(/[\x00-\x19]/g,"_");
+	if (mustcorrectname)
+		fname = nametoascii(fname);
+	else
+		fname = fname.replace(/[\/\\:,<>*\?\"\|]/g,"_");
 	return fname;
 }
 
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
index 5ec72d0b250..19558a9f077 100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/locale/en-US/config_change.dtd
@@ -1,6 +1,6 @@
-<!ENTITY lblurl.label "Server: ">
-<!ENTITY lblport.label "Port: ">
+<!ENTITY lblurl.label "               Server: ">
+<!ENTITY lblport.label "                   Port: ">
 <!ENTITY lblheading.label "Openerp Connection">
 <!ENTITY imagecancel.value "chrome://openerp_plugin/skin/Error.gif">
 <!ENTITY imageok.value "chrome://openerp_plugin/skin/Success.gif">
-
+<!ENTITY lblprotocol.label "Protocol Connection: ">
diff --git a/addons/wiki/web/locales/bg.po b/addons/wiki/web/locales/bg.po
new file mode 100644
index 00000000000..5b073c6c77e
--- /dev/null
+++ b/addons/wiki/web/locales/bg.po
@@ -0,0 +1,22 @@
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-11 01:13+0000\n"
+"Last-Translator: Dimitar Markov <Unknown>\n"
+"Language-Team: Bulgarian <bg@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: 2011-02-11 06:26+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr "Съдържание"
diff --git a/addons/wiki/web/locales/ca.po b/addons/wiki/web/locales/ca.po
new file mode 100644
index 00000000000..d8d96530e18
--- /dev/null
+++ b/addons/wiki/web/locales/ca.po
@@ -0,0 +1,22 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-06 12:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@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: 2011-02-07 06:24+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr ""
diff --git a/addons/wiki/web/locales/tr.po b/addons/wiki/web/locales/tr.po
new file mode 100644
index 00000000000..baa56e0f9db
--- /dev/null
+++ b/addons/wiki/web/locales/tr.po
@@ -0,0 +1,22 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 17:52+0530\n"
+"PO-Revision-Date: 2011-02-08 21:20+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@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: 2011-02-09 06:02+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+
+#: widgets/wikimarkup/__init__.py:1981
+msgid "Table of Contents"
+msgstr "İçindekiler"
diff --git a/addons/wiki_faq/i18n/gl.po b/addons/wiki_faq/i18n/gl.po
new file mode 100644
index 00000000000..742f8430645
--- /dev/null
+++ b/addons/wiki_faq/i18n/gl.po
@@ -0,0 +1,32 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-02-14 12:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@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: 2011-02-15 04:37+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: wiki_faq
+#: model:ir.module.module,description:wiki_faq.module_meta_information
+msgid ""
+"This module provides a wiki FAQ Template\n"
+"    "
+msgstr ""
+"Este módulo facilita unha plantilla para as FAQ dunha wiki\n"
+"    "
+
+#. module: wiki_faq
+#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
+msgid "Document Management - Wiki - FAQ"
+msgstr "Xestión Documental - Wiki - FAQ"