From 9e5e9f0c536c8f3b26977d185ac42ac5bb703f31 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sun, 2 Dec 2018 02:51:42 +0000 Subject: [PATCH] Update translation files Updated by Update PO files to match POT (msgmerge) hook in Weblate. --- base_partner_merge/i18n/am.po | 130 +++------------------------ base_partner_merge/i18n/am_ET.po | 34 ++++--- base_partner_merge/i18n/ar.po | 18 ++-- base_partner_merge/i18n/ar_SY.po | 34 ++++--- base_partner_merge/i18n/bg.po | 15 ++-- base_partner_merge/i18n/bs.po | 18 ++-- base_partner_merge/i18n/bs_BA.po | 34 ++++--- base_partner_merge/i18n/ca.po | 15 ++-- base_partner_merge/i18n/ca_ES.po | 34 ++++--- base_partner_merge/i18n/cs.po | 15 ++-- base_partner_merge/i18n/cs_CZ.po | 34 ++++--- base_partner_merge/i18n/da.po | 15 ++-- base_partner_merge/i18n/da_DK.po | 34 ++++--- base_partner_merge/i18n/de.po | 18 ++-- base_partner_merge/i18n/de_CH.po | 34 ++++--- base_partner_merge/i18n/el_GR.po | 133 +++------------------------- base_partner_merge/i18n/en_GB.po | 18 ++-- base_partner_merge/i18n/es.po | 15 ++-- base_partner_merge/i18n/es_AR.po | 18 ++-- base_partner_merge/i18n/es_CL.po | 18 ++-- base_partner_merge/i18n/es_CO.po | 18 ++-- base_partner_merge/i18n/es_CR.po | 18 ++-- base_partner_merge/i18n/es_DO.po | 18 ++-- base_partner_merge/i18n/es_EC.po | 18 ++-- base_partner_merge/i18n/es_ES.po | 18 ++-- base_partner_merge/i18n/es_GT.po | 34 ++++--- base_partner_merge/i18n/es_MX.po | 18 ++-- base_partner_merge/i18n/es_PE.po | 18 ++-- base_partner_merge/i18n/es_PY.po | 18 ++-- base_partner_merge/i18n/es_VE.po | 18 ++-- base_partner_merge/i18n/et.po | 15 ++-- base_partner_merge/i18n/et_EE.po | 34 ++++--- base_partner_merge/i18n/eu.po | 15 ++-- base_partner_merge/i18n/eu_ES.po | 34 ++++--- base_partner_merge/i18n/fa.po | 15 ++-- base_partner_merge/i18n/fa_IR.po | 34 ++++--- base_partner_merge/i18n/fi.po | 15 ++-- base_partner_merge/i18n/fr.po | 19 ++-- base_partner_merge/i18n/fr_CA.po | 18 ++-- base_partner_merge/i18n/fr_CH.po | 18 ++-- base_partner_merge/i18n/gl.po | 15 ++-- base_partner_merge/i18n/gl_ES.po | 18 ++-- base_partner_merge/i18n/he.po | 15 ++-- base_partner_merge/i18n/he_IL.po | 34 ++++--- base_partner_merge/i18n/hr.po | 18 ++-- base_partner_merge/i18n/hr_HR.po | 21 ++--- base_partner_merge/i18n/hu.po | 15 ++-- base_partner_merge/i18n/id.po | 15 ++-- base_partner_merge/i18n/it.po | 15 ++-- base_partner_merge/i18n/ja.po | 15 ++-- base_partner_merge/i18n/ja_JP.po | 34 ++++--- base_partner_merge/i18n/ko.po | 15 ++-- base_partner_merge/i18n/ko_KR.po | 34 ++++--- base_partner_merge/i18n/lo_LA.po | 34 ++++--- base_partner_merge/i18n/lt.po | 18 ++-- base_partner_merge/i18n/lt_LT.po | 21 ++--- base_partner_merge/i18n/lv.po | 18 ++-- base_partner_merge/i18n/mk.po | 15 ++-- base_partner_merge/i18n/mn.po | 15 ++-- base_partner_merge/i18n/my_MM.po | 34 ++++--- base_partner_merge/i18n/nb.po | 18 ++-- base_partner_merge/i18n/nb_NO.po | 18 ++-- base_partner_merge/i18n/nl.po | 15 ++-- base_partner_merge/i18n/nl_BE.po | 18 ++-- base_partner_merge/i18n/nl_NL.po | 18 ++-- base_partner_merge/i18n/pl.po | 19 ++-- base_partner_merge/i18n/pt.po | 15 ++-- base_partner_merge/i18n/pt_BR.po | 19 ++-- base_partner_merge/i18n/pt_PT.po | 18 ++-- base_partner_merge/i18n/ro.po | 18 ++-- base_partner_merge/i18n/ru.po | 19 ++-- base_partner_merge/i18n/sk.po | 15 ++-- base_partner_merge/i18n/sl.po | 19 ++-- base_partner_merge/i18n/sl_SI.po | 34 ++++--- base_partner_merge/i18n/sr.po | 18 ++-- base_partner_merge/i18n/sr@latin.po | 21 ++--- base_partner_merge/i18n/sr_RS.po | 34 ++++--- base_partner_merge/i18n/sv.po | 15 ++-- base_partner_merge/i18n/sv_SE.po | 34 ++++--- base_partner_merge/i18n/te_IN.po | 34 ++++--- base_partner_merge/i18n/th.po | 15 ++-- base_partner_merge/i18n/tr.po | 15 ++-- base_partner_merge/i18n/tr_TR.po | 18 ++-- base_partner_merge/i18n/uk.po | 18 ++-- base_partner_merge/i18n/uk_UA.po | 34 ++++--- base_partner_merge/i18n/vi.po | 15 ++-- base_partner_merge/i18n/vi_VN.po | 18 ++-- base_partner_merge/i18n/zh_CN.po | 18 ++-- base_partner_merge/i18n/zh_TW.po | 18 ++-- 89 files changed, 869 insertions(+), 1235 deletions(-) diff --git a/base_partner_merge/i18n/am.po b/base_partner_merge/i18n/am.po index f3c6750c5..9dfb7d073 100644 --- a/base_partner_merge/i18n/am.po +++ b/base_partner_merge/i18n/am.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -12,17 +12,12 @@ msgstr "" "PO-Revision-Date: 2016-08-20 23:45+0000\n" "Last-Translator: OCA Transbot , 2016\n" "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n" +"Language: am\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: am\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_contact -msgid "A user associated to the contact" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the automatic merge of your contacts ?" @@ -30,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -49,11 +43,6 @@ msgstr "Cancelar" msgid "Close" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_partner_ids -msgid "Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_create_uid #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_create_uid @@ -66,11 +55,6 @@ msgstr "Creado por" msgid "Created on" msgstr "Creado en" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_current_line_id -msgid "Current Line" -msgstr "" - #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_deduplicate msgid "Deduplicate Contacts" @@ -81,58 +65,23 @@ msgstr "" msgid "Deduplicate the other Contacts" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_dst_partner_id -msgid "Destination Contact" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_display_name #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_display_name msgid "Display Name" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_email -msgid "Email" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Exclude contacts having" msgstr "" -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Finished" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_number_group -msgid "Group of Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_id #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_id msgid "ID" msgstr "ID" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_aggr_ids -msgid "Ids" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_is_company -msgid "Is Company" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_journal_item -msgid "Journal Items associated to the contact" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard___last_update #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line___last_update @@ -151,16 +100,6 @@ msgstr "Última actualización por" msgid "Last Updated on" msgstr "Última actualización en" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_line_ids -msgid "Lines" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_maximum_group -msgid "Maximum of Group of Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Merge Automatically" @@ -191,36 +130,11 @@ msgstr "" msgid "Merge with Manual Check" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_min_id -msgid "MinID" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_name -msgid "Name" -msgstr "" - -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Option" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Options" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_parent_id -msgid "Parent Company" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model,name:base_partner_merge.model_res_partner -msgid "Partner" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Partners" @@ -235,23 +149,19 @@ msgstr "" #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "" "Select the list of fields used to search for\n" -" duplicated records. If you select several fields,\n" -" Odoo will propose you to merge only those having\n" -" all these fields in common. (not one of the fields)." +" duplicated records. If you select several fields,\n" +" Odoo will propose you to merge only those having\n" +" all these fields in common. (not one of the fields)." msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "" "Selected contacts will be merged together.\n" -" All documents linked to one of these contacts\n" -" will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "" - -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Selection" +" All documents linked to one of these contacts\n" +" will be redirected to the destination contact.\n" +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -259,26 +169,11 @@ msgstr "" msgid "Skip these contacts" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_state -msgid "State" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "There is no more contacts to merge for this request..." msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_vat -msgid "VAT" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_wizard_id -msgid "Wizard" -msgstr "" - #. module: base_partner_merge #: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard msgid "base.partner.merge.automatic.wizard" @@ -288,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/am_ET.po b/base_partner_merge/i18n/am_ET.po index 3ec8593ea..463390716 100644 --- a/base_partner_merge/i18n/am_ET.po +++ b/base_partner_merge/i18n/am_ET.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 12:22+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/ar.po b/base_partner_merge/i18n/ar.po index 9392bca7a..6271bb2b6 100644 --- a/base_partner_merge/i18n/ar.po +++ b/base_partner_merge/i18n/ar.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ar_SY.po b/base_partner_merge/i18n/ar_SY.po index f8eeddd15..04cf9c9e9 100644 --- a/base_partner_merge/i18n/ar_SY.po +++ b/base_partner_merge/i18n/ar_SY.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:44+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/bg.po b/base_partner_merge/i18n/bg.po index 8c56ade03..a34eeb972 100644 --- a/base_partner_merge/i18n/bg.po +++ b/base_partner_merge/i18n/bg.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/bs.po b/base_partner_merge/i18n/bs.po index 3ddf034d9..8e951b2ad 100644 --- a/base_partner_merge/i18n/bs.po +++ b/base_partner_merge/i18n/bs.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/bs_BA.po b/base_partner_merge/i18n/bs_BA.po index d2d08d144..287c85113 100644 --- a/base_partner_merge/i18n/bs_BA.po +++ b/base_partner_merge/i18n/bs_BA.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/ca.po b/base_partner_merge/i18n/ca.po index 4f2148978..93cc4645d 100644 --- a/base_partner_merge/i18n/ca.po +++ b/base_partner_merge/i18n/ca.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ca_ES.po b/base_partner_merge/i18n/ca_ES.po index 4ccf1e8d5..a1d49089c 100644 --- a/base_partner_merge/i18n/ca_ES.po +++ b/base_partner_merge/i18n/ca_ES.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/cs.po b/base_partner_merge/i18n/cs.po index 192c563fa..2db6d3873 100644 --- a/base_partner_merge/i18n/cs.po +++ b/base_partner_merge/i18n/cs.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/cs_CZ.po b/base_partner_merge/i18n/cs_CZ.po index 4ccf1e8d5..a1d49089c 100644 --- a/base_partner_merge/i18n/cs_CZ.po +++ b/base_partner_merge/i18n/cs_CZ.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/da.po b/base_partner_merge/i18n/da.po index 4705b1e71..f47f6878d 100644 --- a/base_partner_merge/i18n/da.po +++ b/base_partner_merge/i18n/da.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/da_DK.po b/base_partner_merge/i18n/da_DK.po index ba33ecea7..e05286230 100644 --- a/base_partner_merge/i18n/da_DK.po +++ b/base_partner_merge/i18n/da_DK.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/de.po b/base_partner_merge/i18n/de.po index c753a95a0..1f2a76710 100644 --- a/base_partner_merge/i18n/de.po +++ b/base_partner_merge/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -28,8 +28,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" "Sind Sie sicher, die Liste der automatischen Zusammenführungen Ihrer " "Kontakte auszuführen?" @@ -173,14 +172,15 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" "Ausgewählte Kontakte werden zusammengeführt.\n" " Alle Dokumente, die mit einem dieser Kontakte \n" " verknüpft sind werden an den Zielkontakt " "übergeleitet.\n" -" Sie können Kontakte aus dieser Liste entfernen, " -"\n" +" Sie können Kontakte aus dieser Liste " +"entfernen, \n" " um ein Zusammenführen zu vermeiden." #. module: base_partner_merge @@ -204,7 +204,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "oder" +#~ msgid "or" +#~ msgstr "oder" diff --git a/base_partner_merge/i18n/de_CH.po b/base_partner_merge/i18n/de_CH.po index ba33ecea7..e05286230 100644 --- a/base_partner_merge/i18n/de_CH.po +++ b/base_partner_merge/i18n/de_CH.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/el_GR.po b/base_partner_merge/i18n/el_GR.po index ef1d1c655..868746a82 100644 --- a/base_partner_merge/i18n/el_GR.po +++ b/base_partner_merge/i18n/el_GR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2016 msgid "" @@ -11,18 +11,14 @@ msgstr "" "POT-Creation-Date: 2016-08-20 23:45+0000\n" "PO-Revision-Date: 2016-08-20 23:45+0000\n" "Last-Translator: OCA Transbot , 2016\n" -"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n" +"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/" +"el_GR/)\n" +"Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_contact -msgid "A user associated to the contact" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the automatic merge of your contacts ?" @@ -30,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -49,11 +44,6 @@ msgstr "" msgid "Close" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_partner_ids -msgid "Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_create_uid #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_create_uid @@ -66,11 +56,6 @@ msgstr "Δημιουργήθηκε από " msgid "Created on" msgstr "Δημιουργήθηκε στις" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_current_line_id -msgid "Current Line" -msgstr "" - #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_deduplicate msgid "Deduplicate Contacts" @@ -81,58 +66,23 @@ msgstr "" msgid "Deduplicate the other Contacts" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_dst_partner_id -msgid "Destination Contact" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_display_name #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_display_name msgid "Display Name" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_email -msgid "Email" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Exclude contacts having" msgstr "" -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Finished" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_number_group -msgid "Group of Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_id #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_id msgid "ID" msgstr "Κωδικός" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_aggr_ids -msgid "Ids" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_is_company -msgid "Is Company" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_exclude_journal_item -msgid "Journal Items associated to the contact" -msgstr "" - #. module: base_partner_merge #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard___last_update #: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line___last_update @@ -151,16 +101,6 @@ msgstr "Τελευταία ενημέρωση από" msgid "Last Updated on" msgstr "Τελευταία ενημέρωση στις" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_line_ids -msgid "Lines" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_maximum_group -msgid "Maximum of Group of Contacts" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Merge Automatically" @@ -191,36 +131,11 @@ msgstr "" msgid "Merge with Manual Check" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_min_id -msgid "MinID" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_name -msgid "Name" -msgstr "" - -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Option" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Options" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_parent_id -msgid "Parent Company" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model,name:base_partner_merge.model_res_partner -msgid "Partner" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Partners" @@ -235,23 +150,19 @@ msgstr "" #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "" "Select the list of fields used to search for\n" -" duplicated records. If you select several fields,\n" -" Odoo will propose you to merge only those having\n" -" all these fields in common. (not one of the fields)." +" duplicated records. If you select several fields,\n" +" Odoo will propose you to merge only those having\n" +" all these fields in common. (not one of the fields)." msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "" "Selected contacts will be merged together.\n" -" All documents linked to one of these contacts\n" -" will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "" - -#. module: base_partner_merge -#: selection:base.partner.merge.automatic.wizard,state:0 -msgid "Selection" +" All documents linked to one of these contacts\n" +" will be redirected to the destination contact.\n" +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -259,26 +170,11 @@ msgstr "" msgid "Skip these contacts" msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_state -msgid "State" -msgstr "" - #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "There is no more contacts to merge for this request..." msgstr "" -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_automatic_wizard_group_by_vat -msgid "VAT" -msgstr "" - -#. module: base_partner_merge -#: model:ir.model.fields,field_description:base_partner_merge.field_base_partner_merge_line_wizard_id -msgid "Wizard" -msgstr "" - #. module: base_partner_merge #: model:ir.model,name:base_partner_merge.model_base_partner_merge_automatic_wizard msgid "base.partner.merge.automatic.wizard" @@ -288,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/en_GB.po b/base_partner_merge/i18n/en_GB.po index 4600f5511..5bfdd20ef 100644 --- a/base_partner_merge/i18n/en_GB.po +++ b/base_partner_merge/i18n/en_GB.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n" +"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/" +"teams/23907/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es.po b/base_partner_merge/i18n/es.po index 7a90f3f20..2d2a7b7e8 100644 --- a/base_partner_merge/i18n/es.po +++ b/base_partner_merge/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_AR.po b/base_partner_merge/i18n/es_AR.po index bb1c03a95..592ca20f5 100644 --- a/base_partner_merge/i18n/es_AR.po +++ b/base_partner_merge/i18n/es_AR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n" +"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/" +"teams/23907/es_AR/)\n" +"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_CL.po b/base_partner_merge/i18n/es_CL.po index 5c501b65e..bb23b42f6 100644 --- a/base_partner_merge/i18n/es_CL.po +++ b/base_partner_merge/i18n/es_CL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n" +"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/" +"es_CL/)\n" +"Language: es_CL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_CO.po b/base_partner_merge/i18n/es_CO.po index f05e55f3e..333249caf 100644 --- a/base_partner_merge/i18n/es_CO.po +++ b/base_partner_merge/i18n/es_CO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n" +"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/" +"es_CO/)\n" +"Language: es_CO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_CR.po b/base_partner_merge/i18n/es_CR.po index daa744501..e088db991 100644 --- a/base_partner_merge/i18n/es_CR.po +++ b/base_partner_merge/i18n/es_CR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n" +"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/" +"teams/23907/es_CR/)\n" +"Language: es_CR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_CR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_DO.po b/base_partner_merge/i18n/es_DO.po index eb3ff6d74..991c05df0 100644 --- a/base_partner_merge/i18n/es_DO.po +++ b/base_partner_merge/i18n/es_DO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n" +"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/" +"teams/23907/es_DO/)\n" +"Language: es_DO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_DO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_EC.po b/base_partner_merge/i18n/es_EC.po index c71560ae2..2f6ef4681 100644 --- a/base_partner_merge/i18n/es_EC.po +++ b/base_partner_merge/i18n/es_EC.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n" +"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/" +"es_EC/)\n" +"Language: es_EC\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_EC\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_ES.po b/base_partner_merge/i18n/es_ES.po index d4b7a1a60..1157e49cf 100644 --- a/base_partner_merge/i18n/es_ES.po +++ b/base_partner_merge/i18n/es_ES.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n" +"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/" +"es_ES/)\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_GT.po b/base_partner_merge/i18n/es_GT.po index 6ca8887c1..8c08e5c2e 100644 --- a/base_partner_merge/i18n/es_GT.po +++ b/base_partner_merge/i18n/es_GT.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:55+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/es_MX.po b/base_partner_merge/i18n/es_MX.po index 57b83d4ac..e9fbeb470 100644 --- a/base_partner_merge/i18n/es_MX.po +++ b/base_partner_merge/i18n/es_MX.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n" +"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/" +"es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_PE.po b/base_partner_merge/i18n/es_PE.po index c41cf459e..7acc2084f 100644 --- a/base_partner_merge/i18n/es_PE.po +++ b/base_partner_merge/i18n/es_PE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/es_PE/)\n" +"Language-Team: Spanish (Peru) (https://www.transifex.com/oca/teams/23907/" +"es_PE/)\n" +"Language: es_PE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_PE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_PY.po b/base_partner_merge/i18n/es_PY.po index 498564de7..b6084aaa5 100644 --- a/base_partner_merge/i18n/es_PY.po +++ b/base_partner_merge/i18n/es_PY.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n" +"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/" +"es_PY/)\n" +"Language: es_PY\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_PY\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/es_VE.po b/base_partner_merge/i18n/es_VE.po index b4a718ea6..753fa8649 100644 --- a/base_partner_merge/i18n/es_VE.po +++ b/base_partner_merge/i18n/es_VE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n" +"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/" +"teams/23907/es_VE/)\n" +"Language: es_VE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es_VE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/et.po b/base_partner_merge/i18n/et.po index 440b1adf9..3666b3db7 100644 --- a/base_partner_merge/i18n/et.po +++ b/base_partner_merge/i18n/et.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/et_EE.po b/base_partner_merge/i18n/et_EE.po index 1c7e80aa9..4c0377c9e 100644 --- a/base_partner_merge/i18n/et_EE.po +++ b/base_partner_merge/i18n/et_EE.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:58+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/eu.po b/base_partner_merge/i18n/eu.po index 4323bc92c..629db8fbf 100644 --- a/base_partner_merge/i18n/eu.po +++ b/base_partner_merge/i18n/eu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/eu_ES.po b/base_partner_merge/i18n/eu_ES.po index 1c7e80aa9..4c0377c9e 100644 --- a/base_partner_merge/i18n/eu_ES.po +++ b/base_partner_merge/i18n/eu_ES.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:58+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/fa.po b/base_partner_merge/i18n/fa.po index d9165c937..7d6b3c037 100644 --- a/base_partner_merge/i18n/fa.po +++ b/base_partner_merge/i18n/fa.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/fa_IR.po b/base_partner_merge/i18n/fa_IR.po index e661042f7..5950d5362 100644 --- a/base_partner_merge/i18n/fa_IR.po +++ b/base_partner_merge/i18n/fa_IR.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 08:59+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/fi.po b/base_partner_merge/i18n/fi.po index 89d69bc96..dc1cee0fc 100644 --- a/base_partner_merge/i18n/fi.po +++ b/base_partner_merge/i18n/fi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/fr.po b/base_partner_merge/i18n/fr.po index 361d7aa12..de0fd73f5 100644 --- a/base_partner_merge/i18n/fr.po +++ b/base_partner_merge/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # Quentin THEURET , 2017 # OCA Transbot , 2017 @@ -13,10 +13,10 @@ msgstr "" "PO-Revision-Date: 2017-07-15 05:28+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_partner_merge @@ -26,8 +26,7 @@ msgstr "Êtes-vous sûr de vouloir exécuter la fusion de vos contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" "Êtes-vous sûr de vouloir exécuter la liste des fusions automatiques de vos " "contacts ?" @@ -168,12 +167,14 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" "Les contacts sélectionnés seront fusionnés ensemble.\n" "Tous les documents liés à l'un de ces contacts seront\n" "redirigés vers le contact de destination.\n" -"Vous pouvez supprimer les contacts de cette liste pour éviter des les fusionner." +"Vous pouvez supprimer les contacts de cette liste pour éviter des les " +"fusionner." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -195,7 +196,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "ou" +#~ msgid "or" +#~ msgstr "ou" diff --git a/base_partner_merge/i18n/fr_CA.po b/base_partner_merge/i18n/fr_CA.po index d31b208c7..87a520159 100644 --- a/base_partner_merge/i18n/fr_CA.po +++ b/base_partner_merge/i18n/fr_CA.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n" +"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/" +"fr_CA/)\n" +"Language: fr_CA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/fr_CH.po b/base_partner_merge/i18n/fr_CH.po index 21cece1f6..2f4d69085 100644 --- a/base_partner_merge/i18n/fr_CH.po +++ b/base_partner_merge/i18n/fr_CH.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n" +"Language-Team: French (Switzerland) (https://www.transifex.com/oca/" +"teams/23907/fr_CH/)\n" +"Language: fr_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr_CH\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/gl.po b/base_partner_merge/i18n/gl.po index d307cbcd4..5cc85e545 100644 --- a/base_partner_merge/i18n/gl.po +++ b/base_partner_merge/i18n/gl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/gl_ES.po b/base_partner_merge/i18n/gl_ES.po index 4f92bce55..73273d70f 100644 --- a/base_partner_merge/i18n/gl_ES.po +++ b/base_partner_merge/i18n/gl_ES.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/gl_ES/)\n" +"Language-Team: Galician (Spain) (https://www.transifex.com/oca/teams/23907/" +"gl_ES/)\n" +"Language: gl_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: gl_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/he.po b/base_partner_merge/i18n/he.po index 14aa6f107..9bf2514f5 100644 --- a/base_partner_merge/i18n/he.po +++ b/base_partner_merge/i18n/he.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/he_IL.po b/base_partner_merge/i18n/he_IL.po index 79870eea6..377adfec4 100644 --- a/base_partner_merge/i18n/he_IL.po +++ b/base_partner_merge/i18n/he_IL.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:15+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/hr.po b/base_partner_merge/i18n/hr.po index 3f2aa4116..41c905846 100644 --- a/base_partner_merge/i18n/hr.po +++ b/base_partner_merge/i18n/hr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/hr_HR.po b/base_partner_merge/i18n/hr_HR.po index 325085d1b..8adc51576 100644 --- a/base_partner_merge/i18n/hr_HR.po +++ b/base_partner_merge/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/oca/teams/23907/" +"hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +185,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/hu.po b/base_partner_merge/i18n/hu.po index f514c8c5e..6da55bcca 100644 --- a/base_partner_merge/i18n/hu.po +++ b/base_partner_merge/i18n/hu.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/id.po b/base_partner_merge/i18n/id.po index c6d3e8141..eacfa5689 100644 --- a/base_partner_merge/i18n/id.po +++ b/base_partner_merge/i18n/id.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/it.po b/base_partner_merge/i18n/it.po index ea9aa1053..3155377f9 100644 --- a/base_partner_merge/i18n/it.po +++ b/base_partner_merge/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ja.po b/base_partner_merge/i18n/ja.po index 1b3db986f..f99b156a5 100644 --- a/base_partner_merge/i18n/ja.po +++ b/base_partner_merge/i18n/ja.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ja_JP.po b/base_partner_merge/i18n/ja_JP.po index 44bf23237..a13f361cb 100644 --- a/base_partner_merge/i18n/ja_JP.po +++ b/base_partner_merge/i18n/ja_JP.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/ko.po b/base_partner_merge/i18n/ko.po index 3bc50b9ae..49963dbba 100644 --- a/base_partner_merge/i18n/ko.po +++ b/base_partner_merge/i18n/ko.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ko_KR.po b/base_partner_merge/i18n/ko_KR.po index d5a36487f..184da8f3b 100644 --- a/base_partner_merge/i18n/ko_KR.po +++ b/base_partner_merge/i18n/ko_KR.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/lo_LA.po b/base_partner_merge/i18n/lo_LA.po index 082943cf9..4499fe111 100644 --- a/base_partner_merge/i18n/lo_LA.po +++ b/base_partner_merge/i18n/lo_LA.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/lt.po b/base_partner_merge/i18n/lt.po index b4b991689..b5b95ca37 100644 --- a/base_partner_merge/i18n/lt.po +++ b/base_partner_merge/i18n/lt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/lt_LT.po b/base_partner_merge/i18n/lt_LT.po index 18c2abefe..e69112bb6 100644 --- a/base_partner_merge/i18n/lt_LT.po +++ b/base_partner_merge/i18n/lt_LT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/teams/23907/lt_LT/)\n" +"Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/oca/" +"teams/23907/lt_LT/)\n" +"Language: lt_LT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lt_LT\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +185,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/lv.po b/base_partner_merge/i18n/lv.po index b371e6937..8dcd6da12 100644 --- a/base_partner_merge/i18n/lv.po +++ b/base_partner_merge/i18n/lv.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n" +"Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " +"2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/mk.po b/base_partner_merge/i18n/mk.po index b5300e926..f0cc431d0 100644 --- a/base_partner_merge/i18n/mk.po +++ b/base_partner_merge/i18n/mk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n" +"Language: mk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/mn.po b/base_partner_merge/i18n/mn.po index 273b5fb9d..14bf9009e 100644 --- a/base_partner_merge/i18n/mn.po +++ b/base_partner_merge/i18n/mn.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n" +"Language: mn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/my_MM.po b/base_partner_merge/i18n/my_MM.po index a6b573d3a..a2ed6622c 100644 --- a/base_partner_merge/i18n/my_MM.po +++ b/base_partner_merge/i18n/my_MM.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:23+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/nb.po b/base_partner_merge/i18n/nb.po index 3d85b820e..1920420c6 100644 --- a/base_partner_merge/i18n/nb.po +++ b/base_partner_merge/i18n/nb.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n" +"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/" +"nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/nb_NO.po b/base_partner_merge/i18n/nb_NO.po index f65bd275e..82464936a 100644 --- a/base_partner_merge/i18n/nb_NO.po +++ b/base_partner_merge/i18n/nb_NO.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n" +"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/" +"teams/23907/nb_NO/)\n" +"Language: nb_NO\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nb_NO\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/nl.po b/base_partner_merge/i18n/nl.po index c5561b12c..641409ff9 100644 --- a/base_partner_merge/i18n/nl.po +++ b/base_partner_merge/i18n/nl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n" +"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" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/nl_BE.po b/base_partner_merge/i18n/nl_BE.po index 745c1aad9..4af8603a8 100644 --- a/base_partner_merge/i18n/nl_BE.po +++ b/base_partner_merge/i18n/nl_BE.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n" +"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/" +"nl_BE/)\n" +"Language: nl_BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_BE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/nl_NL.po b/base_partner_merge/i18n/nl_NL.po index 795639d30..a99d0fc3c 100644 --- a/base_partner_merge/i18n/nl_NL.po +++ b/base_partner_merge/i18n/nl_NL.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # Peter Hageman , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: Peter Hageman , 2017\n" -"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n" +"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/" +"teams/23907/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/pl.po b/base_partner_merge/i18n/pl.po index cef69e07b..717e12c5d 100644 --- a/base_partner_merge/i18n/pl.po +++ b/base_partner_merge/i18n/pl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,13 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pl\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +185,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/pt.po b/base_partner_merge/i18n/pt.po index e97c54674..5d619e9fc 100644 --- a/base_partner_merge/i18n/pt.po +++ b/base_partner_merge/i18n/pt.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/pt_BR.po b/base_partner_merge/i18n/pt_BR.po index f8c8a2a5b..51cbf3317 100644 --- a/base_partner_merge/i18n/pt_BR.po +++ b/base_partner_merge/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/" +"teams/23907/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_partner_merge @@ -26,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" "Você tem certeza que quer executar a mescla automática de seus contatos ?" @@ -163,7 +163,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -186,7 +187,5 @@ msgstr "" msgid "base.partner.merge.line" msgstr "" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "ou" +#~ msgid "or" +#~ msgstr "ou" diff --git a/base_partner_merge/i18n/pt_PT.po b/base_partner_merge/i18n/pt_PT.po index e0ea2346c..5d3225fd9 100644 --- a/base_partner_merge/i18n/pt_PT.po +++ b/base_partner_merge/i18n/pt_PT.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/" +"teams/23907/pt_PT/)\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ro.po b/base_partner_merge/i18n/ro.po index 952349091..4767e38c0 100644 --- a/base_partner_merge/i18n/ro.po +++ b/base_partner_merge/i18n/ro.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ro\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" +"2:1));\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/ru.po b/base_partner_merge/i18n/ru.po index 74eab098c..8d1249d2b 100644 --- a/base_partner_merge/i18n/ru.po +++ b/base_partner_merge/i18n/ru.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,13 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: ru\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +185,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/sk.po b/base_partner_merge/i18n/sk.po index 429bc181f..fb5f7d887 100644 --- a/base_partner_merge/i18n/sk.po +++ b/base_partner_merge/i18n/sk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/sl.po b/base_partner_merge/i18n/sl.po index 999b3277d..b0b099a53 100644 --- a/base_partner_merge/i18n/sl.po +++ b/base_partner_merge/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "Ste prepričani, da želite izvesti samodejno združitev svojih stikov?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" "Ste prepričani, da želite izvesti seznam samodejnih združitev svojih stikov?" @@ -162,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -185,7 +186,5 @@ msgstr "" msgid "base.partner.merge.line" msgstr "" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "ali" +#~ msgid "or" +#~ msgstr "ali" diff --git a/base_partner_merge/i18n/sl_SI.po b/base_partner_merge/i18n/sl_SI.po index dcd912d31..281ce2c69 100644 --- a/base_partner_merge/i18n/sl_SI.po +++ b/base_partner_merge/i18n/sl_SI.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 12:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/sr.po b/base_partner_merge/i18n/sr.po index 1dbef4338..26051b74f 100644 --- a/base_partner_merge/i18n/sr.po +++ b/base_partner_merge/i18n/sr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/sr@latin.po b/base_partner_merge/i18n/sr@latin.po index 0e964091a..1641982f1 100644 --- a/base_partner_merge/i18n/sr@latin.po +++ b/base_partner_merge/i18n/sr@latin.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,12 +11,14 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr@latin/)\n" +"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/" +"sr@latin/)\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sr@latin\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +27,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +162,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +185,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/sr_RS.po b/base_partner_merge/i18n/sr_RS.po index 4af07e160..66697897c 100644 --- a/base_partner_merge/i18n/sr_RS.po +++ b/base_partner_merge/i18n/sr_RS.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/sv.po b/base_partner_merge/i18n/sv.po index 6c551745d..b0a02755b 100644 --- a/base_partner_merge/i18n/sv.po +++ b/base_partner_merge/i18n/sv.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/sv_SE.po b/base_partner_merge/i18n/sv_SE.po index 35b76afb4..7e8de2c40 100644 --- a/base_partner_merge/i18n/sv_SE.po +++ b/base_partner_merge/i18n/sv_SE.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/te_IN.po b/base_partner_merge/i18n/te_IN.po index 35b76afb4..7e8de2c40 100644 --- a/base_partner_merge/i18n/te_IN.po +++ b/base_partner_merge/i18n/te_IN.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/th.po b/base_partner_merge/i18n/th.po index ac5f2ce25..3c4a24145 100644 --- a/base_partner_merge/i18n/th.po +++ b/base_partner_merge/i18n/th.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n" +"Language: th\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/tr.po b/base_partner_merge/i18n/tr.po index a8db867bd..857f698a0 100644 --- a/base_partner_merge/i18n/tr.po +++ b/base_partner_merge/i18n/tr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/tr_TR.po b/base_partner_merge/i18n/tr_TR.po index a902e3319..794f94b48 100644 --- a/base_partner_merge/i18n/tr_TR.po +++ b/base_partner_merge/i18n/tr_TR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (https://www.transifex.com/oca/teams/23907/" +"tr_TR/)\n" +"Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/uk.po b/base_partner_merge/i18n/uk.po index 0b9e4ae5b..9e83f861e 100644 --- a/base_partner_merge/i18n/uk.po +++ b/base_partner_merge/i18n/uk.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,11 +12,12 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/uk_UA.po b/base_partner_merge/i18n/uk_UA.po index df6625b96..b1390f264 100644 --- a/base_partner_merge/i18n/uk_UA.po +++ b/base_partner_merge/i18n/uk_UA.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * base_partner_merge +# * base_partner_merge # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-01-01 09:30+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -23,7 +24,8 @@ msgstr "Are you sure to execute the automatic merge of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form msgid "Are you sure to execute the list of automatic merges of your contacts ?" -msgstr "Are you sure to execute the list of automatic merges of your contacts ?" +msgstr "" +"Are you sure to execute the list of automatic merges of your contacts ?" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -114,7 +116,8 @@ msgstr "Merge Contacts" #. module: base_partner_merge #: model:ir.actions.act_window,name:base_partner_merge.action_partner_merge -msgid "Merge Selected Contacts BASE" +#, fuzzy +msgid "Merge Selected Contacts" msgstr "Merge Selected Contacts BASE" #. module: base_partner_merge @@ -144,25 +147,31 @@ msgstr "Search duplicates based on duplicated data in" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Select the list of fields used to search for\n" +msgid "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." -msgstr "Select the list of fields used to search for\n" +msgstr "" +"Select the list of fields used to search for\n" " duplicated records. If you select several fields,\n" " Odoo will propose you to merge only those having\n" " all these fields in common. (not one of the fields)." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "Selected contacts will be merged together.\n" +msgid "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." -msgstr "Selected contacts will be merged together.\n" +" You can remove contacts from this list to avoid " +"merging them." +msgstr "" +"Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form @@ -184,8 +193,5 @@ msgstr "base.partner.merge.automatic.wizard" msgid "base.partner.merge.line" msgstr "base.partner.merge.line" -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "or" - +#~ msgid "or" +#~ msgstr "or" diff --git a/base_partner_merge/i18n/vi.po b/base_partner_merge/i18n/vi.po index ab2f4e3ba..95ea3d8c1 100644 --- a/base_partner_merge/i18n/vi.po +++ b/base_partner_merge/i18n/vi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +25,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +160,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +183,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/vi_VN.po b/base_partner_merge/i18n/vi_VN.po index a50bbf481..a4a875973 100644 --- a/base_partner_merge/i18n/vi_VN.po +++ b/base_partner_merge/i18n/vi_VN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/teams/23907/vi_VN/)\n" +"Language-Team: Vietnamese (Viet Nam) (https://www.transifex.com/oca/" +"teams/23907/vi_VN/)\n" +"Language: vi_VN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: vi_VN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/zh_CN.po b/base_partner_merge/i18n/zh_CN.po index cde7003e3..22ab0fe0b 100644 --- a/base_partner_merge/i18n/zh_CN.po +++ b/base_partner_merge/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n" +"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/" +"zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr "" diff --git a/base_partner_merge/i18n/zh_TW.po b/base_partner_merge/i18n/zh_TW.po index a6e42d248..c05c497ea 100644 --- a/base_partner_merge/i18n/zh_TW.po +++ b/base_partner_merge/i18n/zh_TW.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * base_partner_merge -# +# # Translators: # OCA Transbot , 2017 msgid "" @@ -11,11 +11,12 @@ msgstr "" "POT-Creation-Date: 2017-07-08 02:41+0000\n" "PO-Revision-Date: 2017-07-08 02:41+0000\n" "Last-Translator: OCA Transbot , 2017\n" -"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n" +"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/" +"zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: base_partner_merge @@ -25,8 +26,7 @@ msgstr "" #. module: base_partner_merge #: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "" -"Are you sure to execute the list of automatic merges of your contacts ?" +msgid "Are you sure to execute the list of automatic merges of your contacts ?" msgstr "" #. module: base_partner_merge @@ -161,7 +161,8 @@ msgid "" "Selected contacts will be merged together.\n" " All documents linked to one of these contacts\n" " will be redirected to the destination contact.\n" -" You can remove contacts from this list to avoid merging them." +" You can remove contacts from this list to avoid " +"merging them." msgstr "" #. module: base_partner_merge @@ -183,8 +184,3 @@ msgstr "" #: model:ir.model,name:base_partner_merge.model_base_partner_merge_line msgid "base.partner.merge.line" msgstr "" - -#. module: base_partner_merge -#: model:ir.ui.view,arch_db:base_partner_merge.base_partner_merge_automatic_wizard_form -msgid "or" -msgstr ""