From 2b0635ac8fed9e4986d2eaad367f7f157ada772c Mon Sep 17 00:00:00 2001
From: Albert Cervera i Areny <albert@nan-tic.com>
Date: Mon, 25 Aug 2014 13:39:15 +0200
Subject: [PATCH] Fix typos.

---
 locale/ca_ES.po | 16 +++-------------
 locale/es_ES.po | 14 ++------------
 opportunity.py  |  2 +-
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 49db61a..c53b531 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -90,27 +90,17 @@ msgctxt "field:sale.opportunity.create_campaign.start,relation:"
 msgid "Relation"
 msgstr "Relació"
 
-<<<<<<<
-=======
 msgctxt "field:sale.opportunity.create_campaign.start,relation_visible:"
 msgid "Relation Visible"
 msgstr "Relació visible"
 
 msgctxt "help:sale.opportunity.create_campaign.start,all_contacts:"
 msgid ""
-"If marked a lead will be created for each contact of the  selected type. "
->>>>>>>
-msgctxt "field:sale.opportunity.create_campaign.start,relation_visible:"
-msgid "Relation Visible"
-msgstr "Relació visible"
-
-msgctxt "help:sale.opportunity.create_campaign.start,all_contacts:"
-msgid ""
-"If marked a lead will be created for each contact of the  selected type. "
-"Otherwise only the first one fill be used."
+"If marked a lead will be created for each contact of the selected type. "
+"Otherwise only the first one will be used."
 msgstr ""
 "Si es marca es generarà una iniciativa per a cada un dels contactes del "
-"tipus seleccionat. Sinó només s'utilitzarà el primer."
+"tipus seleccionat. Si no, només s'utilitzarà el primer."
 
 msgctxt "help:sale.opportunity.create_campaign.start,create_leads:"
 msgid ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1efefe2..7f3aecc 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -90,16 +90,6 @@ msgctxt "field:sale.opportunity.create_campaign.start,relation:"
 msgid "Relation"
 msgstr "Relación"
 
-<<<<<<<
-=======
-msgctxt "field:sale.opportunity.create_campaign.start,relation_visible:"
-msgid "Relation Visible"
-msgstr "Relación visible"
-
-msgctxt "help:sale.opportunity.create_campaign.start,all_contacts:"
-msgid ""
-"If marked a lead will be created for each contact of the  selected type. "
->>>>>>>
 msgctxt "field:sale.opportunity.create_campaign.start,relation_visible:"
 msgid "Relation Visible"
 msgstr "Relación visible"
@@ -109,8 +99,8 @@ msgid ""
 "If marked a lead will be created for each contact of the  selected type. "
 "Otherwise only the first one fill be used."
 msgstr ""
-"Si se merca se creará una iniciativa para cada uno de los contactos del tipo"
-" seleccionado. Sino, solo se utilizará el primero."
+"Si se marca, se creará una iniciativa para cada uno de los contactos del tipo"
+" seleccionado. Sino, sólo se utilizará el primero."
 
 msgctxt "help:sale.opportunity.create_campaign.start,create_leads:"
 msgid ""
diff --git a/opportunity.py b/opportunity.py
index b3df410..7b353ef 100644
--- a/opportunity.py
+++ b/opportunity.py
@@ -112,7 +112,7 @@ class CreateCampaignStart:
             },
         depends=['relation'],
         help='If marked a lead will be created for each contact of the '
-        ' selected type. Otherwise only the first one fill be used.')
+        'selected type. Otherwise only the first one will be used.')
 
 
 class CreateCampaign: