diff --git a/partner_relations/i18n/da.po b/partner_relations/i18n/da.po
index 9ddb7d1b8..65e24c77c 100644
--- a/partner_relations/i18n/da.po
+++ b/partner_relations/i18n/da.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Danish (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Aktiv"
 
@@ -49,16 +56,11 @@ msgid "All relations with current partner"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr ""
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Virksomhed"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -72,14 +74,8 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Aktuel partner"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr ""
 
@@ -88,6 +84,13 @@ msgstr ""
 msgid "Current record's partner type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -102,25 +105,35 @@ msgid "Display Name"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,date_end:0
-#: field:res.partner.relation.all,date_end:0
-msgid "Ending date"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Group By"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
+#: field:res.partner.relation,date_end:0
+#: field:res.partner.relation.all,date_end:0
+msgid "Ending date"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Group By"
 msgstr ""
 
 #. module: partner_relations
@@ -138,11 +151,6 @@ msgstr ""
 msgid "Has relation with a partner in category"
 msgstr ""
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -151,25 +159,28 @@ msgid "ID"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,name_inverse:0
-msgid "Inverse name"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
 msgstr ""
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
+#: field:res.partner.relation.type,name_inverse:0
+msgid "Inverse name"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
 msgstr ""
 
 #. module: partner_relations
@@ -193,18 +204,13 @@ msgid "Last Updated on"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
+#: field:res.partner.relation.type,partner_category_left:0
+msgid "Left partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_left:0
-msgid "Left partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
 msgstr ""
 
 #. module: partner_relations
@@ -217,12 +223,35 @@ msgstr ""
 msgid "Left side of relation"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Navn"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -241,23 +270,16 @@ msgstr ""
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr ""
@@ -268,45 +290,42 @@ msgstr ""
 msgid "Partner Relations Types"
 msgstr ""
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
 msgstr ""
 
 #. module: partner_relations
@@ -320,44 +339,41 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
+#: field:res.partner.relation.type,partner_category_right:0
+msgid "Right partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_right:0
-msgid "Right partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
 msgstr ""
 
 #. module: partner_relations
@@ -371,19 +387,18 @@ msgid "Right side of relation"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Search Relations"
+msgid "Right to left"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
-msgid "Show partner's relations"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Search Relations"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
+#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
+msgid "Show partner's relations"
 msgstr ""
 
 #. module: partner_relations
@@ -398,34 +413,107 @@ msgid "Starting date"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr ""
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
 msgstr ""
diff --git a/partner_relations/i18n/de.po b/partner_relations/i18n/de.po
index 45ac46e96..e74048692 100644
--- a/partner_relations/i18n/de.po
+++ b/partner_relations/i18n/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: German (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -19,17 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr "<p class=\"oe_view_nocontent_create\">\n                    Aufzeichnen und Beobachten der Beziehungen des Partners. Beziehungen mit anderen Partnern können entweder direkt oder rückwirkend hergestellt werden.\n                </p>\n            "
+msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Aktiv"
 
@@ -49,16 +56,11 @@ msgid "All relations with current partner"
 msgstr "Alle Beziehungen mit diesem Partner"
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr "Erlaube beide Seiten gleich zu sein"
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Unternehmen"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -72,14 +74,8 @@ msgstr "erstellt von"
 msgid "Created on"
 msgstr "erstellt am"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Aktueller Partner"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr "Kategorie des aktuellen Datensatzes"
 
@@ -88,6 +84,13 @@ msgstr "Kategorie des aktuellen Datensatzes"
 msgid "Current record's partner type"
 msgstr "Partnerart des aktuellen Datensatzes"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -101,6 +104,20 @@ msgstr "Zielpartner"
 msgid "Display Name"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
 #: field:res.partner.relation.all,date_end:0
@@ -108,21 +125,17 @@ msgid "Ending date"
 msgstr "Enddatum"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Group By"
 msgstr "Gruppieren"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
-msgstr "Hat Assistent"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr "Hat ehemaligen Mitarbeiter"
-
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -138,11 +151,6 @@ msgstr "Hat Beziehung mit"
 msgid "Has relation with a partner in category"
 msgstr "Hat Beziehung mit Partner der Kategorie"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr "Hat gearbeitet für"
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -150,27 +158,30 @@ msgstr "Hat gearbeitet für"
 msgid "ID"
 msgstr "ID"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name_inverse:0
 msgid "Inverse name"
 msgstr "Umgekehrte Bezeichnung"
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
-msgstr "Art der Umkehrung"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
-msgstr "Ist Assistent von"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
-msgstr "Ist Mitbewerber von"
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,__last_update:0
@@ -192,21 +203,16 @@ msgstr "zuletzt aktualisiert von"
 msgid "Last Updated on"
 msgstr "zuletzt aktualisiert am"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr "Linker Partner"
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
-msgstr "Art des linken Partners"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_left:0
 msgid "Left partner category"
 msgstr "Kategorie des linken Partners"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_left:0
 msgid "Left partner type"
@@ -217,12 +223,35 @@ msgstr "Art des linken Partners"
 msgid "Left side of relation"
 msgstr "Linker Zweig der Beziehung"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Name"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -241,23 +270,16 @@ msgstr "Partnerart des anderen Satzes"
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr "Partnerbeziehung"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr "Art der Partnerbeziehung"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr "Partnerbeziehungen"
@@ -268,46 +290,43 @@ msgstr "Partnerbeziehungen"
 msgid "Partner Relations Types"
 msgstr "Arten von Partnerbeziehungen"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr "Partnerart"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr "Partnerbeziehung"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Partner dürfen nicht mit sich selbst in Beziehung stehen."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Person"
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr "Satzart"
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
-msgstr "Satzart"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
-msgstr "Partner mit Beziehung"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation.all,relation_id:0
@@ -320,46 +339,43 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr "Art der Beziehung"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr "Beziehung zulässig"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr "Beziehungen"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr "Art der Beziehung"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr "Rechter Partner"
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
-msgstr "Art des rechten Partners"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_right:0
 msgid "Right partner category"
 msgstr "Kategorie des rechten Partners"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_right:0
 msgid "Right partner type"
@@ -371,7 +387,11 @@ msgid "Right side of relation"
 msgstr "Rechter Zweig der Beziehung"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Right to left"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Search Relations"
 msgstr "Suche in Beziehungen"
@@ -381,11 +401,6 @@ msgstr "Suche in Beziehungen"
 msgid "Show partner's relations"
 msgstr "Zeige Beziehungen des Partners"
 
-#. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
-msgstr "Zeige Partner"
-
 #. module: partner_relations
 #: field:res.partner.relation,left_partner_id:0
 msgid "Source Partner"
@@ -398,34 +413,107 @@ msgid "Starting date"
 msgstr "Anfangsdatum"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "Der %s Partner ist für diese Beziehungsart nicht geeignet."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "Das Anfangsdatum darf nicht nach dem Enddatum liegen."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Es gibt bereits eine ähnliche Beziehung mit überlappenden Daten"
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr "Art"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
-msgstr "Nicht unterstützter Such-Operand \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""
diff --git a/partner_relations/i18n/es.po b/partner_relations/i18n/es.po
index df981f1c7..0e3ca3288 100644
--- a/partner_relations/i18n/es.po
+++ b/partner_relations/i18n/es.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Iván Todorovich <ivan.todorovich@gmail.com>, 2015
-# Oihane Crucelaegui <oihanecruce@gmail.com>, 2016
+# Iván Todorovich <ivan.todorovich@gmail.com>, 2015
+# oihane <oihanecruce@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-25 11:58+0000\n"
-"PO-Revision-Date: 2016-07-14 09:06+0000\n"
-"Last-Translator: Oihane Crucelaegui <oihanecruce@gmail.com>\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr "<p class=\"oe_view_nocontent_create\">\n                    Registro y seguimiento de las relaciones de sus empresas. Las relaciones pueden estar vinculadas a otras empresas con un tipo de relación directa o inversamente.\n                </p>\n            "
+msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Activo"
 
@@ -50,16 +58,11 @@ msgid "All relations with current partner"
 msgstr "Todas las relaciones con la empresa actual"
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr "Permitir que ambos lados sean iguales"
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Empresa"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -73,14 +76,8 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado en"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Empresa actual"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr "Etiqueta del registro actual"
 
@@ -89,6 +86,13 @@ msgstr "Etiqueta del registro actual"
 msgid "Current record's partner type"
 msgstr "Tipo de empresa del registro actual"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -102,6 +106,20 @@ msgstr "Empresa destino"
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
 #: field:res.partner.relation.all,date_end:0
@@ -109,21 +127,17 @@ msgid "Ending date"
 msgstr "Fecha fin"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Group By"
 msgstr "Agrupar por"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
-msgstr "Tiene asistente"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr "Tiene ex-empleado"
-
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -139,11 +153,6 @@ msgstr "Tiene una relación con"
 msgid "Has relation with a partner in category"
 msgstr "Tiene una relación con las empresas con la etiqueta"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr "Ha trabajado para"
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -151,27 +160,30 @@ msgstr "Ha trabajado para"
 msgid "ID"
 msgstr "ID"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name_inverse:0
 msgid "Inverse name"
 msgstr "Nombre inverso"
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
-msgstr "Tipo inverso"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
-msgstr "Es asistente de"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
-msgstr "Es competidor de"
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,__last_update:0
@@ -193,21 +205,16 @@ msgstr "Última actualización por"
 msgid "Last Updated on"
 msgstr "Última actualización en"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr "Empresa izquierda"
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
-msgstr "Tipo de empresa izquierda"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_left:0
 msgid "Left partner category"
 msgstr "Etiqueta empresa izquierda"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_left:0
 msgid "Left partner type"
@@ -218,12 +225,35 @@ msgstr "Tipo de empresa izquierda"
 msgid "Left side of relation"
 msgstr "Lado izquierdo de la relación"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Nombre"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -242,23 +272,16 @@ msgstr "Tipo de empresa del otro registro"
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr "Relación entre empresas"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr "Tipo de relación entre empresas"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr "Relaciones entre empresas"
@@ -269,46 +292,43 @@ msgstr "Relaciones entre empresas"
 msgid "Partner Relations Types"
 msgstr "Tipos de relaciones entre empresas"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr "Tipo de empresa"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr "Relación de empresa"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Partners cannot have a relation with themselves."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Contacto"
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr "Tipo de registro"
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
-msgstr "Tipo de registro"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
-msgstr "Empresas relacionadas"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation.all,relation_id:0
@@ -321,46 +341,43 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr "Tipo de relación"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr "Relación válida"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr "Relaciones"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr "Tipo de relación"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr "Empresa derecha"
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
-msgstr "Tipo de empresa derecha"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_right:0
 msgid "Right partner category"
 msgstr "Etiqueta empresa derecha"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_right:0
 msgid "Right partner type"
@@ -372,7 +389,11 @@ msgid "Right side of relation"
 msgstr "Lado derecho de la relación"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Right to left"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Search Relations"
 msgstr "Buscar relaciones"
@@ -382,11 +403,6 @@ msgstr "Buscar relaciones"
 msgid "Show partner's relations"
 msgstr "Mostrar la relaiones de la empresa"
 
-#. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
-msgstr "Mostrar empresas"
-
 #. module: partner_relations
 #: field:res.partner.relation,left_partner_id:0
 msgid "Source Partner"
@@ -399,34 +415,107 @@ msgid "Starting date"
 msgstr "Fecha inicio"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "La empresa %s no aplica para este tipo de relación"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "La fecha de inicio no puede ser posterior a la fecha de fin."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Hay una relación similar que se solapa en fechas"
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
-msgstr "Operando de búsqueda no soportado: \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""
diff --git a/partner_relations/i18n/fi.po b/partner_relations/i18n/fi.po
index e180d1e6c..d76e1becd 100644
--- a/partner_relations/i18n/fi.po
+++ b/partner_relations/i18n/fi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Finnish (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr ""
 
@@ -48,15 +55,10 @@ msgid "All relations with current partner"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr ""
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
+msgid "Allow existing relations that do not fit changed conditions"
 msgstr ""
 
 #. module: partner_relations
@@ -71,14 +73,8 @@ msgstr "Luonut"
 msgid "Created on"
 msgstr "Luotu"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr ""
 
@@ -87,6 +83,13 @@ msgstr ""
 msgid "Current record's partner type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -101,25 +104,35 @@ msgid "Display Name"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,date_end:0
-#: field:res.partner.relation.all,date_end:0
-msgid "Ending date"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Group By"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
+#: field:res.partner.relation,date_end:0
+#: field:res.partner.relation.all,date_end:0
+msgid "Ending date"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Group By"
 msgstr ""
 
 #. module: partner_relations
@@ -137,11 +150,6 @@ msgstr ""
 msgid "Has relation with a partner in category"
 msgstr ""
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -150,25 +158,28 @@ msgid "ID"
 msgstr "ID"
 
 #. module: partner_relations
-#: field:res.partner.relation.type,name_inverse:0
-msgid "Inverse name"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
 msgstr ""
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
+#: field:res.partner.relation.type,name_inverse:0
+msgid "Inverse name"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
 msgstr ""
 
 #. module: partner_relations
@@ -192,18 +203,13 @@ msgid "Last Updated on"
 msgstr "Viimeksi päivittänyt"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
+#: field:res.partner.relation.type,partner_category_left:0
+msgid "Left partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_left:0
-msgid "Left partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
 msgstr ""
 
 #. module: partner_relations
@@ -216,12 +222,35 @@ msgstr ""
 msgid "Left side of relation"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Nimi"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -240,23 +269,16 @@ msgstr ""
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Kumppani"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr ""
@@ -267,45 +289,42 @@ msgstr ""
 msgid "Partner Relations Types"
 msgstr ""
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
 msgstr ""
 
 #. module: partner_relations
@@ -319,44 +338,41 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
+#: field:res.partner.relation.type,partner_category_right:0
+msgid "Right partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_right:0
-msgid "Right partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
 msgstr ""
 
 #. module: partner_relations
@@ -370,19 +386,18 @@ msgid "Right side of relation"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Search Relations"
+msgid "Right to left"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
-msgid "Show partner's relations"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Search Relations"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
+#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
+msgid "Show partner's relations"
 msgstr ""
 
 #. module: partner_relations
@@ -397,34 +412,107 @@ msgid "Starting date"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr ""
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
 msgstr ""
diff --git a/partner_relations/i18n/fr.po b/partner_relations/i18n/fr.po
index 58479aa0a..e120f35f0 100644
--- a/partner_relations/i18n/fr.po
+++ b/partner_relations/i18n/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: French (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,17 +21,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr "<p class=\"oe_view_nocontent_create\">\n                    Enregistrer et suivre les relations de vos partenaires. Les relations peuvent être liés avec d'autre partenaires avec un type, soit directement ou inversement.\n                </p>\n            "
+msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Actif"
 
@@ -51,16 +58,11 @@ msgid "All relations with current partner"
 msgstr "Tous les relations avec le partenaire courant"
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr ""
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Société"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -74,14 +76,8 @@ msgstr "Créé par"
 msgid "Created on"
 msgstr "Créé le"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Partenaire courant"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr "Catégorie de l'enregistrement courante"
 
@@ -90,6 +86,13 @@ msgstr "Catégorie de l'enregistrement courante"
 msgid "Current record's partner type"
 msgstr "Type de partenaire de l'enregistrement courrant"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -103,6 +106,20 @@ msgstr "Partenaire destinataire"
 msgid "Display Name"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
 #: field:res.partner.relation.all,date_end:0
@@ -110,20 +127,16 @@ msgid "Ending date"
 msgstr "Date de fin"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Group By"
-msgstr "Regrouper par"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr ""
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Group By"
+msgstr "Regrouper par"
 
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
@@ -140,11 +153,6 @@ msgstr "A une relation avec"
 msgid "Has relation with a partner in category"
 msgstr "A une relation avec un partenaire dans la catégorie"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -152,26 +160,29 @@ msgstr ""
 msgid "ID"
 msgstr "Id"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name_inverse:0
 msgid "Inverse name"
 msgstr "Nom inverse"
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
-msgstr "Type inverse"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
 msgstr ""
 
 #. module: partner_relations
@@ -194,21 +205,16 @@ msgstr "Dernière modification par"
 msgid "Last Updated on"
 msgstr "Dernière mise à jour le"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr "Partenaire de gauche"
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
-msgstr "Type de partenaire de gauche"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_left:0
 msgid "Left partner category"
 msgstr "Catégorie du partenaire de gauche"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_left:0
 msgid "Left partner type"
@@ -219,12 +225,35 @@ msgstr "Type de partenaire de gauche"
 msgid "Left side of relation"
 msgstr "Côté gauche de la relation"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Nom"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -243,23 +272,16 @@ msgstr "Le type de l'enregistrement de gauche"
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr "Relation du partenaire"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr "Type de relation de partenaire"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr "Relations du partenaire"
@@ -270,46 +292,43 @@ msgstr "Relations du partenaire"
 msgid "Partner Relations Types"
 msgstr "Types de relation de partenaire"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr "Type de partenaire"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr "Relation du partenaire"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Un partenaire ne peut pas avoir une relation avec soi-même."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Personne"
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr "Type d'enregistrement"
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
-msgstr "Type d'enregistrement"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
-msgstr "Partenaires liés"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation.all,relation_id:0
@@ -322,46 +341,43 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr "Type de relation"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr "Relation valide"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr "Relations"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr "Type de relation"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr "Partenaire de droite"
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
-msgstr "Type du partenaire de droite"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_right:0
 msgid "Right partner category"
 msgstr "Catégorie du partenaire de droite"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_right:0
 msgid "Right partner type"
@@ -373,7 +389,11 @@ msgid "Right side of relation"
 msgstr "Côté droite de la relation"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Right to left"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Search Relations"
 msgstr "Rechercher les relations"
@@ -383,11 +403,6 @@ msgstr "Rechercher les relations"
 msgid "Show partner's relations"
 msgstr "Montrer les relations du partenaire"
 
-#. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
-msgstr "Montrer les partenaires"
-
 #. module: partner_relations
 #: field:res.partner.relation,left_partner_id:0
 msgid "Source Partner"
@@ -400,34 +415,107 @@ msgid "Starting date"
 msgstr "Date de début"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "Le partenaire %s n'es pas applicable pour cette type de relation."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "La date de début ne peut pas être après la date de fin."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Il existe des dates en conflit des relations similaires."
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr "Type"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
-msgstr "Opérateur de recherche non-supporté « %s »"
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""
diff --git a/partner_relations/i18n/it.po b/partner_relations/i18n/it.po
index cf3e7f1de..c7f3472c7 100644
--- a/partner_relations/i18n/it.po
+++ b/partner_relations/i18n/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Italian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Attivo"
 
@@ -50,15 +57,10 @@ msgid "All relations with current partner"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr ""
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
+msgid "Allow existing relations that do not fit changed conditions"
 msgstr ""
 
 #. module: partner_relations
@@ -73,14 +75,8 @@ msgstr "Creato da"
 msgid "Created on"
 msgstr "reato il"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr ""
 
@@ -89,6 +85,13 @@ msgstr ""
 msgid "Current record's partner type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -103,27 +106,37 @@ msgid "Display Name"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,date_end:0
-#: field:res.partner.relation.all,date_end:0
-msgid "Ending date"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Group By"
-msgstr "Raggruppa per"
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
+#: field:res.partner.relation,date_end:0
+#: field:res.partner.relation.all,date_end:0
+msgid "Ending date"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Group By"
+msgstr "Raggruppa per"
+
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -139,11 +152,6 @@ msgstr ""
 msgid "Has relation with a partner in category"
 msgstr ""
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr ""
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -152,25 +160,28 @@ msgid "ID"
 msgstr "ID"
 
 #. module: partner_relations
-#: field:res.partner.relation.type,name_inverse:0
-msgid "Inverse name"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
 msgstr ""
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
+#: field:res.partner.relation.type,name_inverse:0
+msgid "Inverse name"
 msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
 msgstr ""
 
 #. module: partner_relations
@@ -194,18 +205,13 @@ msgid "Last Updated on"
 msgstr "Ultimo aggiornamento il"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
+#: field:res.partner.relation.type,partner_category_left:0
+msgid "Left partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_left:0
-msgid "Left partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
 msgstr ""
 
 #. module: partner_relations
@@ -218,12 +224,35 @@ msgstr ""
 msgid "Left side of relation"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -242,23 +271,16 @@ msgstr ""
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr ""
@@ -269,45 +291,42 @@ msgstr ""
 msgid "Partner Relations Types"
 msgstr ""
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr ""
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr ""
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
 msgstr ""
 
 #. module: partner_relations
@@ -321,44 +340,41 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr ""
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
+#: field:res.partner.relation.type,partner_category_right:0
+msgid "Right partner category"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.type,partner_category_right:0
-msgid "Right partner category"
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
 msgstr ""
 
 #. module: partner_relations
@@ -372,19 +388,18 @@ msgid "Right side of relation"
 msgstr ""
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
-msgid "Search Relations"
+msgid "Right to left"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
-msgid "Show partner's relations"
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Search Relations"
 msgstr ""
 
 #. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
+#: model:ir.actions.act_window,name:partner_relations.action_show_partner_relations
+msgid "Show partner's relations"
 msgstr ""
 
 #. module: partner_relations
@@ -399,34 +414,107 @@ msgid "Starting date"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr ""
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
+#, python-format
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
 #, python-format
-msgid "Unsupported search operand \"%s\""
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
 msgstr ""
diff --git a/partner_relations/i18n/nl.po b/partner_relations/i18n/nl.po
index 159989791..5a0861f0a 100644
--- a/partner_relations/i18n/nl.po
+++ b/partner_relations/i18n/nl.po
@@ -1,28 +1,25 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * partner_relations
-#
+# 
 # Translators:
-# OCA Transbot <transbot@odoo-community.org>, 2016.
-#
+# OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 12:39+0000\n"
-"PO-Revision-Date: 2016-09-02 15:03+0200\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/oca/OCA-partner-contact-8-0/"
-"language/nl/)\n"
-"Language: nl\n"
+"Language-Team: Dutch (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:178
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
 #, python-format
 msgid "%s partner incompatible with relation type."
 msgstr "%s relatie is onverenigbaar met gekozen connectietype."
@@ -31,17 +28,12 @@ msgstr "%s relatie is onverenigbaar met gekozen connectietype."
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations "
-"may\n"
+"                    Record and track your partners' relations. Relations may\n"
 "                    be linked to other partners with a type either directly\n"
 "                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Onderhoud de connecties tussen uw relaties. Relaties mogen gekoppeld\n"
-"worden zowel via een normale connectie, als met een omgekeerde\n"
-"connectie.</p>"
+msgstr "<p class=\"oe_view_nocontent_create\">\nOnderhoud de connecties tussen uw relaties. Relaties mogen gekoppeld\nworden zowel via een normale connectie, als met een omgekeerde\nconnectie.</p>"
 
 #. module: partner_relations
 #: field:res.partner.relation.all,active:0
@@ -64,12 +56,11 @@ msgid "All relations with current partner"
 msgstr "Alle connecties vanuit de huidige relatie"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:13
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
 #: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
 msgid "Allow existing relations that do not fit changed conditions"
-msgstr ""
-"Sta bestaande connecties toe die niet voldoen aan de gewijzigde criteria"
+msgstr "Sta bestaande connecties toe die niet voldoen aan de gewijzigde criteria"
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -94,7 +85,7 @@ msgid "Current record's partner type"
 msgstr "Type van de huidige relatie"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:17
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
 #: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
 msgid "Delete relations that do not fit changed conditions"
@@ -114,20 +105,18 @@ msgid "Display Name"
 msgstr "Te tonen naam"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:11
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
 #: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
 msgid "Do not allow change that will result in invalid relations"
 msgstr "Sta geen wijziging toe die zal resulteren in ongeldige connecties"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:15
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
 #: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
 msgid "End relations per today, if they do not fit changed conditions"
-msgstr ""
-"Beëindig wijzigingen per vandaag indien ze niet voldoen aan de gewijzigde "
-"condities"
+msgstr "Beëindig wijzigingen per vandaag indien ze niet voldoen aan de gewijzigde condities"
 
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
@@ -136,8 +125,8 @@ msgid "Ending date"
 msgstr "Einddatum"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:184
-#: code:addons/partner_relations/models/res_partner_relation_all.py:259
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
 #, python-format
 msgid "Error!"
 msgstr "Fout!"
@@ -147,16 +136,6 @@ msgstr "Fout!"
 msgid "Group By"
 msgstr "Groepeer op"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
-msgstr "Heeft assistent"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr "Heeft voormalig werknemer"
-
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -172,11 +151,6 @@ msgstr "Heeft connectie met"
 msgid "Has relation with a partner in category"
 msgstr "Heeft connectie met een relatie in de categorie"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr "Heeft gewerkt voor"
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -204,17 +178,6 @@ msgstr "Omgekeerde naam"
 msgid "Inverse relations are from right to left partner."
 msgstr "Omgekeerde connecties zijn vanaf de rechter relatie naar de linker."
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
-msgstr "Is assistent van"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
-msgstr "Is concurrent van"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,is_inverse:0
 msgid "Is reverse type?"
@@ -272,17 +235,11 @@ msgid "Name"
 msgstr "Naam"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:181
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
 #, python-format
 msgid "No %s partner available for relation type."
 msgstr "Geen %s relatie beschikbaar voor dit connectietype."
 
-#. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:256
-#, python-format
-msgid "No relation type available for selected partners."
-msgstr "Geen connectietype beschikbaar voor verbinden van deze relaties."
-
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,this_partner_id:0
@@ -290,7 +247,7 @@ msgid "One Partner"
 msgstr "De ene relatie"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:82
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
 #, python-format
 msgid "Organisation"
 msgstr "Organisatie"
@@ -339,13 +296,13 @@ msgid "Partner relation"
 msgstr "Connectie"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation.py:115
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Relaties kunnen geen connectie met zichzelf hebben"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:83
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Persoon"
@@ -387,7 +344,7 @@ msgid "Relation Type"
 msgstr "Type connectie"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:252
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
 #, python-format
 msgid "Relation type incompatible with selected partner(s)."
 msgstr "Type connectie komt niet overeen met geselecteerde relatie(s)."
@@ -462,35 +419,33 @@ msgid "Symmetric"
 msgstr "Symmetrisch"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation.py:101
-#, fuzzy, python-format
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
 msgid "The %s partner does not have category %s."
-msgstr "De %s relatie is niet geldig voor dit type connectie."
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation.py:95
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "De %s relatie is niet geldig voor dit type connectie."
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation.py:61
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "De ingangsdatum kan niet na de einddatum liggen."
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_type.py:168
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
 #, python-format
 msgid ""
 "There are already relations not satisfying the conditions for partner type "
 "or category."
-msgstr ""
-"Er zijn al connecties die niet voldoen aan de criteria voor type relatie of "
-"categorie."
+msgstr "Er zijn al connecties die niet voldoen aan de criteria voor type relatie of categorie."
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation.py:154
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Er is al een gelijkaardige connectie met overlappende geldigheid"
@@ -503,8 +458,7 @@ msgstr "Deze connectie kan een relatie met zichzelf verbinden"
 #. module: partner_relations
 #: help:res.partner.relation.type,is_symmetric:0
 msgid "This relation is the same from right to left as from left to right"
-msgstr ""
-"Deze connectie is van rechts naar links hetzelfde als van links naar rechts"
+msgstr "Deze connectie is van rechts naar links hetzelfde als van links naar rechts"
 
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
@@ -514,7 +468,6 @@ msgstr "Type"
 
 #. module: partner_relations
 #: code:addons/partner_relations/models/res_partner.py:80
-#: code:addons/partner_relations/models/res_partner.py:121
 #, python-format
 msgid "Unsupported search operator \"%s\""
 msgstr "Zoek operator \"%s\" wordt niet ondersteund "
@@ -523,27 +476,44 @@ msgstr "Zoek operator \"%s\" wordt niet ondersteund "
 #: help:res.partner.relation.type,handle_invalid_onchange:0
 msgid ""
 "When adding relations criteria like partner type and category are checked.\n"
-"However when you change the criteria, there might be relations that do not "
-"fit the new criteria.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
 "Specify how this situation should be handled."
+msgstr "Bij het aanmaken van connecties vinden controles plaats op type en categorie van de relatie.\nEchter, wanneer u de criteria verandert, dan kunnen er al connecties bestaan die daar niet aan voldoen.\nGeef aan hoe zo'n situatie moet worden afgehandeld. "
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
 msgstr ""
-"Bij het aanmaken van connecties vinden controles plaats op type en categorie "
-"van de relatie.\n"
-"Echter, wanneer u de criteria verandert, dan kunnen er al connecties bestaan "
-"die daar niet aan voldoen.\n"
-"Geef aan hoe zo'n situatie moet worden afgehandeld. "
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:221
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
 #, python-format
 msgid "other"
 msgstr "andere"
 
 #. module: partner_relations
-#: code:addons/partner_relations/models/res_partner_relation_all.py:215
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
 #, python-format
 msgid "this"
 msgstr "deze"
 
-#~ msgid "Company"
-#~ msgstr "Bedrijf"
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""
diff --git a/partner_relations/i18n/pt_BR.po b/partner_relations/i18n/pt_BR.po
index 4f78272a3..f7404a2be 100644
--- a/partner_relations/i18n/pt_BR.po
+++ b/partner_relations/i18n/pt_BR.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-06 15:15+0000\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -20,17 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr "<p class=\"oe_view_nocontent_create\">\nRegistre e mantenha registro das relações entre seus parceiros. Relações podem ser\nligações para outros parceiros com um tipo específico, tanto diretamente ou o inverso.\n</p>"
+msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Ativo"
 
@@ -50,16 +57,11 @@ msgid "All relations with current partner"
 msgstr "Todos os relacionamentos com o parceiro atual"
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr ""
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Empresa"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -73,14 +75,8 @@ msgstr "Criado por"
 msgid "Created on"
 msgstr "Criado em"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Parceiro atual"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr "Categoria do registro atual"
 
@@ -89,6 +85,13 @@ msgstr "Categoria do registro atual"
 msgid "Current record's partner type"
 msgstr "Tipo do parceiro registro atual"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -102,6 +105,20 @@ msgstr "Parceiro de destino"
 msgid "Display Name"
 msgstr ""
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
 #: field:res.partner.relation.all,date_end:0
@@ -109,21 +126,17 @@ msgid "Ending date"
 msgstr "Data fina"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Group By"
 msgstr "Agrupar por"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
-msgstr "Tem assistente"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr "Tem ex-empregado"
-
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -139,11 +152,6 @@ msgstr "Tem relação com"
 msgid "Has relation with a partner in category"
 msgstr "Tem relação com um parceiro na categoria"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr "Trabalhou para"
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -151,27 +159,30 @@ msgstr "Trabalhou para"
 msgid "ID"
 msgstr "ID"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name_inverse:0
 msgid "Inverse name"
 msgstr "Nome inverso"
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
-msgstr "Tipo inverso"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
-msgstr "É assistente de "
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
-msgstr "É competidor de"
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,__last_update:0
@@ -193,21 +204,16 @@ msgstr "Útima atualização por"
 msgid "Last Updated on"
 msgstr "Útima atualização em"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr "Parceiro da esquerda"
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
-msgstr "Tipo parceiro da esquerda"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_left:0
 msgid "Left partner category"
 msgstr "Categoria do parceiro da esquerda"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_left:0
 msgid "Left partner type"
@@ -218,12 +224,35 @@ msgstr "Tipo parceiro da esquerda"
 msgid "Left side of relation"
 msgstr "Lado esquerdo da relação"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -242,23 +271,16 @@ msgstr "Outro tipo de registro de parceiro"
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr "Relacãos entre parceiros"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr "Tipo de relação entre parceiros"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr "Relacão entre parceiros"
@@ -269,46 +291,43 @@ msgstr "Relacão entre parceiros"
 msgid "Partner Relations Types"
 msgstr "Tipo de relação entre parceiros"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr "Tipo de parceiro"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr "Relação parceiro"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Parceiros não podem ter relacionamentos com ele mesmo."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Pessoa"
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr "Tipo de Registro"
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
-msgstr "Tipo de registro"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
-msgstr "Parceiros relacionados"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation.all,relation_id:0
@@ -321,46 +340,43 @@ msgid "Relation Count"
 msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr "Tipo de relação"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr "Relação válida"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr "Relações"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr "Tipo de relacionamento"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr "Parceiro da direita"
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
-msgstr "Tipo de parceiro da direita"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_right:0
 msgid "Right partner category"
 msgstr "Categoria do parceiro da direita"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_right:0
 msgid "Right partner type"
@@ -372,7 +388,11 @@ msgid "Right side of relation"
 msgstr "Lado direito da relação"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Right to left"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Search Relations"
 msgstr "Buscar relações"
@@ -382,11 +402,6 @@ msgstr "Buscar relações"
 msgid "Show partner's relations"
 msgstr "Mostrar relações do parceiro"
 
-#. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
-msgstr "Mostrar parceiros"
-
 #. module: partner_relations
 #: field:res.partner.relation,left_partner_id:0
 msgid "Source Partner"
@@ -399,34 +414,107 @@ msgid "Starting date"
 msgstr "Data de inicio"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "O parceiro %s não é aplicavel a este tipo de relação."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "A data de inicio não pode ser após a data de fim."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Já existe uma relação similar com datas incompativeis."
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
-msgstr "Operador de busca não suportado \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""
diff --git a/partner_relations/i18n/sl.po b/partner_relations/i18n/sl.po
index 0f4fc9b64..8dc807ded 100644
--- a/partner_relations/i18n/sl.po
+++ b/partner_relations/i18n/sl.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partner-contact (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-07 07:18+0000\n"
-"PO-Revision-Date: 2016-05-07 07:16+0000\n"
-"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"POT-Creation-Date: 2016-09-17 18:40+0000\n"
+"PO-Revision-Date: 2016-09-17 18:43+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/oca/OCA-partner-contact-8-0/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,24 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:170
+#, python-format
+msgid "%s partner incompatible with relation type."
+msgstr ""
+
+#. module: partner_relations
 #: model:ir.actions.act_window,help:partner_relations.action_res_partner_relation_all
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
-"                    Record and track your partners' relations. Relations may be linked to other partners with a type either directly or inversely.\n"
+"                    Record and track your partners' relations. Relations may\n"
+"                    be linked to other partners with a type either directly\n"
+"                    or inversely.\n"
 "                </p>\n"
 "            "
-msgstr "<p class=\"oe_view_nocontent_create\">\n                    Beležite in sledite odnosom med partnerji. Odnosi se lahko povezani s partnerji direktno ali inverzno.\n                </p>\n            "
+msgstr ""
 
 #. module: partner_relations
-#: field:res.partner.relation,active:0 field:res.partner.relation.all,active:0
+#: field:res.partner.relation.all,active:0
 msgid "Active"
 msgstr "Aktivno"
 
@@ -49,16 +56,11 @@ msgid "All relations with current partner"
 msgstr "Vsi odnosi s trenutnim partnerjem"
 
 #. module: partner_relations
-#: field:res.partner.relation,allow_self:0
-#: field:res.partner.relation.type,allow_self:0
-msgid "Allow both sides to be the same"
-msgstr "Dovoli, da sta obe strani enaki"
-
-#. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:68
+#: code:addons/partner_relations/models/res_partner_relation_type.py:14
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
 #, python-format
-msgid "Company"
-msgstr "Družba"
+msgid "Allow existing relations that do not fit changed conditions"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,create_uid:0
@@ -72,14 +74,8 @@ msgstr "Ustvaril"
 msgid "Created on"
 msgstr "Ustvarjeno"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,this_partner_id:0
-msgid "Current Partner"
-msgstr "Trenutni partner"
-
 #. module: partner_relations
 #: field:res.partner.relation.type.selection,partner_category_this:0
-#: field:res.partner.relation.type.selection,search_partner_category_this:0
 msgid "Current record's category"
 msgstr "Kategorija trenutnega zapisa"
 
@@ -88,6 +84,13 @@ msgstr "Kategorija trenutnega zapisa"
 msgid "Current record's partner type"
 msgstr "Tip partnerja na trenutnem zapisu"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:18
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Delete relations that do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,right_partner_id:0
 msgid "Destination Partner"
@@ -101,6 +104,20 @@ msgstr "Ciljni partner"
 msgid "Display Name"
 msgstr "Prikazni naziv"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:12
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "Do not allow change that will result in invalid relations"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:16
+#: selection:res.partner.relation.type,handle_invalid_onchange:0
+#, python-format
+msgid "End relations per today, if they do not fit changed conditions"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,date_end:0
 #: field:res.partner.relation.all,date_end:0
@@ -108,21 +125,17 @@ msgid "Ending date"
 msgstr "Končni datum"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: code:addons/partner_relations/models/res_partner_relation_all.py:167
+#: code:addons/partner_relations/models/res_partner_relation_all.py:243
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Group By"
 msgstr "Združi po"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
-msgid "Has assistant"
-msgstr "Ima asistenta"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
-msgid "Has former employee"
-msgstr "Ima bivšega zaposlenega"
-
 #. module: partner_relations
 #: field:res.partner,search_relation_type_id:0
 msgid "Has relation of type"
@@ -138,11 +151,6 @@ msgstr "Je v odnosu z"
 msgid "Has relation with a partner in category"
 msgstr "Je v odnosu s partnerjem kategorije"
 
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
-msgid "Has worked for"
-msgstr "Je delal za"
-
 #. module: partner_relations
 #: field:res.partner.relation,id:0 field:res.partner.relation.all,id:0
 #: field:res.partner.relation.type,id:0
@@ -150,27 +158,30 @@ msgstr "Je delal za"
 msgid "ID"
 msgstr "ID"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Include past records"
+msgstr ""
+
+#. module: partner_relations
+#: field:res.partner.relation.type,handle_invalid_onchange:0
+msgid "Invalid relation handling"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name_inverse:0
 msgid "Inverse name"
 msgstr "Inverzni naziv"
 
 #. module: partner_relations
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
-msgid "Inverse type"
-msgstr "Inverzni tip"
-
-#. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
-msgid "Is assistant of"
-msgstr "Je asistent"
+#: help:res.partner.relation.type.selection,is_inverse:0
+msgid "Inverse relations are from right to left partner."
+msgstr ""
 
 #. module: partner_relations
-#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
-#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
-msgid "Is competitor of"
-msgstr "Je konkurent"
+#: field:res.partner.relation.type.selection,is_inverse:0
+msgid "Is reverse type?"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation,__last_update:0
@@ -192,21 +203,16 @@ msgstr "Zadnji posodobil"
 msgid "Last Updated on"
 msgstr "Zadnjič posodobljeno"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Left Partner"
-msgstr "Levi partner"
-
-#. module: partner_relations
-#: field:res.partner.relation,left_contact_type:0
-msgid "Left Partner Type"
-msgstr "Tip levega partnerja"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_left:0
 msgid "Left partner category"
 msgstr "Kategorija levega partnerja"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Left partner to right partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_left:0
 msgid "Left partner type"
@@ -217,12 +223,35 @@ msgstr "Tip levega partnerja"
 msgid "Left side of relation"
 msgstr "Leva stran odnosa"
 
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,name:0
 #: field:res.partner.relation.type.selection,name:0
 msgid "Name"
 msgstr "Naziv"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:175
+#, python-format
+msgid "No %s partner available for relation type."
+msgstr ""
+
+#. module: partner_relations
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+#: field:res.partner.relation.all,this_partner_id:0
+msgid "One Partner"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_type.py:84
+#, python-format
+msgid "Organisation"
+msgstr ""
+
 #. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 #: field:res.partner.relation.all,other_partner_id:0
@@ -241,23 +270,16 @@ msgstr "Tip partnerja drugega zapisa"
 
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner
-#: field:res.partner.relation,any_partner_id:0
-#: field:res.partner.relation,partner_id_display:0
+#: field:res.partner.relation.all,any_partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.form_res_partner_relation
-msgid "Partner Relation"
-msgstr "Partnerski odnos"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation_type
 msgid "Partner Relation Type"
 msgstr "Tip partnerskega odnosa"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.tree_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.tree_res_partner_relation_all
 msgid "Partner Relations"
 msgstr "Partnerski odnosi"
@@ -268,46 +290,43 @@ msgstr "Partnerski odnosi"
 msgid "Partner Relations Types"
 msgstr "Tipi partnerskih odnosov"
 
-#. module: partner_relations
-#: field:res.partner.relation.all,contact_type:0
-msgid "Partner Type"
-msgstr "Tip partnerja"
-
 #. module: partner_relations
 #: model:ir.model,name:partner_relations.model_res_partner_relation
-#: view:res.partner.relation.all:partner_relations.form_res_partner_relation_all
-#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
-#: view:res.partner.relation.type:partner_relations.tree_res_partner_relation_type
 msgid "Partner relation"
 msgstr "Partnerski odnos"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:301
+#: code:addons/partner_relations/models/res_partner_relation.py:116
 #, python-format
 msgid "Partners cannot have a relation with themselves."
 msgstr "Partnerji ne morejo biti v odnosu sami s seboj."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation_type.py:69
+#: code:addons/partner_relations/models/res_partner_relation_type.py:85
 #, python-format
 msgid "Person"
 msgstr "Oseba"
 
+#. module: partner_relations
+#: view:res.partner.relation.type:partner_relations.form_res_partner_relation_type
+msgid "Properties"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.all,record_type:0
 msgid "Record Type"
 msgstr "Tip zapisa"
 
 #. module: partner_relations
-#: field:res.partner.relation.type.selection,record_type:0
-msgid "Record type"
-msgstr "Tip zapisa"
+#: help:res.partner.relation.all,active:0
+msgid "Records with date_end in the past are inactive"
+msgstr ""
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:370
-#, python-format
-msgid "Related partners"
-msgstr "Povezani partnerji"
+#: field:res.partner.relation.type,allow_self:0
+#: field:res.partner.relation.type.selection,allow_self:0
+msgid "Reflexive"
+msgstr ""
 
 #. module: partner_relations
 #: field:res.partner.relation.all,relation_id:0
@@ -320,46 +339,43 @@ msgid "Relation Count"
 msgstr "Števec relacij"
 
 #. module: partner_relations
-#: field:res.partner.relation.all,type_id:0
 #: field:res.partner.relation.all,type_selection_id:0
 msgid "Relation Type"
 msgstr "Tip odnosa"
 
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:244
+#, python-format
+msgid "Relation type incompatible with selected partner(s)."
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner,search_relation_date:0
 msgid "Relation valid"
 msgstr "Odnos veljaven"
 
 #. module: partner_relations
-#: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation
 #: model:ir.actions.act_window,name:partner_relations.action_res_partner_relation_all
 #: model:ir.ui.menu,name:partner_relations.menu_res_partner_relation_sales
 #: view:res.partner:partner_relations.view_partner_form
-#: field:res.partner,relation_ids:0
 msgid "Relations"
 msgstr "Odnosi"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Relationship Type"
 msgstr "Tip odnosa"
 
-#. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
-msgid "Right Partner"
-msgstr "Desni partner"
-
-#. module: partner_relations
-#: field:res.partner.relation,right_contact_type:0
-msgid "Right Partner Type"
-msgstr "Tip desnega partnerja"
-
 #. module: partner_relations
 #: field:res.partner.relation.type,partner_category_right:0
 msgid "Right partner category"
 msgstr "Kategorija desnega partnerja"
 
+#. module: partner_relations
+#: selection:res.partner.relation.all,record_type:0
+msgid "Right partner to left partner"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation.type,contact_type_right:0
 msgid "Right partner type"
@@ -371,7 +387,11 @@ msgid "Right side of relation"
 msgstr "Desna stran odnosa"
 
 #. module: partner_relations
-#: view:res.partner.relation:partner_relations.search_res_partner_relation
+#: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
+msgid "Right to left"
+msgstr ""
+
+#. module: partner_relations
 #: view:res.partner.relation.all:partner_relations.search_res_partner_relation_all
 msgid "Search Relations"
 msgstr "Iskanje odnosov"
@@ -381,11 +401,6 @@ msgstr "Iskanje odnosov"
 msgid "Show partner's relations"
 msgstr "Prikaz odnosov partnerja"
 
-#. module: partner_relations
-#: model:ir.actions.server,name:partner_relations.action_show_right_relation_partners
-msgid "Show partners"
-msgstr "Prikaz partnerjev"
-
 #. module: partner_relations
 #: field:res.partner.relation,left_partner_id:0
 msgid "Source Partner"
@@ -398,34 +413,107 @@ msgid "Starting date"
 msgstr "Začetni datum"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:287
+#: field:res.partner.relation.type,is_symmetric:0
+#: field:res.partner.relation.type.selection,is_symmetric:0
+msgid "Symmetric"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:102
+#, python-format
+msgid "The %s partner does not have category %s."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:96
 #, python-format
 msgid "The %s partner is not applicable for this relation type."
 msgstr "Partner %s ni ustrezen za ta tip odnosa."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:254
+#: code:addons/partner_relations/models/res_partner_relation.py:62
 #, python-format
 msgid "The starting date cannot be after the ending date."
 msgstr "Začetni datum ne more biti za končnim datumom."
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner_relation.py:329
+#: code:addons/partner_relations/models/res_partner_relation_type.py:156
+#, python-format
+msgid ""
+"There are already relations not satisfying the conditions for partner type "
+"or category."
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation.py:155
 #, python-format
 msgid "There is already a similar relation with overlapping dates"
 msgstr "Podoben odnos s prekrivajočimi se datumi že obstaja."
 
+#. module: partner_relations
+#: help:res.partner.relation.type,allow_self:0
+msgid "This relation can be set up with the same partner left and right"
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,is_symmetric:0
+msgid "This relation is the same from right to left as from left to right"
+msgstr ""
+
 #. module: partner_relations
 #: field:res.partner.relation,type_id:0
-#: field:res.partner.relation,type_selection_id:0
-#: selection:res.partner.relation.all,record_type:0
-#: selection:res.partner.relation.type.selection,record_type:0
 #: field:res.partner.relation.type.selection,type_id:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: partner_relations
-#: code:addons/partner_relations/model/res_partner.py:122
+#: code:addons/partner_relations/models/res_partner.py:80
 #, python-format
-msgid "Unsupported search operand \"%s\""
-msgstr "Nepodprt iskalni operand \"%s\""
+msgid "Unsupported search operator \"%s\""
+msgstr ""
+
+#. module: partner_relations
+#: help:res.partner.relation.type,handle_invalid_onchange:0
+msgid ""
+"When adding relations criteria like partner type and category are checked.\n"
+"However when you change the criteria, there might be relations that do not fit the new criteria.\n"
+"Specify how this situation should be handled."
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_assistant
+msgid "has assistant"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_has_worked_for
+msgid "has employee"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_assistant
+msgid "is assistant of"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_competitor
+#: model:res.partner.relation.type,name_inverse:partner_relations.rel_type_competitor
+msgid "is competitor of"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:214
+#, python-format
+msgid "other"
+msgstr ""
+
+#. module: partner_relations
+#: code:addons/partner_relations/models/res_partner_relation_all.py:210
+#, python-format
+msgid "this"
+msgstr ""
+
+#. module: partner_relations
+#: model:res.partner.relation.type,name:partner_relations.rel_type_has_worked_for
+msgid "works for"
+msgstr ""