diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 7742f19d77e..0b48f30b58b 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -90,7 +90,4 @@ class sale_config_settings(osv.osv_memory):
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
         'module_sale' : fields.boolean('SALE'),
-        'module_mass_mailing': fields.boolean(
-            'Manage mass mailing campaigns',
-            help='Get access to statistics with your mass mailing, manage campaigns.'),
     }
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index b0fc6cad48c..919b85fe57b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -137,10 +137,6 @@
                                     <field name="module_web_linkedin"/>
                                     <label for="module_web_linkedin"/>
                                 </div>
-                                <div>
-                                    <field name="module_mass_mailing" class="oe_inline"/>
-                                    <label for="module_mass_mailing"/>
-                                </div>
                             </div>
                         </group>
                     </div>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index e7506c42f98..8f4b4d01116 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -186,10 +186,13 @@
                     </page>
                     <page string="Extra Info">
                         <group>
-                            <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
+                            <group name="categorization" string="Marketing" >
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     options="{'no_create': True}"/>
+                                <field name="campaign_id" />
+                                <field name="medium_id"/>
+                                <field name="source_id" />
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out"/>
@@ -503,6 +506,11 @@
                                     <field name="mobile"/>
                                     <field name="fax"/>
                                 </group>
+                                <group string="Marketing">
+                                    <field name="campaign_id" />
+                                    <field name="medium_id" />
+                                    <field name="source_id" />
+                                </group>
                                 <group string="Mailings" name="mailings">
                                     <field name="opt_out"/>
                                 </group>
diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py
index 6e3e1b9d69b..c6783534ba4 100644
--- a/addons/marketing/res_config.py
+++ b/addons/marketing/res_config.py
@@ -7,10 +7,6 @@ class marketing_config_settings(osv.TransientModel):
     _name = 'marketing.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_mass_mailing': fields.boolean(
-            'Mass Mailing',
-            help='Provide a way to perform mass mailings.\n'
-                 '-This installs the module mass_mailing.'),
         'module_marketing_campaign': fields.boolean(
             'Marketing campaigns',
             help='Provides leads automation through marketing campaigns. '
diff --git a/addons/marketing/res_config_view.xml b/addons/marketing/res_config_view.xml
index ad973a384ef..ab50d6e5a8b 100644
--- a/addons/marketing/res_config_view.xml
+++ b/addons/marketing/res_config_view.xml
@@ -12,28 +12,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <div name="config_setting">        
-                        <separator string="Mass Mailing"/>
-                        <group>
-                            <label for="id" string="Settings"/>
-                            <div>
-                                <div name="module_mass_mailing">
-                                    <field name="module_mass_mailing" class="oe_inline"/>
-                                    <label for="module_mass_mailing"/>
-                                </div>
-                            </div>
-                        </group>
-                        <separator string="Marketing Campaigns"/>
-                        <group>
-                            <label for="id" string="Settings"/>
-                            <div>
-                                <div name="module_marketing_campaign">
-                                    <field name="module_marketing_campaign" class="oe_inline"/>
-                                    <label for="module_marketing_campaign"/>
-                                </div>
-                            </div>
-                        </group>
-                     </div>
+                    <div name="config_setting"></div>
                 </form>
             </field>
         </record>
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index 80a73f99a12..dd27a863906 100644
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -21,3 +21,4 @@
 
 import marketing_campaign
 import report
+import res_config
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index c0eac4eff41..dfde2364a4a 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -56,6 +56,7 @@ input segments, workflow.
     """,
     'website': 'https://www.odoo.com/page/lead-automation',
     'data': [
+        'res_config.xml',
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',
         'marketing_campaign_workflow.xml',
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index 2e8124388f8..58c19848270 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -7,17 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-15 08:36+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-15 08:54+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-consulting."
+"net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-24 09:16+0000\n"
+"X-Launchpad-Export-Date: 2014-09-16 08:34+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Ermögliche die Segmentierung von Kunden\n"
+"- Hierdurch installieren Sie das Modul crm_profiling"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Demodaten für Marketingkampagnen"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Demodaten für Interessenten, Kampagnen und Segmente für Marketingkampagnen.\n"
+"- Hierdurch wird das Modul marketing_campaign_crm_demo installiert"
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Verfolge Kundenprofile zur Spezifikation von Kampagnen"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -54,8 +89,8 @@ msgstr ""
 "          </p><p>\n"
 "            Eine Kampagne kann viele Aktivitäten wie das Senden einer E-Mail "
 "beinhalten, z.B. den Serien-Druck\n"
-"            eines Werbebriefs, die automatische Zuweisung zu einem Team "
-"u.s.w. Diese Aktivitäten werden durch\n"
+"            eines Werbebriefs, die automatische Zuweisung zu einem Team u.s."
+"w. Diese Aktivitäten werden durch\n"
 "            bestimmte definierte Situationen, wie z.B. 10 Tage nach "
 "Ausfüllen des Kontaktformulars \n"
 "            oder nach Beendigung eines Interessenten etc. ausgelöst.\n"
@@ -222,8 +257,7 @@ msgid "Cancel Workitem"
 msgstr "Abbrechen Auftrag"
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -518,8 +552,7 @@ msgid "How is the destination workitem triggered"
 msgstr "Wie wird die Folgeaktion angestossen"
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -698,8 +731,7 @@ msgid "Month(s)"
 msgstr "Monat(e)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
@@ -1002,8 +1034,7 @@ msgstr "Sync-Modus: nur Datensätze nach der letzten Synchronisation"
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:marketing_campaign.view_marketing_campaign_segment_search
 msgid "Sync mode: only records updated after last sync"
-msgstr ""
-"Sync-Modus: nur veränderte Datensätze nach der letzten Synchronisation"
+msgstr "Sync-Modus: nur veränderte Datensätze nach der letzten Synchronisation"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
@@ -1056,8 +1087,7 @@ msgstr "Test in Echtzeit"
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
-"Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
+msgstr "Ein- und ausgehende Verbindungen müssen zur gleichen Kampagne gehören "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
@@ -1085,8 +1115,7 @@ msgstr ""
 #: code:addons/marketing_campaign/marketing_campaign.py:111
 #, python-format
 msgid "The campaign cannot be started. There are no activities in it."
-msgstr ""
-"Die Kampagne kann nicht gestartet werden, da es keine Aktivitäten gibt"
+msgstr "Die Kampagne kann nicht gestartet werden, da es keine Aktivitäten gibt"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:800
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index b1e2fdcf933..4e3aba8d218 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -7,15 +7,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-17 21:59+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-14 21:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@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: 2014-09-24 09:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-08-15 07:26+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Permite a los usuario realizar segmentación de sus clientes.\n"
+"- Esto instala el módulo crm_profiling."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Datos demo para campañas de marketing"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Instala datos demo tales como iniciativas, campañas y segmentos para las "
+"campañas de marketing.\n"
+"- Esto instala el módulo marketing_campaign_crm_demo."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Administrar perfiles de clientes para enfocar sus campañas"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -218,8 +254,7 @@ msgid "Cancel Workitem"
 msgstr "Cancelar elemento de trabajo"
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -308,8 +343,7 @@ msgstr ""
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
 msgid "Date this segment was last closed or cancelled."
-msgstr ""
-"Fecha en la cual este segmento fue cerrado o cancelado por última vez"
+msgstr "Fecha en la cual este segmento fue cerrado o cancelado por última vez"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,day:0
@@ -487,8 +521,7 @@ msgstr "Agrupar por"
 #. module: marketing_campaign
 #: model:email.template,body_html:marketing_campaign.email_template_1
 msgid "Hello, you will receive your welcome pack via email shortly."
-msgstr ""
-"Hola, recibirá su lote de bienvenidad por correo electrónico en breve."
+msgstr "Hola, recibirá su lote de bienvenidad por correo electrónico en breve."
 
 #. module: marketing_campaign
 #: model:email.template,body_html:marketing_campaign.email_template_3
@@ -503,8 +536,7 @@ msgstr ""
 #: model:email.template,body_html:marketing_campaign.email_template_2
 msgid ""
 "Hi, we are delighted to welcome you among our Silver Partners as of today!"
-msgstr ""
-"Hola, ¡estamos encantados de darle la bienvenida como silver partner!"
+msgstr "Hola, ¡estamos encantados de darle la bienvenida como silver partner!"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -517,8 +549,7 @@ msgid "How is the destination workitem triggered"
 msgstr "Como se dispara el elemento de trabajo destino."
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -697,8 +728,7 @@ msgid "Month(s)"
 msgstr "Mes(es)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
@@ -1237,5 +1267,5 @@ msgstr "No puede duplicar una campaña. No está soportado aún."
 #~ "<p>Hi, we are delighted to let you know that you have entered the select "
 #~ "circle of our Gold Partners</p>"
 #~ msgstr ""
-#~ "<p>Hola, nos complace informarle de que ha entrado en el selecto círculo de "
-#~ "socios gold.</p>"
+#~ "<p>Hola, nos complace informarle de que ha entrado en el selecto círculo "
+#~ "de socios gold.</p>"
diff --git a/addons/marketing_campaign/i18n/hr.po b/addons/marketing_campaign/i18n/hr.po
index 340009ebe8c..433a9c71900 100644
--- a/addons/marketing_campaign/i18n/hr.po
+++ b/addons/marketing_campaign/i18n/hr.po
@@ -7,15 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-01 10:52+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Croatian <hr@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: 2014-09-24 09:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-09-02 07:34+0000\n"
+"X-Generator: Launchpad (build 17192)\n"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Demo podaci za marketinšku kampanju"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr ""
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -198,8 +229,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -476,8 +506,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -643,8 +672,7 @@ msgid "Month(s)"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/hu.po b/addons/marketing_campaign/i18n/hu.po
index a64bb62aacc..4887c1489ff 100644
--- a/addons/marketing_campaign/i18n/hu.po
+++ b/addons/marketing_campaign/i18n/hu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-10-31 12:54+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-10-31 12:58+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,42 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-11-01 07:14+0000\n"
 "X-Generator: Launchpad (build 17211)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Lehetővé teszi a felhasználó részére az ügyfeleken belüli részekre osztást.\n"
+"-Ez a crm_profiling modult telepíti."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Demo adatok a merketing kampányhoz"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Feltelepíti a demo adatokat, mint érdeklődések, kampányok és marketing "
+"kampány részeket.\n"
+"-Ez a marketing_campaign_crm_demo modult telepíti."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Ügyfél profilok nyomon követése a kampányai részleteire vonatkozóan"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -220,8 +256,7 @@ msgid "Cancel Workitem"
 msgstr "Munkaelem visszavonása"
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -516,8 +551,7 @@ msgid "How is the destination workitem triggered"
 msgstr "Ahogy a végső feladatelem kapcsolva lesz"
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -694,8 +728,7 @@ msgid "Month(s)"
 msgstr "Hónap(ok)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/it.po b/addons/marketing_campaign/i18n/it.po
index d3c7221ee87..780b196df2f 100644
--- a/addons/marketing_campaign/i18n/it.po
+++ b/addons/marketing_campaign/i18n/it.po
@@ -7,16 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-09 14:16+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <nicola.riolini@gmail.com>\n"
 "Language-Team: Italian <it@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: 2014-09-24 09:16+0000\n"
+"X-Launchpad-Export-Date: 2014-09-10 08:14+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Permette agli utenti di impostare la segmentazione nell'ambito dei partner.\n"
+"- Questo equivale ad installare il modulo crm_profiling."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Dati demo per campagne marketing"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Installa dati demo come: lead, campagne e segmentazione per campagne "
+"marketing.\n"
+"- Questo equivale ad installare il modulo marketing_campaign_crm_demo."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Traccia il profilo dei clienti per concentrare le vostre campagne"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -198,8 +234,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -481,8 +516,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -650,8 +684,7 @@ msgid "Month(s)"
 msgstr "Mese(i)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/ko.po b/addons/marketing_campaign/i18n/ko.po
index 4e97fe7c448..c7d54cc1bb3 100644
--- a/addons/marketing_campaign/i18n/ko.po
+++ b/addons/marketing_campaign/i18n/ko.po
@@ -7,16 +7,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-02 00:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-03 02:24+0000\n"
+"Last-Translator: Josh Kim <joshkkim@gmail.com>\n"
 "Language-Team: Korean <ko@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: 2014-09-24 09:16+0000\n"
+"X-Launchpad-Export-Date: 2014-09-05 01:12+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"사용자가 협력업체의 세분화를 수행할 수 있도록 함.\n"
+"- 이것은 모듈 crm_profiling을 설치합니다."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "마케팅 캠페인에 대한 데모 데이터"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"리드, 캠페인 및 마케팅 캠페인에 대한 부분 등의 데모 데이터를 설치함.\n"
+"-이것은 모듈 marketing_campaign_crm_demo를 설치합니다."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "마케팅"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "캠페인에 집중하기 위해 고객정보  추적"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -198,8 +233,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -476,8 +510,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -643,8 +676,7 @@ msgid "Month(s)"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/mk.po b/addons/marketing_campaign/i18n/mk.po
index 6e0cd6bca13..b66632f34c8 100644
--- a/addons/marketing_campaign/i18n/mk.po
+++ b/addons/marketing_campaign/i18n/mk.po
@@ -7,15 +7,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-11-06 15:15+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-10-28 12:03+0000\n"
 "Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
 "Language-Team: Macedonian <mk@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: 2014-11-07 07:34+0000\n"
-"X-Generator: Launchpad (build 17231)\n"
+"X-Launchpad-Export-Date: 2014-10-29 07:49+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Им дозволува на корисниците да извршат сегментација помеѓу партнерите.\n"
+"-Ова го инсталира модулот crm_profiling."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Демо податоци за маркетинг кампањи"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Инсталира демо податоци како траги, кампањи и сегменти за маркетинг "
+"кампањи.\n"
+"-Ова го инсталира модулот marketing_campaign_crm_demo."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Маркетинг"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Следење на профилот за фокусирање на кампањите"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -198,8 +234,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -466,8 +501,7 @@ msgstr "Групирање според"
 #. module: marketing_campaign
 #: model:email.template,body_html:marketing_campaign.email_template_1
 msgid "Hello, you will receive your welcome pack via email shortly."
-msgstr ""
-"Здраво, ќе го добиете вашиот пакет за добредојде преку е-маил наскоро."
+msgstr "Здраво, ќе го добиете вашиот пакет за добредојде преку е-маил наскоро."
 
 #. module: marketing_campaign
 #: model:email.template,body_html:marketing_campaign.email_template_3
@@ -497,8 +531,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -672,8 +705,7 @@ msgid "Month(s)"
 msgstr "Месец(и)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
@@ -1050,8 +1082,7 @@ msgstr "Кампањата не може да биде започната. Не
 #: code:addons/marketing_campaign/marketing_campaign.py:800
 #, python-format
 msgid "The current step for this item has no email or report to preview."
-msgstr ""
-"Следниот чекор за оваа точка нема email или извештај за прегледување."
+msgstr "Следниот чекор за оваа точка нема email или извештај за прегледување."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 6b1529addb9..5f5112aabb7 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/i18n/nl.po
@@ -7,15 +7,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-26 07:05+0000\n"
-"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-15 17:23+0000\n"
+"Last-Translator: Mario Gielissen (Openworx) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2014-09-24 09:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-08-16 06:56+0000\n"
+"X-Generator: Launchpad (build 17156)\n"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Stelt gebruikers in staat om de segmentatie te voeren binnen partners.\n"
+"- Deze installeert de module crm_profiling."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Demo data voor marketing campagnes"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Installeert demo data zoals leads, campagnes of gedeeltes voor marketing "
+"campagnes.\n"
+"- Deze installeert de module marketing_campaign_crm_demo."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Volg klantprofiel om uw campagnes op te richten"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -219,8 +255,7 @@ msgid "Cancel Workitem"
 msgstr "Werkitem annuleren"
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -337,11 +372,11 @@ msgid ""
 "already entered the campaign."
 msgstr ""
 "Bepaald de extra criteria om toe te voegen aan het filter, bij het "
-"selecteren van nieuwe regels om toe te voegen aan de campagne. \"Geen "
-"dubbele\" voorkomt het selecteren van regels welke al eerder aan de campagne "
-"zijn toegevoegd. Indien voor de campagne een \"uniek veld\" is ingesteld, "
-"dan zal \"Geen dubbele\" ook voorkomen dat regels worden geselecteerd met "
-"dezelfde waarde als het unieke veld."
+"selecteren van nieuwe regels om toe te voegen aan de campagne. \"Geen dubbele"
+"\" voorkomt het selecteren van regels welke al eerder aan de campagne zijn "
+"toegevoegd. Indien voor de campagne een \"uniek veld\" is ingesteld, dan zal "
+"\"Geen dubbele\" ook voorkomen dat regels worden geselecteerd met dezelfde "
+"waarde als het unieke veld."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
@@ -517,8 +552,7 @@ msgid "How is the destination workitem triggered"
 msgstr "Hoe wordt de bestemming taak geactiveerd"
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -695,8 +729,7 @@ msgid "Month(s)"
 msgstr "Maand(en)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
@@ -1228,5 +1261,5 @@ msgstr ""
 #~ "<p>Hi, we are delighted to let you know that you have entered the select "
 #~ "circle of our Gold Partners</p>"
 #~ msgstr ""
-#~ "<p>Halllo, we zijn verheugd om te melden dat u nu behoort tot de kring van "
-#~ "Gold Partners.</p>"
+#~ "<p>Halllo, we zijn verheugd om te melden dat u nu behoort tot de kring "
+#~ "van Gold Partners.</p>"
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index 5780c7645d7..5e9fa09aad8 100644
--- a/addons/marketing_campaign/i18n/pl.po
+++ b/addons/marketing_campaign/i18n/pl.po
@@ -7,15 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-30 20:24+0000\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-08-29 15:01+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-24 09:16+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
+"X-Launchpad-Export-Date: 2014-08-30 08:38+0000\n"
+"X-Generator: Launchpad (build 17176)\n"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr ""
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr ""
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Śledzenie profilu klienta dla twoich kampanii"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -198,8 +229,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -476,8 +506,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -643,8 +672,7 @@ msgid "Month(s)"
 msgstr "Miesiąc/Miesiące"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/pt_BR.po b/addons/marketing_campaign/i18n/pt_BR.po
index 81cf3aa591d..1a6d10c4da6 100644
--- a/addons/marketing_campaign/i18n/pt_BR.po
+++ b/addons/marketing_campaign/i18n/pt_BR.po
@@ -7,17 +7,53 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-09-06 19:34+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@zupy.com.br>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-09-06 19:24+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br <webmaster@zupy.com."
+"br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2014-09-24 09:16+0000\n"
+"X-Launchpad-Export-Date: 2014-09-07 07:48+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"Permite aos usuários realizar a segmentação entre os parceiros. \n"
+"-Instala o módulo crm_profiling."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Dados de demonstração para campanhas de marketing"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Instala dados de demonstração, como prospectos, campanhas e segmentos para "
+"campanhas de marketing. \n"
+"-Instala o módulo marketing_campaign_crm_demo."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Acompanhar o perfil de cliente para focar suas campanhas"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -204,8 +240,7 @@ msgid "Cancel Workitem"
 msgstr "Cancelar item de Trabalho"
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -503,8 +538,7 @@ msgid "How is the destination workitem triggered"
 msgstr "Como o item de trabalho é disparado"
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -681,8 +715,7 @@ msgid "Month(s)"
 msgstr "Mês(es)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_campaign/i18n/tr.po b/addons/marketing_campaign/i18n/tr.po
index 4c3c8befb4a..f45ebc46b7d 100644
--- a/addons/marketing_campaign/i18n/tr.po
+++ b/addons/marketing_campaign/i18n/tr.po
@@ -7,16 +7,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-09-23 16:28+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-08-14 13:09+0000\n"
+"PO-Revision-Date: 2014-10-13 10:55+0000\n"
+"Last-Translator: Ayhan KIZILTAN <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: 2014-09-24 09:16+0000\n"
+"X-Launchpad-Export-Date: 2014-10-15 20:29+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#. module: marketing_crm
+#: help:marketing.config.settings,module_crm_profiling:0
+msgid ""
+"Allows users to perform segmentation within partners.\n"
+"-This installs the module crm_profiling."
+msgstr ""
+"İş ortaklarının bölümlenme işlemlerinin yürütülmesini sağlar.\n"
+"-Bu, crm_profiling modülünü kurar."
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid "Demo data for marketing campaigns"
+msgstr "Pazarlama kampanyaları için demo veri"
+
+#. module: marketing_crm
+#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
+msgid ""
+"Installs demo data like leads, campaigns and segments for Marketing "
+"Campaigns.\n"
+"-This installs the module marketing_campaign_crm_demo."
+msgstr ""
+"Adaylar, kampanyalar gibi demo verilerini ve Pazarlama Kampanyaları "
+"bölümlerini kurar."
+
+#. module: marketing_crm
+#: view:crm.lead:marketing_crm.view_crm_lead_form
+#: view:crm.lead:marketing_crm.view_crm_opportunity_form
+msgid "Marketing"
+msgstr "Pazarlama"
+
+#. module: marketing_crm
+#: field:marketing.config.settings,module_crm_profiling:0
+msgid "Track customer profile to focus your campaigns"
+msgstr "Kampanyalarınızı odaklamak için müşteri profil takibi"
+
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
@@ -198,8 +233,7 @@ msgid "Cancel Workitem"
 msgstr ""
 
 #. module: marketing_campaign
-#: selection:campaign.analysis,state:0
-#: selection:marketing.campaign,state:0
+#: selection:campaign.analysis,state:0 selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
@@ -476,8 +510,7 @@ msgid "How is the destination workitem triggered"
 msgstr ""
 
 #. module: marketing_campaign
-#: field:campaign.analysis,id:0
-#: field:marketing.campaign,id:0
+#: field:campaign.analysis,id:0 field:marketing.campaign,id:0
 #: field:marketing.campaign.activity,id:0
 #: field:marketing.campaign.segment,id:0
 #: field:marketing.campaign.transition,id:0
@@ -643,8 +676,7 @@ msgid "Month(s)"
 msgstr "Ay(lar)"
 
 #. module: marketing_campaign
-#: field:marketing.campaign,name:0
-#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign,name:0 field:marketing.campaign.activity,name:0
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
diff --git a/addons/marketing_crm/models/res_config.py b/addons/marketing_campaign/res_config.py
similarity index 88%
rename from addons/marketing_crm/models/res_config.py
rename to addons/marketing_campaign/res_config.py
index 0852e952e57..cdd897fcdf0 100644
--- a/addons/marketing_crm/models/res_config.py
+++ b/addons/marketing_campaign/res_config.py
@@ -3,7 +3,7 @@
 from openerp.osv import fields, osv
 
 
-class CrmMarketingConfig(osv.TransientModel):
+class MarketingCampaignConfig(osv.TransientModel):
     _name = 'marketing.config.settings'
     _inherit = 'marketing.config.settings'
 
@@ -12,4 +12,4 @@ class CrmMarketingConfig(osv.TransientModel):
             'Demo data for marketing campaigns',
             help='Installs demo data like leads, campaigns and segments for Marketing Campaigns.\n'
                  '-This installs the module marketing_campaign_crm_demo.'),
-    }
+    }
\ No newline at end of file
diff --git a/addons/marketing_campaign/res_config.xml b/addons/marketing_campaign/res_config.xml
new file mode 100644
index 00000000000..92c5f7389dc
--- /dev/null
+++ b/addons/marketing_campaign/res_config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_marketing_configuration" model="ir.ui.view">
+            <field name="name">marketing.campaign.config.settings</field>
+            <field name="model">marketing.config.settings</field>
+            <field name="inherit_id" ref="marketing.view_marketing_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='config_setting']" position="after">
+                    <separator string="Marketing Campaigns"/>
+                    <group>
+                        <label for="id" string="Settings"/>
+                        <div>
+                            <field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
+                            <label for="module_marketing_campaign_crm_demo"/>
+                        </div>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/marketing_crm/__init__.py b/addons/marketing_crm/__init__.py
deleted file mode 100644
index e2776a1c439..00000000000
--- a/addons/marketing_crm/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-TODAY OpenERP SA (http://www.openerp.com)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import models
diff --git a/addons/marketing_crm/__openerp__.py b/addons/marketing_crm/__openerp__.py
deleted file mode 100644
index 783dcb04950..00000000000
--- a/addons/marketing_crm/__openerp__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-{
-    'name': 'Marketing in CRM',
-    'version': '1.0',
-    'depends': ['marketing', 'crm'],
-    'author': 'OpenERP SA',
-    'category': 'Hidden/Dependency',
-    'description': """
-Bridge module between marketing and CRM
-    """,
-    'website': 'https://www.odoo.com/page/crm',
-    'data': [
-        'views/crm.xml',
-        'views/res_config.xml',
-    ],
-    'demo': [],
-    'installable': True,
-    'auto_install': True,
-}
diff --git a/addons/marketing_crm/i18n/de.po b/addons/marketing_crm/i18n/de.po
deleted file mode 100644
index ef77cbc4719..00000000000
--- a/addons/marketing_crm/i18n/de.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-15 08:54+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-09-16 08:34+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Ermögliche die Segmentierung von Kunden\n"
-"- Hierdurch installieren Sie das Modul crm_profiling"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Demodaten für Marketingkampagnen"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Demodaten für Interessenten, Kampagnen und Segmente für Marketingkampagnen.\n"
-"- Hierdurch wird das Modul marketing_campaign_crm_demo installiert"
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Verfolge Kundenprofile zur Spezifikation von Kampagnen"
diff --git a/addons/marketing_crm/i18n/es.po b/addons/marketing_crm/i18n/es.po
deleted file mode 100644
index 9c294b0af54..00000000000
--- a/addons/marketing_crm/i18n/es.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 21:02+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@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: 2014-08-15 07:26+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Permite a los usuario realizar segmentación de sus clientes.\n"
-"- Esto instala el módulo crm_profiling."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Datos demo para campañas de marketing"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Instala datos demo tales como iniciativas, campañas y segmentos para las "
-"campañas de marketing.\n"
-"- Esto instala el módulo marketing_campaign_crm_demo."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Administrar perfiles de clientes para enfocar sus campañas"
diff --git a/addons/marketing_crm/i18n/hr.po b/addons/marketing_crm/i18n/hr.po
deleted file mode 100644
index 24486dc74b2..00000000000
--- a/addons/marketing_crm/i18n/hr.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-01 10:52+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@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: 2014-09-02 07:34+0000\n"
-"X-Generator: Launchpad (build 17192)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Demo podaci za marketinšku kampanju"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr ""
diff --git a/addons/marketing_crm/i18n/hu.po b/addons/marketing_crm/i18n/hu.po
deleted file mode 100644
index cb9ee2f8f9b..00000000000
--- a/addons/marketing_crm/i18n/hu.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-10-31 12:58+0000\n"
-"Last-Translator: krnkris <Unknown>\n"
-"Language-Team: Hungarian <hu@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: 2014-11-01 07:14+0000\n"
-"X-Generator: Launchpad (build 17211)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Lehetővé teszi a felhasználó részére az ügyfeleken belüli részekre osztást.\n"
-"-Ez a crm_profiling modult telepíti."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Demo adatok a merketing kampányhoz"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Feltelepíti a demo adatokat, mint érdeklődések, kampányok és marketing "
-"kampány részeket.\n"
-"-Ez a marketing_campaign_crm_demo modult telepíti."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Ügyfél profilok nyomon követése a kampányai részleteire vonatkozóan"
diff --git a/addons/marketing_crm/i18n/it.po b/addons/marketing_crm/i18n/it.po
deleted file mode 100644
index cbe65d269ad..00000000000
--- a/addons/marketing_crm/i18n/it.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-09 14:16+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <nicola.riolini@gmail.com>\n"
-"Language-Team: Italian <it@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: 2014-09-10 08:14+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Permette agli utenti di impostare la segmentazione nell'ambito dei partner.\n"
-"- Questo equivale ad installare il modulo crm_profiling."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Dati demo per campagne marketing"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Installa dati demo come: lead, campagne e segmentazione per campagne "
-"marketing.\n"
-"- Questo equivale ad installare il modulo marketing_campaign_crm_demo."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Traccia il profilo dei clienti per concentrare le vostre campagne"
diff --git a/addons/marketing_crm/i18n/ko.po b/addons/marketing_crm/i18n/ko.po
deleted file mode 100644
index 7aa45f2773b..00000000000
--- a/addons/marketing_crm/i18n/ko.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-03 02:24+0000\n"
-"Last-Translator: Josh Kim <joshkkim@gmail.com>\n"
-"Language-Team: Korean <ko@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: 2014-09-05 01:12+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"사용자가 협력업체의 세분화를 수행할 수 있도록 함.\n"
-"- 이것은 모듈 crm_profiling을 설치합니다."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "마케팅 캠페인에 대한 데모 데이터"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"리드, 캠페인 및 마케팅 캠페인에 대한 부분 등의 데모 데이터를 설치함.\n"
-"-이것은 모듈 marketing_campaign_crm_demo를 설치합니다."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "마케팅"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "캠페인에 집중하기 위해 고객정보  추적"
diff --git a/addons/marketing_crm/i18n/marketing_crm.pot b/addons/marketing_crm/i18n/marketing_crm.pot
deleted file mode 100644
index d38c151730f..00000000000
--- a/addons/marketing_crm/i18n/marketing_crm.pot
+++ /dev/null
@@ -1,45 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* marketing_crm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 8.0rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 13:09+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid "Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr ""
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Installs demo data like leads, campaigns and segments for Marketing Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr ""
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr ""
-
diff --git a/addons/marketing_crm/i18n/mk.po b/addons/marketing_crm/i18n/mk.po
deleted file mode 100644
index 58659e42c1a..00000000000
--- a/addons/marketing_crm/i18n/mk.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-10-28 12:03+0000\n"
-"Last-Translator: Tome Barbov <tome.barbov@eskon.com.mk>\n"
-"Language-Team: Macedonian <mk@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: 2014-10-29 07:49+0000\n"
-"X-Generator: Launchpad (build 17203)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Им дозволува на корисниците да извршат сегментација помеѓу партнерите.\n"
-"-Ова го инсталира модулот crm_profiling."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Демо податоци за маркетинг кампањи"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Инсталира демо податоци како траги, кампањи и сегменти за маркетинг "
-"кампањи.\n"
-"-Ова го инсталира модулот marketing_campaign_crm_demo."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Маркетинг"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Следење на профилот за фокусирање на кампањите"
diff --git a/addons/marketing_crm/i18n/nl.po b/addons/marketing_crm/i18n/nl.po
deleted file mode 100644
index d3355c9890a..00000000000
--- a/addons/marketing_crm/i18n/nl.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-15 17:23+0000\n"
-"Last-Translator: Mario Gielissen (Openworx) <Unknown>\n"
-"Language-Team: Dutch <nl@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: 2014-08-16 06:56+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Stelt gebruikers in staat om de segmentatie te voeren binnen partners.\n"
-"- Deze installeert de module crm_profiling."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Demo data voor marketing campagnes"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Installeert demo data zoals leads, campagnes of gedeeltes voor marketing "
-"campagnes.\n"
-"- Deze installeert de module marketing_campaign_crm_demo."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Volg klantprofiel om uw campagnes op te richten"
diff --git a/addons/marketing_crm/i18n/pl.po b/addons/marketing_crm/i18n/pl.po
deleted file mode 100644
index 503ee96c3a8..00000000000
--- a/addons/marketing_crm/i18n/pl.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-29 15:01+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-30 08:38+0000\n"
-"X-Generator: Launchpad (build 17176)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr ""
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr ""
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Śledzenie profilu klienta dla twoich kampanii"
diff --git a/addons/marketing_crm/i18n/pt_BR.po b/addons/marketing_crm/i18n/pt_BR.po
deleted file mode 100644
index 87b1d5c18f2..00000000000
--- a/addons/marketing_crm/i18n/pt_BR.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-09-06 19:24+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@zupy.com.br>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@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: 2014-09-07 07:48+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"Permite aos usuários realizar a segmentação entre os parceiros. \n"
-"-Instala o módulo crm_profiling."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Dados de demonstração para campanhas de marketing"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Instala dados de demonstração, como prospectos, campanhas e segmentos para "
-"campanhas de marketing. \n"
-"-Instala o módulo marketing_campaign_crm_demo."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Marketing"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Acompanhar o perfil de cliente para focar suas campanhas"
diff --git a/addons/marketing_crm/i18n/tr.po b/addons/marketing_crm/i18n/tr.po
deleted file mode 100644
index aa483d81692..00000000000
--- a/addons/marketing_crm/i18n/tr.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-10-13 10:55+0000\n"
-"Last-Translator: Ayhan KIZILTAN <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: 2014-10-15 20:29+0000\n"
-"X-Generator: Launchpad (build 17196)\n"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_crm_profiling:0
-msgid ""
-"Allows users to perform segmentation within partners.\n"
-"-This installs the module crm_profiling."
-msgstr ""
-"İş ortaklarının bölümlenme işlemlerinin yürütülmesini sağlar.\n"
-"-Bu, crm_profiling modülünü kurar."
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid "Demo data for marketing campaigns"
-msgstr "Pazarlama kampanyaları için demo veri"
-
-#. module: marketing_crm
-#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
-msgid ""
-"Installs demo data like leads, campaigns and segments for Marketing "
-"Campaigns.\n"
-"-This installs the module marketing_campaign_crm_demo."
-msgstr ""
-"Adaylar, kampanyalar gibi demo verilerini ve Pazarlama Kampanyaları "
-"bölümlerini kurar."
-
-#. module: marketing_crm
-#: view:crm.lead:marketing_crm.view_crm_lead_form
-#: view:crm.lead:marketing_crm.view_crm_opportunity_form
-msgid "Marketing"
-msgstr "Pazarlama"
-
-#. module: marketing_crm
-#: field:marketing.config.settings,module_crm_profiling:0
-msgid "Track customer profile to focus your campaigns"
-msgstr "Kampanyalarınızı odaklamak için müşteri profil takibi"
diff --git a/addons/marketing_crm/models/__init__.py b/addons/marketing_crm/models/__init__.py
deleted file mode 100644
index 7eb689fa199..00000000000
--- a/addons/marketing_crm/models/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import res_config
diff --git a/addons/marketing_crm/views/crm.xml b/addons/marketing_crm/views/crm.xml
deleted file mode 100644
index dff75453c92..00000000000
--- a/addons/marketing_crm/views/crm.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record id="view_crm_lead_form" model="ir.ui.view">
-            <field name="name">crm.lead.inherit.form</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='categorization']" position="attributes">
-                    <attribute name="string">Marketing</attribute>
-                    <attribute name="groups"></attribute>
-                </xpath>
-                <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="campaign_id" />
-                    <field name="medium_id"/>
-                    <field name="source_id" />
-                </xpath>
-            </field>
-        </record>
-
-        <record id="view_crm_opportunity_form" model="ir.ui.view">
-            <field name="name">crm.lead.inherit.form</field>
-            <field name="model">crm.lead</field>
-            <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='mailings']" position="before">
-                    <group string="Marketing">
-                        <field name="campaign_id" />
-                        <field name="medium_id" />
-                        <field name="source_id" />
-                    </group>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/marketing_crm/views/res_config.xml b/addons/marketing_crm/views/res_config.xml
deleted file mode 100644
index 5014cb12fa2..00000000000
--- a/addons/marketing_crm/views/res_config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_marketing_configuration" model="ir.ui.view">
-            <field name="name">marketing.config.settings.crm</field>
-            <field name="model">marketing.config.settings</field>
-            <field name="inherit_id" ref="marketing.view_marketing_configuration"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='module_marketing_campaign']" position="after">
-                    <div attrs="{'invisible':[('module_marketing_campaign','=',False)]}">
-                        <field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
-                        <label for="module_marketing_campaign_crm_demo"/>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/mass_mailing/views/res_config.xml b/addons/mass_mailing/views/res_config.xml
index 0f61086e2cc..11a5b2c4dae 100644
--- a/addons/mass_mailing/views/res_config.xml
+++ b/addons/mass_mailing/views/res_config.xml
@@ -7,11 +7,15 @@
             <field name="model">marketing.config.settings</field>
             <field name="inherit_id" ref="marketing.view_marketing_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='module_mass_mailing']" position="after">
-                    <div>
-                        <field name="group_mass_mailing_campaign" class="oe_inline"/>
-                        <label for="group_mass_mailing_campaign"/>
-                    </div>
+                <xpath expr="//div[@name='config_setting']" position="after">
+                    <separator string="Mass Mailing"/>
+                    <group>
+                        <label for="id" string="Settings"/>
+                        <div>
+                            <field name="group_mass_mailing_campaign" class="oe_inline"/>
+                            <label for="group_mass_mailing_campaign"/>
+                        </div>
+                    </group>
                 </xpath>
             </field>
         </record>