Merge lp:~noviat/openobject-addons/6.1 into lp:openobject-addons
Proposed by
Luc De Meyer (Noviat)
Status: | Rejected |
---|---|
Rejected by: | qdp (OpenERP) |
Proposed branch: | lp:~noviat/openobject-addons/6.1 |
Merge into: | lp:openobject-addons |
Diff against target: |
109098 lines (+35278/-8910) (has conflicts) 474 files modified
account/account_invoice.py (+15/-2) account/account_move_line.py (+6/-1) account/i18n/ar.po (+20/-11) account/i18n/es.po (+10/-0) account/i18n/es_EC.po (+421/-182) account/i18n/et.po (+12/-2) account/i18n/fi.po (+10/-0) account/i18n/fr.po (+11/-1) account/i18n/it.po (+13/-2) account/i18n/nl.po (+34/-9) account/i18n/pt.po (+393/-298) account/i18n/pt_BR.po (+13/-3) account/i18n/ro.po (+5/-0) account/i18n/sl.po (+255/-177) account/res_currency.py (+2/-1) account_accountant/i18n/ja.po (+20/-0) account_analytic_analysis/i18n/ar.po (+20/-11) account_analytic_analysis/i18n/bs.po (+15/-5) account_analytic_analysis/i18n/es_EC.po (+51/-25) account_analytic_analysis/i18n/ja.po (+352/-0) account_analytic_analysis/i18n/pt.po (+22/-12) account_analytic_default/i18n/ar.po (+11/-1) account_analytic_default/i18n/es_EC.po (+13/-1) account_analytic_default/i18n/ja.po (+189/-0) account_analytic_default/i18n/pt.po (+15/-4) account_analytic_plans/i18n/ar.po (+10/-1) account_analytic_plans/i18n/es_EC.po (+30/-8) account_analytic_plans/i18n/ja.po (+545/-0) account_analytic_plans/i18n/pl.po (+12/-2) account_analytic_plans/i18n/pt.po (+39/-22) account_anglo_saxon/i18n/es_EC.po (+16/-5) account_anglo_saxon/i18n/ja.po (+98/-0) account_asset/i18n/ar.po (+28/-19) account_asset/i18n/es_EC.po (+833/-0) account_asset/i18n/ja.po (+807/-0) account_bank_statement_extensions/i18n/ar.po.OTHER (+376/-0) account_bank_statement_extensions/i18n/es_EC.po (+374/-0) account_bank_statement_extensions/i18n/it.po (+374/-0) account_bank_statement_extensions/i18n/ja.po (+374/-0) account_budget/i18n/es_EC.po (+17/-2) account_budget/i18n/ja.po (+421/-0) account_budget/i18n/pt.po (+38/-16) account_cancel/i18n/cs.po (+23/-0) account_cancel/i18n/es_CL.po (+23/-0) account_cancel/i18n/es_EC.po (+14/-0) account_cancel/i18n/it.po (+14/-0) account_cancel/i18n/ja.po (+23/-0) account_cancel/i18n/pl.po (+14/-0) account_cancel/i18n/pt.po (+14/-0) account_chart/i18n/ja.po (+28/-0) account_check_writing/i18n/ar.po (+199/-0) account_check_writing/i18n/nl.po.OTHER (+207/-0) account_coda/i18n/ar.po (+51/-42) account_coda/i18n/it.po (+12/-2) account_coda/i18n/zh_CN.po (+10/-0) account_followup/i18n/ar.po (+15/-5) account_followup/i18n/bs.po (+22/-10) account_followup/i18n/pt.po (+93/-53) account_invoice_layout/i18n/ar.po (+13/-3) account_invoice_layout/i18n/es_EC.po (+16/-5) account_invoice_layout/i18n/pt.po (+18/-8) account_payment/i18n/es_EC.po (+23/-7) account_payment/i18n/nl.po (+10/-1) account_payment/i18n/pt.po (+63/-38) account_sequence/i18n/fr.po (+15/-0) account_sequence/i18n/pt.po (+60/-34) account_voucher/i18n/ar.po (+36/-12) account_voucher/i18n/es_EC.po (+16/-0) analytic/i18n/ar.po (+22/-4) analytic/i18n/bs.po (+15/-5) analytic/i18n/es_EC.po (+24/-8) analytic/i18n/pt.po (+57/-22) analytic_user_function/i18n/ja.po (+79/-0) analytic_user_function/i18n/pt.po (+11/-0) association/i18n/ja.po (+135/-0) auction/i18n/ar.po (+21/-4) auction/i18n/fr.po (+11/-1) auction/i18n/nl.po (+199/-180) audittrail/audittrail.py (+3/-3) auth_openid/controllers/main.py (+13/-1) auth_openid/i18n/ar.po (+113/-0) auth_openid/i18n/fi.po (+112/-0) auth_openid/i18n/sr@latin.po (+112/-0) base_calendar/i18n/ar.po (+26/-13) base_calendar/i18n/pt.po (+144/-106) base_calendar/i18n/ro.po (+19/-9) base_contact/i18n/ar.po.OTHER (+264/-0) base_contact/i18n/es.po.OTHER (+265/-0) base_contact/i18n/fi.po.OTHER (+266/-0) base_contact/i18n/ja.po (+264/-0) base_contact/i18n/nb.po.OTHER (+264/-0) base_contact/i18n/pt.po.OTHER (+265/-0) base_crypt/i18n/ar.po (+14/-0) base_crypt/i18n/cs.po (+46/-0) base_crypt/i18n/ja.po (+45/-0) base_crypt/i18n/pl.po (+45/-0) base_crypt/i18n/sr@latin.po (+10/-1) base_iban/i18n/ja.po (+91/-0) base_iban/i18n/pt.po (+22/-5) base_module_doc_rst/i18n/pt.po (+62/-0) base_module_quality/i18n/ar.po (+17/-4) base_module_quality/i18n/pt.po (+53/-16) base_module_record/i18n/pt.po (+18/-5) base_report_designer/i18n/pt.po (+21/-3) base_setup/i18n/ar.po (+28/-16) base_setup/i18n/es_EC.po (+70/-37) base_setup/i18n/nb.po (+25/-15) base_setup/i18n/pt.po (+74/-38) base_setup/i18n/sl.po (+66/-37) base_synchro/i18n/pt.po (+29/-18) base_tools/i18n/cs.po (+32/-0) base_tools/i18n/es_EC.po (+32/-0) base_tools/i18n/ja.po (+32/-0) base_vat/i18n/ar.po (+13/-3) base_vat/i18n/es_EC.po (+18/-7) base_vat/i18n/ja.po (+78/-0) base_vat/i18n/pt.po (+20/-5) board/i18n/ar.po (+12/-2) board/i18n/ja.po (+348/-0) board/i18n/pt.po (+34/-22) caldav/i18n/ar.po (+22/-3) caldav/i18n/pt.po (+83/-64) claim_from_delivery/i18n/cs.po (+23/-0) claim_from_delivery/i18n/ja.po (+23/-0) crm/crm_lead.py (+16/-0) crm/i18n/ar.po (+84/-14) crm/i18n/es.po (+33/-8) crm/i18n/ja.po (+18/-0) crm/i18n/nb.po (+50/-41) crm/i18n/nl.po (+12/-3) crm/i18n/pt.po (+291/-165) crm_caldav/i18n/cs.po (+33/-0) crm_caldav/i18n/it.po (+11/-1) crm_caldav/i18n/ja.po (+33/-0) crm_caldav/i18n/pl.po (+33/-0) crm_caldav/i18n/pt.po (+18/-8) crm_claim/i18n/ar.po (+22/-4) crm_claim/i18n/fi.po (+33/-19) crm_claim/i18n/it.po (+14/-4) crm_claim/i18n/nl.po (+12/-3) crm_claim/i18n/pt.po (+114/-80) crm_fundraising/i18n/ar.po (+24/-5) crm_fundraising/i18n/pt.po (+83/-52) crm_helpdesk/i18n/ar.po (+26/-6) crm_helpdesk/i18n/fi.po (+36/-21) crm_helpdesk/i18n/nl.po (+14/-5) crm_helpdesk/i18n/pt.po (+89/-56) crm_partner_assign/i18n/ar.po (+33/-21) crm_partner_assign/i18n/pt.po (+96/-73) crm_profiling/i18n/ar.po (+18/-5) crm_profiling/i18n/fi.po (+13/-3) crm_profiling/i18n/pt.po (+22/-5) crm_todo/i18n/ar.po (+95/-0) crm_todo/i18n/fi.po (+96/-0) crm_todo/i18n/it.po (+97/-0) crm_todo/i18n/pt.po (+95/-0) decimal_precision/i18n/cs.po (+49/-0) decimal_precision/i18n/ja.po (+49/-0) decimal_precision/i18n/nb.po (+14/-4) delivery/i18n/pt.po (+71/-38) document/i18n/ar.po (+22/-1) document/i18n/nl.po (+10/-1) document/i18n/pt.po (+34/-19) document_webdav/i18n/ar.po (+15/-3) document_webdav/i18n/fi.po (+18/-5) document_webdav/i18n/pt.po (+44/-31) edi/i18n/ar.po (+386/-0) edi/i18n/es.po (+59/-33) edi/i18n/fi.po (+64/-53) email_template/i18n/ar.po (+27/-14) email_template/i18n/fi.po (+75/-52) email_template/i18n/fr.po (+11/-1) email_template/i18n/pt.po (+117/-63) email_template/wizard/mail_compose_message.py (+7/-6) event/i18n/ar.po (+26/-10) event/i18n/fi.po (+48/-25) event/i18n/nl.po (+10/-1) fetchmail/i18n/ar.po (+19/-9) fetchmail/i18n/es.po (+12/-2) fetchmail/i18n/fi.po (+43/-29) fetchmail_crm/i18n/ja.po (+34/-0) fetchmail_crm/i18n/pt.po (+36/-0) fetchmail_crm_claim/i18n/ja.po (+32/-0) fetchmail_hr_recruitment/i18n/ja.po (+32/-0) fetchmail_project_issue/i18n/ja.po (+34/-0) google_base_account/i18n/ar.po (+120/-0) google_base_account/i18n/it.po (+121/-0) google_base_account/i18n/sr@latin.po (+121/-0) google_map/i18n/ja.po (+35/-0) hr/i18n/ar.po (+57/-35) hr/i18n/es_EC.po (+12/-2) hr/i18n/fi.po (+32/-16) hr/i18n/fr.po (+11/-1) hr/i18n/nl.po (+10/-1) hr/i18n/pt.po (+51/-33) hr_attendance/i18n/ar.po (+31/-16) hr_attendance/i18n/pt.po (+57/-46) hr_contract/i18n/ar.po (+14/-5) hr_contract/i18n/es_EC.po (+53/-36) hr_contract/i18n/it.po (+13/-3) hr_contract/i18n/pt.po (+31/-20) hr_evaluation/i18n/ar.po (+21/-11) hr_evaluation/i18n/nl.po (+12/-3) hr_evaluation/i18n/pt.po (+140/-84) hr_evaluation/i18n/zh_CN.po (+20/-10) hr_expense/i18n/ar.po (+34/-13) hr_expense/i18n/fr.po (+11/-1) hr_expense/i18n/nl.po (+11/-1) hr_expense/i18n/pt.po (+56/-24) hr_holidays/i18n/ar.po (+29/-9) hr_holidays/i18n/pt.po (+123/-64) hr_payroll/i18n/ar.po (+48/-38) hr_payroll/i18n/es_EC.po (+181/-135) hr_payroll/i18n/gu.po.OTHER (+1119/-0) hr_payroll/i18n/ja.po (+1132/-0) hr_payroll/i18n/lv.po (+1119/-0) hr_payroll/i18n/nl.po (+47/-37) hr_payroll/i18n/pt.po (+200/-145) hr_payroll/i18n/zh_CN.po (+11/-1) hr_payroll_account/i18n/ar.po (+20/-7) hr_payroll_account/i18n/es_EC.po (+33/-19) hr_payroll_account/i18n/ja.po (+140/-0) hr_payroll_account/i18n/pt.po (+44/-21) hr_recruitment/i18n/ar.po (+54/-35) hr_recruitment/i18n/fr.po (+34/-13) hr_recruitment/i18n/ja.po (+1155/-0) hr_recruitment/i18n/nl.po (+13/-4) hr_recruitment/i18n/pt.po (+143/-117) hr_timesheet/i18n/ar.po (+24/-8) hr_timesheet/i18n/es_EC.po (+657/-0) hr_timesheet/i18n/fi.po (+20/-8) hr_timesheet/i18n/ja.po (+642/-0) hr_timesheet/i18n/pt.po (+65/-36) hr_timesheet_invoice/i18n/ar.po (+27/-11) hr_timesheet_invoice/i18n/pt.po (+131/-94) hr_timesheet_sheet/i18n/ar.po (+22/-3) hr_timesheet_sheet/i18n/es.po (+20/-10) hr_timesheet_sheet/i18n/fi.po (+52/-25) hr_timesheet_sheet/i18n/pt.po (+125/-71) idea/i18n/ar.po (+17/-5) idea/i18n/fi.po (+26/-16) import_base/i18n/ar.po (+100/-0) import_base/i18n/fi.po (+104/-0) import_base/i18n/pt.po (+105/-0) import_google/i18n/sr@latin.po (+223/-0) import_sugarcrm/i18n/ar.po.OTHER (+404/-0) import_sugarcrm/i18n/nl.po (+406/-0) knowledge/i18n/zh_CN.po (+10/-1) l10n_be/wizard/l10n_be_account_vat_declaration.py (+47/-17) l10n_be/wizard/l10n_be_account_vat_declaration_view.xml (+46/-1) l10n_be/wizard/l10n_be_vat_intra.py (+27/-14) l10n_be_hr_payroll/i18n/sr@latin.po (+158/-0) l10n_be_invoice_bba/i18n/ar.po (+141/-0) l10n_br/i18n/ar.po (+15/-4) l10n_ca/i18n/ar.po (+15/-5) l10n_ec/i18n/ar.po (+11/-1) l10n_es/i18n/ar.po (+11/-1) l10n_fr/i18n/ar.po (+19/-9) l10n_fr_rib/i18n/ar.po (+131/-0) l10n_gt/i18n/it.po (+19/-5) l10n_hn/i18n/it.po (+16/-6) l10n_in/i18n/ar.po (+20/-10) l10n_in/i18n/it.po (+18/-4) l10n_it/i18n/it.po (+23/-9) l10n_lu/i18n/ar.po (+16/-6) l10n_ma/i18n/ar.po (+12/-2) l10n_mx/i18n/ar.po (+18/-8) l10n_nl/i18n/ar.po (+11/-1) l10n_ro/i18n/ar.po (+22/-12) l10n_syscohada/i18n/ar.po (+115/-0) l10n_th/i18n/ar.po (+13/-3) l10n_uk/i18n/ar.po (+18/-8) l10n_ve/i18n/ar.po (+18/-8) mail/i18n/fi.po (+80/-60) mail/i18n/fr.po (+11/-1) mail/i18n/pt.po (+82/-61) marketing/i18n/ar.po (+15/-1) marketing/i18n/cs.po (+28/-0) marketing/i18n/pt.po (+17/-7) marketing_campaign/i18n/pt.po (+175/-84) marketing_campaign_crm_demo/i18n/ar.po (+12/-2) marketing_campaign_crm_demo/i18n/pt.po (+64/-6) mrp/i18n/ar.po (+363/-269) mrp/i18n/fi.po (+64/-42) mrp/i18n/nl.po (+10/-1) mrp/i18n/ro.po (+17/-8) mrp_operations/i18n/ar.po (+77/-57) mrp_operations/i18n/fi.po (+35/-21) mrp_repair/i18n/ar.po (+100/-63) mrp_subproduct/i18n/ar.po (+24/-11) mrp_subproduct/i18n/fi.po (+17/-3) multi_company/i18n/fi.po (+14/-4) pad/i18n/ar.po (+12/-2) pad/i18n/cs.po (+58/-0) pad_project/i18n/ar.po (+38/-0) pad_project/i18n/cs.po (+38/-0) pad_project/i18n/fi.po (+39/-0) plugin/i18n/ar.po (+23/-0) plugin/i18n/cs.po (+23/-0) plugin_outlook/i18n/et.po (+13/-3) point_of_sale/i18n/es.po (+74/-42) point_of_sale/i18n/fr.po (+209/-177) point_of_sale/i18n/nl.po (+28/-5) point_of_sale/i18n/pt.po (+28/-17) point_of_sale/point_of_sale_demo.xml (+3/-0) point_of_sale/static/src/js/pos.js (+281/-170) point_of_sale/static/src/xml/pos.xml (+3/-0) portal/i18n/fi.po (+68/-48) procurement/i18n/es.po (+28/-10) procurement/i18n/fi.po (+26/-10) procurement/i18n/fr.po (+11/-1) product/i18n/es.po (+20/-8) product/i18n/es_EC.po (+20/-5) product/i18n/fi.po (+40/-22) product/i18n/nb.po (+16/-6) product/i18n/pt.po (+288/-226) product/product.py (+1/-1) product_expiry/i18n/ar.po (+13/-3) product_expiry/i18n/fr.po (+11/-1) product_manufacturer/i18n/ar.po (+11/-1) product_manufacturer/i18n/fr.po (+11/-1) product_margin/i18n/pt.po (+39/-22) product_visible_discount/i18n/fi.po (+17/-3) product_visible_discount/i18n/pt.po (+26/-12) project/i18n/ar.po (+165/-108) project/i18n/es_EC.po (+112/-72) project/i18n/fi.po (+94/-71) project/i18n/it.po (+10/-1) project/i18n/nl.po (+12/-3) project/i18n/pt.po (+219/-140) project/i18n/ro.po (+85/-74) project/project.py (+1/-0) project_gtd/i18n/ar.po (+19/-3) project_gtd/i18n/fi.po (+19/-9) project_gtd/i18n/pt.po (+57/-37) project_issue/i18n/ar.po (+29/-1) project_issue/i18n/fi.po (+37/-27) project_issue/i18n/nl.po (+11/-1) project_issue/i18n/pt.po (+150/-109) project_issue/i18n/ro.po (+47/-37) project_issue/project_issue.py (+2/-1) project_issue/report/project_issue_report.py (+2/-2) project_issue_sheet/i18n/pt.po (+25/-14) project_long_term/i18n/ar.po (+18/-4) project_long_term/i18n/fi.po (+30/-20) project_long_term/i18n/it.po (+19/-9) project_long_term/i18n/pt.po (+65/-35) project_long_term/i18n/ro.po (+30/-20) project_mailgate/i18n/cs.po (+78/-0) project_mailgate/i18n/pt.po (+18/-4) project_messages/i18n/pt.po (+17/-4) project_mrp/i18n/ar.po (+11/-1) project_mrp/i18n/fr.po (+16/-2) project_mrp/i18n/it.po (+12/-2) project_mrp/i18n/pt.po (+25/-9) project_planning/i18n/ar.po (+13/-1) project_planning/i18n/fi.po (+25/-3) project_planning/i18n/it.po (+10/-1) project_planning/i18n/pt.po (+88/-54) project_retro_planning/i18n/it.po (+14/-0) project_retro_planning/i18n/pt.po (+14/-0) project_scrum/i18n/ar.po (+22/-1) project_scrum/i18n/es.po (+30/-20) project_scrum/i18n/nl.po (+11/-2) project_scrum/i18n/pt.po (+84/-50) project_timesheet/i18n/ar.po (+12/-2) project_timesheet/i18n/fi.po (+24/-13) project_timesheet/i18n/pt.po (+75/-47) purchase/i18n/ar.po (+46/-14) purchase/i18n/es.po (+12/-2) purchase/i18n/es_EC.po (+343/-194) purchase/i18n/fi.po (+77/-56) purchase/i18n/fr.po (+20/-10) purchase/i18n/pt.po (+255/-107) purchase_analytic_plans/i18n/ar.po (+11/-1) purchase_analytic_plans/i18n/it.po (+11/-1) purchase_analytic_plans/i18n/pt.po (+11/-1) purchase_double_validation/i18n/ar.po (+11/-1) purchase_double_validation/i18n/it.po (+11/-1) purchase_double_validation/i18n/pt.po (+70/-0) purchase_requisition/i18n/ar.po (+22/-5) purchase_requisition/i18n/fi.po (+24/-12) purchase_requisition/i18n/pt.po (+78/-51) purchase_requisition/purchase_requisition_view.xml (+4/-0) report_designer/i18n/ar.po (+11/-1) report_intrastat/i18n/ar.po (+17/-7) report_webkit/company.py (+0/-6) report_webkit/company_view.xml (+0/-1) report_webkit/i18n/ar.po (+16/-6) report_webkit/i18n/fi.po (+20/-10) report_webkit_sample/i18n/ar.po (+14/-4) report_webkit_sample/i18n/it.po (+11/-1) resource/i18n/ar.po (+15/-5) resource/i18n/fi.po (+18/-3) resource/i18n/sl.po.OTHER (+351/-0) sale/i18n/ar.po (+61/-14) sale/i18n/es.po (+16/-4) sale/i18n/nb.po (+29/-20) sale/i18n/nl.po (+13/-4) sale/i18n/pt.po (+318/-121) sale/i18n/ro.po (+5/-0) sale_analytic_plans/i18n/pt.po (+14/-0) sale_crm/i18n/ar.po (+13/-3) sale_crm/i18n/es.po (+17/-7) sale_crm/i18n/fi.po (+18/-8) sale_crm/i18n/it.po (+13/-4) sale_crm/i18n/nb.po (+135/-0) sale_crm/i18n/pt.po (+28/-12) sale_journal/i18n/ar.po (+14/-1) sale_journal/i18n/fi.po (+16/-4) sale_journal/i18n/it.po (+12/-2) sale_journal/i18n/pt.po (+27/-9) sale_layout/i18n/ar.po (+12/-2) sale_layout/i18n/it.po (+11/-1) sale_layout/i18n/pt.po (+51/-37) sale_margin/i18n/ar.po (+11/-1) sale_margin/i18n/it.po (+11/-1) sale_margin/i18n/pt.po (+24/-8) sale_mrp/i18n/ar.po (+12/-2) sale_mrp/i18n/fr.po (+10/-1) sale_mrp/i18n/it.po (+11/-1) sale_mrp/i18n/pt.po (+18/-8) sale_order_dates/i18n/ar.po (+11/-1) sale_order_dates/i18n/pt.po (+24/-14) share/i18n/ar.po (+24/-10) share/i18n/fi.po (+61/-35) share/i18n/it.po (+33/-24) stock/i18n/ar.po (+534/-352) stock/i18n/es_CL.po (+27/-16) stock/i18n/es_EC.po (+59/-36) stock/i18n/fi.po (+94/-77) stock/i18n/fr.po (+22/-5) stock/i18n/it.po (+11/-1) stock/i18n/nb.po (+11/-1) stock/i18n/pt.po (+564/-256) stock/i18n/ro.po (+34/-25) stock/i18n/zh_CN.po (+15/-6) stock/stock.py (+4/-1) stock/stock_view.xml (+1/-1) stock_invoice_directly/i18n/fi.po (+14/-0) stock_invoice_directly/i18n/fr.po (+14/-0) stock_invoice_directly/i18n/pt.po (+15/-1) stock_location/i18n/fi.po (+12/-2) stock_location/i18n/fr.po (+11/-1) stock_location/i18n/pt.po (+58/-35) stock_no_autopicking/i18n/ar.po (+14/-4) stock_no_autopicking/i18n/fr.po (+11/-1) stock_no_autopicking/i18n/it.po (+14/-0) stock_no_autopicking/i18n/pt.po (+17/-3) stock_planning/i18n/ar.po (+190/-148) stock_planning/i18n/nl.po (+45/-32) stock_planning/i18n/pt.po (+266/-127) subscription/i18n/fi.po (+11/-1) subscription/i18n/it.po (+11/-1) survey/i18n/ar.po (+102/-92) survey/i18n/fr.po (+15/-6) survey/i18n/it.po (+15/-5) survey/i18n/pt.po (+128/-91) users_ldap/i18n/ar.po (+16/-6) users_ldap/i18n/fi.po (+20/-7) users_ldap/i18n/it.po (+19/-7) users_ldap/i18n/pt.po (+18/-8) warning/i18n/ar.po (+13/-3) warning/i18n/fi.po (+15/-5) warning/i18n/it.po (+13/-3) web_livechat/i18n/cs.po (+28/-0) web_livechat/i18n/it.po (+11/-1) web_uservoice/i18n/cs.po (+23/-0) wiki/i18n/ar.po (+44/-34) wiki/i18n/it.po (+13/-3) wiki/i18n/ro.po (+15/-6) wiki_faq/i18n/cs.po (+32/-0) wiki_quality_manual/i18n/cs.po (+32/-0) wiki_sale_faq/i18n/ar.po (+14/-0) Text conflict in account/account_invoice.py Text conflict in account/i18n/ar.po Text conflict in account/i18n/es.po Text conflict in account/i18n/es_EC.po Text conflict in account/i18n/et.po Text conflict in account/i18n/fi.po Text conflict in account/i18n/fr.po Text conflict in account/i18n/it.po Text conflict in account/i18n/nl.po Text conflict in account/i18n/pt.po Text conflict in account/i18n/pt_BR.po Text conflict in account/i18n/ro.po Text conflict in account/i18n/sl.po Conflict adding file account_accountant/i18n/ja.po. Moved existing file to account_accountant/i18n/ja.po.moved. Text conflict in account_analytic_analysis/i18n/ar.po Text conflict in account_analytic_analysis/i18n/bs.po Text conflict in account_analytic_analysis/i18n/es_EC.po Conflict adding file account_analytic_analysis/i18n/ja.po. Moved existing file to account_analytic_analysis/i18n/ja.po.moved. Text conflict in account_analytic_analysis/i18n/pt.po Text conflict in account_analytic_default/i18n/ar.po Text conflict in account_analytic_default/i18n/es_EC.po Conflict adding file account_analytic_default/i18n/ja.po. Moved existing file to account_analytic_default/i18n/ja.po.moved. Text conflict in account_analytic_default/i18n/pt.po Text conflict in account_analytic_plans/i18n/ar.po Text conflict in account_analytic_plans/i18n/es_EC.po Conflict adding file account_analytic_plans/i18n/ja.po. Moved existing file to account_analytic_plans/i18n/ja.po.moved. Text conflict in account_analytic_plans/i18n/pl.po Text conflict in account_analytic_plans/i18n/pt.po Text conflict in account_anglo_saxon/i18n/es_EC.po Conflict adding file account_anglo_saxon/i18n/ja.po. Moved existing file to account_anglo_saxon/i18n/ja.po.moved. Text conflict in account_asset/i18n/ar.po Conflict adding file account_asset/i18n/es_EC.po. Moved existing file to account_asset/i18n/es_EC.po.moved. Conflict adding file account_asset/i18n/ja.po. Moved existing file to account_asset/i18n/ja.po.moved. Contents conflict in account_bank_statement_extensions/i18n/ar.po Conflict adding file account_bank_statement_extensions/i18n/es_EC.po. Moved existing file to account_bank_statement_extensions/i18n/es_EC.po.moved. Conflict adding file account_bank_statement_extensions/i18n/it.po. Moved existing file to account_bank_statement_extensions/i18n/it.po.moved. Conflict adding file account_bank_statement_extensions/i18n/ja.po. Moved existing file to account_bank_statement_extensions/i18n/ja.po.moved. Text conflict in account_budget/i18n/es_EC.po Conflict adding file account_budget/i18n/ja.po. Moved existing file to account_budget/i18n/ja.po.moved. Text conflict in account_budget/i18n/pt.po Conflict adding file account_cancel/i18n/cs.po. Moved existing file to account_cancel/i18n/cs.po.moved. Conflict adding file account_cancel/i18n/es_CL.po. Moved existing file to account_cancel/i18n/es_CL.po.moved. Text conflict in account_cancel/i18n/es_EC.po Text conflict in account_cancel/i18n/it.po Conflict adding file account_cancel/i18n/ja.po. Moved existing file to account_cancel/i18n/ja.po.moved. Text conflict in account_cancel/i18n/pl.po Text conflict in account_cancel/i18n/pt.po Conflict adding file account_chart/i18n/ja.po. Moved existing file to account_chart/i18n/ja.po.moved. Conflict adding file account_check_writing/i18n/ar.po. Moved existing file to account_check_writing/i18n/ar.po.moved. Contents conflict in account_check_writing/i18n/nl.po Text conflict in account_coda/i18n/ar.po Text conflict in account_coda/i18n/it.po Text conflict in account_coda/i18n/zh_CN.po Text conflict in account_followup/i18n/ar.po Text conflict in account_followup/i18n/bs.po Text conflict in account_followup/i18n/pt.po Text conflict in account_invoice_layout/i18n/ar.po Text conflict in account_invoice_layout/i18n/es_EC.po Text conflict in account_invoice_layout/i18n/pt.po Text conflict in account_payment/i18n/es_EC.po Text conflict in account_payment/i18n/nl.po Text conflict in account_payment/i18n/pt.po Text conflict in account_sequence/i18n/fr.po Text conflict in account_sequence/i18n/pt.po Text conflict in account_voucher/i18n/ar.po Text conflict in account_voucher/i18n/es_EC.po Text conflict in analytic/i18n/ar.po Text conflict in analytic/i18n/bs.po Text conflict in analytic/i18n/es_EC.po Text conflict in analytic/i18n/pt.po Conflict adding file analytic_user_function/i18n/ja.po. Moved existing file to analytic_user_function/i18n/ja.po.moved. Text conflict in analytic_user_function/i18n/pt.po Conflict adding file association/i18n/ja.po. Moved existing file to association/i18n/ja.po.moved. Text conflict in auction/i18n/ar.po Text conflict in auction/i18n/fr.po Text conflict in auction/i18n/nl.po Conflict adding file auth_openid/i18n/ar.po. Moved existing file to auth_openid/i18n/ar.po.moved. Conflict adding file auth_openid/i18n/fi.po. Moved existing file to auth_openid/i18n/fi.po.moved. Conflict adding file auth_openid/i18n/sr@latin.po. Moved existing file to auth_openid/i18n/sr@latin.po.moved. Text conflict in base_calendar/i18n/ar.po Text conflict in base_calendar/i18n/pt.po Text conflict in base_calendar/i18n/ro.po Conflict adding files to base_contact. Created directory. Conflict because base_contact is not versioned, but has versioned children. Versioned directory. Conflict adding file base_contact. Moved existing file to base_contact.moved. Conflict adding files to base_contact/i18n. Created directory. Conflict because base_contact/i18n is not versioned, but has versioned children. Versioned directory. Contents conflict in base_contact/i18n/ar.po Contents conflict in base_contact/i18n/es.po Contents conflict in base_contact/i18n/fi.po Contents conflict in base_contact/i18n/nb.po Contents conflict in base_contact/i18n/pt.po Text conflict in base_crypt/i18n/ar.po Conflict adding file base_crypt/i18n/cs.po. Moved existing file to base_crypt/i18n/cs.po.moved. Conflict adding file base_crypt/i18n/ja.po. Moved existing file to base_crypt/i18n/ja.po.moved. Conflict adding file base_crypt/i18n/pl.po. Moved existing file to base_crypt/i18n/pl.po.moved. Text conflict in base_crypt/i18n/sr@latin.po Conflict adding file base_iban/i18n/ja.po. Moved existing file to base_iban/i18n/ja.po.moved. Text conflict in base_iban/i18n/pt.po Text conflict in base_module_doc_rst/i18n/pt.po Text conflict in base_module_quality/i18n/ar.po Text conflict in base_module_quality/i18n/pt.po Text conflict in base_module_record/i18n/pt.po Text conflict in base_report_designer/i18n/pt.po Text conflict in base_setup/i18n/ar.po Text conflict in base_setup/i18n/es_EC.po Text conflict in base_setup/i18n/nb.po Text conflict in base_setup/i18n/pt.po Text conflict in base_setup/i18n/sl.po Text conflict in base_synchro/i18n/pt.po Conflict adding file base_tools/i18n/cs.po. Moved existing file to base_tools/i18n/cs.po.moved. Conflict adding file base_tools/i18n/es_EC.po. Moved existing file to base_tools/i18n/es_EC.po.moved. Conflict adding file base_tools/i18n/ja.po. Moved existing file to base_tools/i18n/ja.po.moved. Text conflict in base_vat/i18n/ar.po Text conflict in base_vat/i18n/es_EC.po Conflict adding file base_vat/i18n/ja.po. Moved existing file to base_vat/i18n/ja.po.moved. Text conflict in base_vat/i18n/pt.po Text conflict in board/i18n/ar.po Conflict adding file board/i18n/ja.po. Moved existing file to board/i18n/ja.po.moved. Text conflict in board/i18n/pt.po Text conflict in caldav/i18n/ar.po Text conflict in caldav/i18n/pt.po Conflict adding file claim_from_delivery/i18n/cs.po. Moved existing file to claim_from_delivery/i18n/cs.po.moved. Conflict adding file claim_from_delivery/i18n/ja.po. Moved existing file to claim_from_delivery/i18n/ja.po.moved. Text conflict in crm/crm_lead.py Text conflict in crm/i18n/ar.po Text conflict in crm/i18n/es.po Text conflict in crm/i18n/ja.po Text conflict in crm/i18n/nb.po Text conflict in crm/i18n/nl.po Text conflict in crm/i18n/pt.po Conflict adding file crm_caldav/i18n/cs.po. Moved existing file to crm_caldav/i18n/cs.po.moved. Text conflict in crm_caldav/i18n/it.po Conflict adding file crm_caldav/i18n/ja.po. Moved existing file to crm_caldav/i18n/ja.po.moved. Conflict adding file crm_caldav/i18n/pl.po. Moved existing file to crm_caldav/i18n/pl.po.moved. Text conflict in crm_caldav/i18n/pt.po Text conflict in crm_claim/i18n/ar.po Text conflict in crm_claim/i18n/fi.po Text conflict in crm_claim/i18n/it.po Text conflict in crm_claim/i18n/nl.po Text conflict in crm_claim/i18n/pt.po Text conflict in crm_fundraising/i18n/ar.po Text conflict in crm_fundraising/i18n/pt.po Text conflict in crm_helpdesk/i18n/ar.po Text conflict in crm_helpdesk/i18n/fi.po Text conflict in crm_helpdesk/i18n/nl.po Text conflict in crm_helpdesk/i18n/pt.po Text conflict in crm_partner_assign/i18n/ar.po Text conflict in crm_partner_assign/i18n/pt.po Text conflict in crm_profiling/i18n/ar.po Text conflict in crm_profiling/i18n/fi.po Text conflict in crm_profiling/i18n/pt.po Conflict adding file crm_todo/i18n/ar.po. Moved existing file to crm_todo/i18n/ar.po.moved. Conflict adding file crm_todo/i18n/fi.po. Moved existing file to crm_todo/i18n/fi.po.moved. Conflict adding file crm_todo/i18n/it.po. Moved existing file to crm_todo/i18n/it.po.moved. Conflict adding file crm_todo/i18n/pt.po. Moved existing file to crm_todo/i18n/pt.po.moved. Conflict adding file decimal_precision/i18n/cs.po. Moved existing file to decimal_precision/i18n/cs.po.moved. Conflict adding file decimal_precision/i18n/ja.po. Moved existing file to decimal_precision/i18n/ja.po.moved. Text conflict in decimal_precision/i18n/nb.po Text conflict in delivery/i18n/pt.po Text conflict in document/i18n/ar.po Text conflict in document/i18n/nl.po Text conflict in document/i18n/pt.po Text conflict in document_webdav/i18n/ar.po Text conflict in document_webdav/i18n/fi.po Text conflict in document_webdav/i18n/pt.po Conflict adding file edi/i18n/ar.po. Moved existing file to edi/i18n/ar.po.moved. Text conflict in edi/i18n/es.po Text conflict in edi/i18n/fi.po Text conflict in email_template/i18n/ar.po Text conflict in email_template/i18n/fi.po Text conflict in email_template/i18n/fr.po Text conflict in email_template/i18n/pt.po Text conflict in event/i18n/ar.po Text conflict in event/i18n/fi.po Text conflict in event/i18n/nl.po Text conflict in fetchmail/i18n/ar.po Text conflict in fetchmail/i18n/es.po Text conflict in fetchmail/i18n/fi.po Conflict adding files to fetchmail_crm. Created directory. Conflict because fetchmail_crm is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_crm/i18n. Created directory. Conflict because fetchmail_crm/i18n is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_crm_claim. Created directory. Conflict because fetchmail_crm_claim is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_crm_claim/i18n. Created directory. Conflict because fetchmail_crm_claim/i18n is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_hr_recruitment. Created directory. Conflict because fetchmail_hr_recruitment is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_hr_recruitment/i18n. Created directory. Conflict because fetchmail_hr_recruitment/i18n is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_project_issue. Created directory. Conflict because fetchmail_project_issue is not versioned, but has versioned children. Versioned directory. Conflict adding files to fetchmail_project_issue/i18n. Created directory. Conflict because fetchmail_project_issue/i18n is not versioned, but has versioned children. Versioned directory. Conflict adding file google_base_account/i18n/ar.po. Moved existing file to google_base_account/i18n/ar.po.moved. Conflict adding file google_base_account/i18n/it.po. Moved existing file to google_base_account/i18n/it.po.moved. Conflict adding file google_base_account/i18n/sr@latin.po. Moved existing file to google_base_account/i18n/sr@latin.po.moved. Conflict adding file google_map/i18n/ja.po. Moved existing file to google_map/i18n/ja.po.moved. Text conflict in hr/i18n/ar.po Text conflict in hr/i18n/es_EC.po Text conflict in hr/i18n/fi.po Text conflict in hr/i18n/fr.po Text conflict in hr/i18n/nl.po Text conflict in hr/i18n/pt.po Text conflict in hr_attendance/i18n/ar.po Text conflict in hr_attendance/i18n/pt.po Text conflict in hr_contract/i18n/ar.po Text conflict in hr_contract/i18n/es_EC.po Text conflict in hr_contract/i18n/it.po Text conflict in hr_contract/i18n/pt.po Text conflict in hr_evaluation/i18n/ar.po Text conflict in hr_evaluation/i18n/nl.po Text conflict in hr_evaluation/i18n/pt.po Text conflict in hr_evaluation/i18n/zh_CN.po Text conflict in hr_expense/i18n/ar.po Text conflict in hr_expense/i18n/fr.po Text conflict in hr_expense/i18n/nl.po Text conflict in hr_expense/i18n/pt.po Text conflict in hr_holidays/i18n/ar.po Text conflict in hr_holidays/i18n/pt.po Text conflict in hr_payroll/i18n/ar.po Text conflict in hr_payroll/i18n/es_EC.po Contents conflict in hr_payroll/i18n/gu.po Conflict adding file hr_payroll/i18n/ja.po. Moved existing file to hr_payroll/i18n/ja.po.moved. Conflict adding file hr_payroll/i18n/lv.po. Moved existing file to hr_payroll/i18n/lv.po.moved. Text conflict in hr_payroll/i18n/nl.po Text conflict in hr_payroll/i18n/pt.po Text conflict in hr_payroll/i18n/zh_CN.po Text conflict in hr_payroll_account/i18n/ar.po Text conflict in hr_payroll_account/i18n/es_EC.po Conflict adding file hr_payroll_account/i18n/ja.po. Moved existing file to hr_payroll_account/i18n/ja.po.moved. Text conflict in hr_payroll_account/i18n/pt.po Text conflict in hr_recruitment/i18n/ar.po Text conflict in hr_recruitment/i18n/fr.po Conflict adding file hr_recruitment/i18n/ja.po. Moved existing file to hr_recruitment/i18n/ja.po.moved. Text conflict in hr_recruitment/i18n/nl.po Text conflict in hr_recruitment/i18n/pt.po Text conflict in hr_timesheet/i18n/ar.po Conflict adding file hr_timesheet/i18n/es_EC.po. Moved existing file to hr_timesheet/i18n/es_EC.po.moved. Text conflict in hr_timesheet/i18n/fi.po Conflict adding file hr_timesheet/i18n/ja.po. Moved existing file to hr_timesheet/i18n/ja.po.moved. Text conflict in hr_timesheet/i18n/pt.po Text conflict in hr_timesheet_invoice/i18n/ar.po Text conflict in hr_timesheet_invoice/i18n/pt.po Text conflict in hr_timesheet_sheet/i18n/ar.po Text conflict in hr_timesheet_sheet/i18n/es.po Text conflict in hr_timesheet_sheet/i18n/fi.po Text conflict in hr_timesheet_sheet/i18n/pt.po Text conflict in idea/i18n/ar.po Text conflict in idea/i18n/fi.po Conflict adding file import_base/i18n/ar.po. Moved existing file to import_base/i18n/ar.po.moved. Conflict adding file import_base/i18n/fi.po. Moved existing file to import_base/i18n/fi.po.moved. Conflict adding file import_base/i18n/pt.po. Moved existing file to import_base/i18n/pt.po.moved. Conflict adding file import_google/i18n/sr@latin.po. Moved existing file to import_google/i18n/sr@latin.po.moved. Contents conflict in import_sugarcrm/i18n/ar.po Conflict adding file import_sugarcrm/i18n/nl.po. Moved existing file to import_sugarcrm/i18n/nl.po.moved. Text conflict in knowledge/i18n/zh_CN.po Text conflict in l10n_be/wizard/l10n_be_account_vat_declaration.py Text conflict in l10n_be/wizard/l10n_be_account_vat_declaration_view.xml Text conflict in l10n_be/wizard/l10n_be_vat_intra.py Conflict adding file l10n_be_hr_payroll/i18n/sr@latin.po. Moved existing file to l10n_be_hr_payroll/i18n/sr@latin.po.moved. Conflict adding file l10n_be_invoice_bba/i18n/ar.po. Moved existing file to l10n_be_invoice_bba/i18n/ar.po.moved. Text conflict in l10n_br/i18n/ar.po Text conflict in l10n_ca/i18n/ar.po Text conflict in l10n_ec/i18n/ar.po Text conflict in l10n_es/i18n/ar.po Text conflict in l10n_fr/i18n/ar.po Conflict adding file l10n_fr_rib/i18n/ar.po. Moved existing file to l10n_fr_rib/i18n/ar.po.moved. Text conflict in l10n_gt/i18n/it.po Text conflict in l10n_hn/i18n/it.po Text conflict in l10n_in/i18n/ar.po Text conflict in l10n_in/i18n/it.po Text conflict in l10n_it/i18n/it.po Text conflict in l10n_lu/i18n/ar.po Text conflict in l10n_ma/i18n/ar.po Text conflict in l10n_mx/i18n/ar.po Text conflict in l10n_nl/i18n/ar.po Text conflict in l10n_ro/i18n/ar.po Conflict adding file l10n_syscohada/i18n/ar.po. Moved existing file to l10n_syscohada/i18n/ar.po.moved. Text conflict in l10n_th/i18n/ar.po Text conflict in l10n_uk/i18n/ar.po Text conflict in l10n_ve/i18n/ar.po Text conflict in mail/i18n/fi.po Text conflict in mail/i18n/fr.po Text conflict in mail/i18n/pt.po Text conflict in marketing/i18n/ar.po Conflict adding file marketing/i18n/cs.po. Moved existing file to marketing/i18n/cs.po.moved. Text conflict in marketing/i18n/pt.po Text conflict in marketing_campaign/i18n/pt.po Text conflict in marketing_campaign_crm_demo/i18n/ar.po Text conflict in marketing_campaign_crm_demo/i18n/pt.po Text conflict in mrp/i18n/ar.po Text conflict in mrp/i18n/fi.po Text conflict in mrp/i18n/nl.po Text conflict in mrp/i18n/ro.po Text conflict in mrp_operations/i18n/ar.po Text conflict in mrp_operations/i18n/fi.po Text conflict in mrp_repair/i18n/ar.po Text conflict in mrp_subproduct/i18n/ar.po Text conflict in mrp_subproduct/i18n/fi.po Text conflict in multi_company/i18n/fi.po Text conflict in pad/i18n/ar.po Conflict adding file pad/i18n/cs.po. Moved existing file to pad/i18n/cs.po.moved. Conflict adding file pad_project/i18n/ar.po. Moved existing file to pad_project/i18n/ar.po.moved. Conflict adding file pad_project/i18n/cs.po. Moved existing file to pad_project/i18n/cs.po.moved. Conflict adding file pad_project/i18n/fi.po. Moved existing file to pad_project/i18n/fi.po.moved. Conflict adding file plugin/i18n/ar.po. Moved existing file to plugin/i18n/ar.po.moved. Conflict adding file plugin/i18n/cs.po. Moved existing file to plugin/i18n/cs.po.moved. Text conflict in plugin_outlook/i18n/et.po Text conflict in point_of_sale/i18n/es.po Text conflict in point_of_sale/i18n/fr.po Text conflict in point_of_sale/i18n/nl.po Text conflict in point_of_sale/i18n/pt.po Text conflict in point_of_sale/static/src/js/pos.js Text conflict in portal/i18n/fi.po Text conflict in procurement/i18n/es.po Text conflict in procurement/i18n/fi.po Text conflict in procurement/i18n/fr.po Text conflict in product/i18n/es.po Text conflict in product/i18n/es_EC.po Text conflict in product/i18n/fi.po Text conflict in product/i18n/nb.po Text conflict in product/i18n/pt.po Text conflict in product_expiry/i18n/ar.po Text conflict in product_expiry/i18n/fr.po Text conflict in product_manufacturer/i18n/ar.po Text conflict in product_manufacturer/i18n/fr.po Text conflict in product_margin/i18n/pt.po Text conflict in product_visible_discount/i18n/fi.po Text conflict in product_visible_discount/i18n/pt.po Text conflict in project/i18n/ar.po Text conflict in project/i18n/es_EC.po Text conflict in project/i18n/fi.po Text conflict in project/i18n/it.po Text conflict in project/i18n/nl.po Text conflict in project/i18n/pt.po Text conflict in project/i18n/ro.po Text conflict in project_gtd/i18n/ar.po Text conflict in project_gtd/i18n/fi.po Text conflict in project_gtd/i18n/pt.po Text conflict in project_issue/i18n/ar.po Text conflict in project_issue/i18n/fi.po Text conflict in project_issue/i18n/nl.po Text conflict in project_issue/i18n/pt.po Text conflict in project_issue/i18n/ro.po Text conflict in project_issue_sheet/i18n/pt.po Text conflict in project_long_term/i18n/ar.po Text conflict in project_long_term/i18n/fi.po Text conflict in project_long_term/i18n/it.po Text conflict in project_long_term/i18n/pt.po Text conflict in project_long_term/i18n/ro.po Conflict adding file project_mailgate/i18n/cs.po. Moved existing file to project_mailgate/i18n/cs.po.moved. Text conflict in project_mailgate/i18n/pt.po Text conflict in project_messages/i18n/pt.po Text conflict in project_mrp/i18n/ar.po Text conflict in project_mrp/i18n/fr.po Text conflict in project_mrp/i18n/it.po Text conflict in project_mrp/i18n/pt.po Text conflict in project_planning/i18n/ar.po Text conflict in project_planning/i18n/fi.po Text conflict in project_planning/i18n/it.po Text conflict in project_planning/i18n/pt.po Text conflict in project_retro_planning/i18n/it.po Text conflict in project_retro_planning/i18n/pt.po Text conflict in project_scrum/i18n/ar.po Text conflict in project_scrum/i18n/es.po Text conflict in project_scrum/i18n/nl.po Text conflict in project_scrum/i18n/pt.po Text conflict in project_timesheet/i18n/ar.po Text conflict in project_timesheet/i18n/fi.po Text conflict in project_timesheet/i18n/pt.po Text conflict in purchase/i18n/ar.po Text conflict in purchase/i18n/es.po Text conflict in purchase/i18n/es_EC.po Text conflict in purchase/i18n/fi.po Text conflict in purchase/i18n/fr.po Text conflict in purchase/i18n/pt.po Text conflict in purchase_analytic_plans/i18n/ar.po Text conflict in purchase_analytic_plans/i18n/it.po Text conflict in purchase_analytic_plans/i18n/pt.po Text conflict in purchase_double_validation/i18n/ar.po Text conflict in purchase_double_validation/i18n/it.po Conflict adding file purchase_double_validation/i18n/pt.po. Moved existing file to purchase_double_validation/i18n/pt.po.moved. Text conflict in purchase_requisition/i18n/ar.po Text conflict in purchase_requisition/i18n/fi.po Text conflict in purchase_requisition/i18n/pt.po Text conflict in purchase_requisition/purchase_requisition_view.xml Text conflict in report_designer/i18n/ar.po Text conflict in report_intrastat/i18n/ar.po Text conflict in report_webkit/i18n/ar.po Text conflict in report_webkit/i18n/fi.po Text conflict in report_webkit_sample/i18n/ar.po Text conflict in report_webkit_sample/i18n/it.po Text conflict in resource/i18n/ar.po Text conflict in resource/i18n/fi.po Contents conflict in resource/i18n/sl.po Text conflict in sale/i18n/ar.po Text conflict in sale/i18n/es.po Text conflict in sale/i18n/nb.po Text conflict in sale/i18n/nl.po Text conflict in sale/i18n/pt.po Text conflict in sale/i18n/ro.po Text conflict in sale_analytic_plans/i18n/pt.po Text conflict in sale_crm/i18n/ar.po Text conflict in sale_crm/i18n/es.po Text conflict in sale_crm/i18n/fi.po Text conflict in sale_crm/i18n/it.po Conflict adding file sale_crm/i18n/nb.po. Moved existing file to sale_crm/i18n/nb.po.moved. Text conflict in sale_crm/i18n/pt.po Text conflict in sale_journal/i18n/ar.po Text conflict in sale_journal/i18n/fi.po Text conflict in sale_journal/i18n/it.po Text conflict in sale_journal/i18n/pt.po Text conflict in sale_layout/i18n/ar.po Text conflict in sale_layout/i18n/it.po Text conflict in sale_layout/i18n/pt.po Text conflict in sale_margin/i18n/ar.po Text conflict in sale_margin/i18n/it.po Text conflict in sale_margin/i18n/pt.po Text conflict in sale_mrp/i18n/ar.po Text conflict in sale_mrp/i18n/fr.po Text conflict in sale_mrp/i18n/it.po Text conflict in sale_mrp/i18n/pt.po Text conflict in sale_order_dates/i18n/ar.po Text conflict in sale_order_dates/i18n/pt.po Text conflict in share/i18n/ar.po Text conflict in share/i18n/fi.po Text conflict in share/i18n/it.po Text conflict in stock/i18n/ar.po Text conflict in stock/i18n/es_CL.po Text conflict in stock/i18n/es_EC.po Text conflict in stock/i18n/fi.po Text conflict in stock/i18n/fr.po Text conflict in stock/i18n/it.po Text conflict in stock/i18n/nb.po Text conflict in stock/i18n/pt.po Text conflict in stock/i18n/ro.po Text conflict in stock/i18n/zh_CN.po Text conflict in stock_invoice_directly/i18n/fi.po Text conflict in stock_invoice_directly/i18n/fr.po Text conflict in stock_invoice_directly/i18n/pt.po Text conflict in stock_location/i18n/fi.po Text conflict in stock_location/i18n/fr.po Text conflict in stock_location/i18n/pt.po Text conflict in stock_no_autopicking/i18n/ar.po Text conflict in stock_no_autopicking/i18n/fr.po Text conflict in stock_no_autopicking/i18n/it.po Text conflict in stock_no_autopicking/i18n/pt.po Text conflict in stock_planning/i18n/ar.po Text conflict in stock_planning/i18n/nl.po Text conflict in stock_planning/i18n/pt.po Text conflict in subscription/i18n/fi.po Text conflict in subscription/i18n/it.po Text conflict in survey/i18n/ar.po Text conflict in survey/i18n/fr.po Text conflict in survey/i18n/it.po Text conflict in survey/i18n/pt.po Text conflict in users_ldap/i18n/ar.po Text conflict in users_ldap/i18n/fi.po Text conflict in users_ldap/i18n/it.po Text conflict in users_ldap/i18n/pt.po Text conflict in warning/i18n/ar.po Text conflict in warning/i18n/fi.po Text conflict in warning/i18n/it.po Conflict adding file web_livechat/i18n/cs.po. Moved existing file to web_livechat/i18n/cs.po.moved. Text conflict in web_livechat/i18n/it.po Conflict adding file web_uservoice/i18n/cs.po. Moved existing file to web_uservoice/i18n/cs.po.moved. Text conflict in wiki/i18n/ar.po Text conflict in wiki/i18n/it.po Text conflict in wiki/i18n/ro.po Conflict adding file wiki_faq/i18n/cs.po. Moved existing file to wiki_faq/i18n/cs.po.moved. Conflict adding file wiki_quality_manual/i18n/cs.po. Moved existing file to wiki_quality_manual/i18n/cs.po.moved. Text conflict in wiki_sale_faq/i18n/ar.po |
To merge this branch: | bzr merge lp:~noviat/openobject-addons/6.1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+104342@code.launchpad.net |
Description of the change
- renamed 'account_
- removed vat intra 'exists()' hack since no longer needed in 6.1
To post a comment you must log in.
Hello Luc,
Unfortunately, your branch appears to be too conflicting to be used. The reason is probably because you're proposing a branch rebased on stable rather than trunk.
If you want your feature(s)/fix(es) to be reviewed, i strongly suggest that you create new branches (one per feature) with enough explanation (or bug report) so that anyone can understand what's inside without having to go through the diff. On the other hand, make sure your branches aren't conflicting and that the diff you're proposing is as short as possible. Otherwise it's just too messy for us to review ;-)
Btw, i think those fixes are already in trunk (a grep on 'exists()' in l10n_be returns None).
Let me close this merge proposal for now, feel free to reopen it or to recreate new ones whenever you fulfill above requirements.
Thanks for your contribution,
Quentin