Odoo 17.0 @ Odoo Translations

Component	Approved	Translated	Unreviewed	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
account BSD-2-Clause	9%	89%	99,959	13,510	110,796	733,521	13,483	3,777	80	1

account_3way_match BSD-2-Clause	8%	92%	644	59	921	5,410	59	8	0	0

account_accountant BSD-2-Clause	7%	83%	14,083	2,958	16,630	109,928	2,958	366	18	1

account_accountant_batch_payment BSD-2-Clause	2%	82%	1,226	268	1,340	8,914	268	15	0	0

account_accountant_check_printing BSD-2-Clause	4%	93%	129	9	204	1,242	9	3	0	0

account_accountant_fleet BSD-2-Clause	4%	84%	190	38	179	1,211	38	0	0	0

account_add_gln BSD-2-Clause	11%	70%	86	42	84	525	42	0	0	0

account_asset BSD-2-Clause	11%	88%	11,000	1,708	12,065	71,040	1,708	300	1	0

account_asset_fleet BSD-2-Clause	6%	92%	206	18	112	627	18	0	0	0

account_audit_trail BSD-2-Clause	2%	86%	1,382	213	1,329	7,394	213	20	1	0

account_auto_transfer BSD-2-Clause	5%	84%	2,882	571	3,683	24,542	571	49	0	0

account_avatax BSD-2-Clause	12%	79%	3,767	1,126	6,481	46,872	1,126	89	0	0

account_avatax_geolocalize BSD-2-Clause	8%	82%	247	60	185	1,373	60	1	1	0

account_avatax_sale BSD-2-Clause	8%	84%	110	22	121	736	22	3	0	0

account_avatax_stock BSD-2-Clause	8%	88%	116	16	123	765	14	1	0	0

account_bacs BSD-2-Clause	4%	68%	5,366	2,635	28,111	178,908	2,635	143	0	0

account_bank_statement_import BSD-2-Clause	6%	85%	950	172	1,564	8,975	172	49	0	0

account_bank_statement_import_camt BSD-2-Clause	10%	74%	9,659	3,926	11,337	84,200	3,926	40	0	0

account_bank_statement_import_csv BSD-2-Clause	10%	86%	253	46	387	1,893	46	7	0	0

account_bank_statement_import_ofx BSD-2-Clause	5%	91%	86	9	76	503	9	4	0	0

account_bank_statement_import_qif BSD-2-Clause	8%	84%	329	67	597	3,848	67	11	0	0

account_base_import BSD-2-Clause	8%	78%	1,792	538	5,217	35,360	538	44	0	0

account_batch_payment BSD-2-Clause	10%	87%	5,722	954	5,497	34,314	954	129	0	0

account_budget BSD-2-Clause	8%	92%	4,326	386	2,179	13,998	386	88	0	0

account_check_printing BSD-2-Clause	9%	87%	2,457	400	4,228	25,375	400	85	1	0

account_consolidation BSD-2-Clause	4%	75%	8,721	3,041	12,588	87,426	3,040	167	0	0

account_debit_note BSD-2-Clause	10%	86%	1,132	194	1,507	8,109	194	34	0	0

account_debit_note_sequence BSD-2-Clause	2%	84%	157	30	353	1,980	30	11	0	0

account_disallowed_expenses BSD-2-Clause	4%	85%	1,490	257	951	6,680	257	24	0	0

account_disallowed_expenses_fleet BSD-2-Clause	4%	82%	862	195	949	6,807	195	15	0	0

account_edi BSD-2-Clause	8%	81%	2,575	644	4,640	28,883	644	70	1	0

account_edi_proxy_client BSD-2-Clause	7%	78%	1,096	323	2,767	15,133	310	27	0	0

account_edi_ubl_cii BSD-2-Clause	7%	60%	4,826	3,624	26,142	156,740	3,619	112	0	0

account_edi_ubl_cii_tax_extension BSD-2-Clause	6%	67%	3,037	1,654	23,883	144,906	1,654	41	0	0

account_external_tax BSD-2-Clause	8%	84%	256	51	385	2,403	51	10	0	0

account_fleet BSD-2-Clause	8%	91%	478	49	165	967	49	7	0	0

account_followup BSD-2-Clause	9%	85%	5,975	1,123	18,543	180,774	1,123	97	0	0

account_inter_company_rules BSD-2-Clause	5%	81%	690	168	1,227	8,453	168	21	0	0

account_intrastat BSD-2-Clause	9%	76%	3,616	1,279	4,438	26,737	1,279	72	0	0

account_intrastat_services BSD-2-Clause	2%	78%	728	211	546	3,879	211	0	0	0

account_invoice_extract BSD-2-Clause	8%	82%	2,881	684	3,472	23,743	684	38	0	0

account_invoice_extract_purchase BSD-2-Clause	4%	97%	45	1	2	13	1	0	0	0

account_lock BSD-2-Clause	2%	69%	258	118	2,280	12,424	118	23	0	0

account_online_synchronization BSD-2-Clause	9%	82%	7,009	1,668	14,718	168,522	1,668	185	0	0

account_payment BSD-2-Clause	11%	91%	3,620	401	2,993	22,164	401	76	0	0

account_payment_term BSD-2-Clause	2%	88%	371	51	330	1,507	51	21	0	0

account_peppol BSD-2-Clause	6%	57%	4,547	3,725	35,695	236,633	3,725	104	1	0

account_peppol_response BSD-2-Clause	2%	62%	2,040	1,250	6,018	41,680	1,250	13	0	0

account_peppol_selfbilling BSD-2-Clause	4%	63%	535	333	11,475	140,275	333	10	0	0

account_qr_code_emv BSD-2-Clause	9%	77%	556	184	846	5,389	184	28	0	0

account_qr_code_sepa BSD-2-Clause	8%	76%	193	69	713	3,735	69	8	0	0

account_reports BSD-2-Clause	7%	80%	21,856	5,981	36,217	220,404	5,981	1,284	2	0

account_reports_cash_basis BSD-2-Clause	8%	87%	266	41	195	1,122	41	7	0	0

account_reports_tax_reminder BSD-2-Clause	2%	75%	105	36	233	1,221	36	4	0	0

account_saft BSD-2-Clause	9%	74%	464	186	912	5,500	186	19	0	0

account_saft_import BSD-2-Clause	8%	85%	849	163	686	4,386	163	5	0	0

account_sepa BSD-2-Clause	4%	74%	1,991	717	8,917	51,027	717	118	0	0

account_sepa_direct_debit BSD-2-Clause	11%	80%	6,922	1,984	19,557	122,662	1,984	249	0	0

account_tax_python BSD-2-Clause	4%	82%	303	67	2,068	12,909	67	49	0	0

account_taxcloud BSD-2-Clause	2%	73%	1,576	579	6,126	38,098	579	78	0	0

account_update_tax_tags BSD-2-Clause	6%	84%	636	129	1,733	12,154	129	10	0	0

account_winbooks_import BSD-2-Clause	9%	81%	1,060	282	3,030	20,292	282	30	0	0

analytic BSD-2-Clause	6%	90%	6,298	672	4,113	25,833	672	160	0	0

analytic_enterprise BSD-2-Clause	4%	96%	178	6	10	70	6	0	0	0

appointment BSD-2-Clause	3%	80%	19,963	5,247	65,988	767,253	5,191	584	2	0

appointment_account_payment BSD-2-Clause	5%	83%	2,928	604	4,297	31,768	604	62	0	0

appointment_crm BSD-2-Clause	7%	84%	516	105	735	5,024	105	6	0	0

appointment_google_calendar BSD-2-Clause	7%	72%	247	106	913	5,879	99	4	0	0

appointment_hr BSD-2-Clause	4%	75%	170	58	290	2,253	58	1	0	0

appointment_hr_recruitment BSD-2-Clause	4%	73%	332	125	2,994	27,376	125	14	0	0

appointment_sms BSD-2-Clause	6%	70%	62	28	312	2,008	28	1	0	0

approvals BSD-2-Clause	8%	86%	7,424	1,330	7,083	44,053	1,330	132	0	0

approvals_purchase BSD-2-Clause	5%	81%	730	174	1,096	6,771	174	31	0	0

approvals_purchase_stock BSD-2-Clause	6%	83%	147	32	63	421	32	0	0	0

attachment_indexation BSD-2-Clause	4%		46	0	0	0	0	0	0	0

auth_ldap BSD-2-Clause	4%	86%	1,501	237	2,623	17,746	237	38	0	0

auth_oauth BSD-2-Clause	5%	86%	1,712	276	1,067	6,526	276	27	0	0

auth_password_policy BSD-2-Clause	8%	85%	369	72	543	3,427	72	12	0	0

auth_signup BSD-2-Clause	3%	85%	3,942	696	25,595	351,339	696	152	0	0

auth_totp BSD-2-Clause	4%	80%	2,420	618	4,656	39,101	618	49	0	0

auth_totp_mail BSD-2-Clause	4%	74%	710	254	3,377	28,958	254	15	0	0

auth_totp_mail_enforce BSD-2-Clause	2%	82%	1,194	259	5,657	52,359	258	37	0	0

auth_totp_portal BSD-2-Clause	6%	78%	486	142	508	6,369	142	37	0	0

barcodes BSD-2-Clause	6%	87%	2,194	325	3,497	25,003	325	98	0	0

barcodes_gs1_nomenclature BSD-2-Clause	4%	78%	1,364	385	4,892	29,673	382	71	0	0

base BSD-2-Clause	6%	75%	169,453	61,058	914,437	6,421,180	61,058	4,623	3	1

base_address_extended BSD-2-Clause	8%	92%	1,164	109	612	3,563	109	25	0	0

base_automation BSD-2-Clause	6%	75%	5,596	1,985	13,704	93,163	1,984	142	0	0

base_automation_hr_contract BSD-2-Clause	2%	82%	115	26	87	586	26	10	0	0

base_geolocalize BSD-2-Clause	4%	84%	1,305	259	1,223	9,536	259	47	0	0

base_iban BSD-2-Clause	7%	87%	306	49	540	2,749	49	20	0	0

base_import BSD-2-Clause	6%	82%	4,911	1,163	8,084	48,617	1,163	178	0	0

base_import_module BSD-2-Clause	5%	84%	1,870	379	2,734	18,040	379	77	0	0

base_install_request BSD-2-Clause	7%	79%	1,070	298	3,776	37,029	298	32	0	0

base_setup BSD-2-Clause	6%	85%	3,721	689	4,077	37,870	689	93	0	0

base_sparse_field BSD-2-Clause	6%	89%	999	127	622	3,705	102	25	0	0

base_vat BSD-2-Clause	7%	69%	1,186	581	4,812	31,189	581	43	0	0

board BSD-2-Clause	6%	83%	667	141	1,054	6,526	141	19	0	0

bus BSD-2-Clause	5%	90%	1,145	125	1,017	5,649	125	21	0	0

calendar BSD-2-Clause	10%	88%	13,961	2,121	65,240	924,291	2,063	304	0	0

1 / 7

/ 7

Summary

Project website	www.odoo.com
Project reviewers52	cima ronm msea pauj juau madi ngto peti chwa nopl anastasiia_odoo pagc mfar kwpa lman_odoo wacm Alina Lisnenko hedshefer cmd-odoo mapr-odoo GRCOodoo maan_odoo awt_odoo MichaelHadar vladimir.uvid …

08/26/2026

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		3,559,910		19,761,773		138,917,088
Source		82,199		460,239		3,286,769
Approved	3%	127,580	3%	722,890	3%	5,114,939
Waiting for review	72%	2,583,336	64%	12,817,894	63%	87,695,326
Translated	78%	2,793,211	70%	14,001,364	69%	96,099,304
Needs editing	1%	2,075	1%	42,690	1%	567,290
Read-only	2%	82,295	2%	460,580	2%	3,289,039
Failing checks	1%	65,822	4%	889,534	4%	6,205,736
Strings with suggestions	1%	274	1%	5,886	1%	92,715
Untranslated strings	21%	764,624	28%	5,717,719	30%	42,250,494

Last 12 months Previous

Activity in last 12 months


Aug	Sep	Oct	Nov	Dec	Jan	Feb	Mar	Apr	May	Jun	Jul

Quick numbers

19,761 k

Hosted words

3,559 k

Hosted strings

78%

Translated

110

Contributors

698

Components

Languages

33,500

Translations

Screenshots

and previous 30 days

Trends of last 30 days

—

Hosted words

—

+1%

Hosted strings

—

+1%

Translated

+1%

−23%

Contributors

+11%

Language	Approved	Translated	Unreviewed	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
English	0	100%	0	0	0	0	0	13,054	0	1

Albanian	0%	0%	0	139	215	1,533	139	0	0	0

Arabic	1%	99%	73,729	353	6,498	76,036	347	11,476	2	0

Azerbaijani	0%	42%	31,012	42,782	303,738	2,177,554	42,749	692	2	0

Bosnian	0%	47%	34,961	38,833	270,468	1,966,197	38,831	352	0	0

Bulgarian	0%	84%	62,464	11,330	101,928	839,677	11,328	499	0	0

Burmese	0%	20%	14,875	58,918	385,932	2,732,184	58,917	11	1	0

Catalan	1%	87%	64,379	9,484	96,097	718,027	9,478	969	0	0

Chinese (Simplified Han script)	0%	99%	73,727	367	5,883	60,943	361	796	2	0

Chinese (Traditional Han script)	1%	99%	73,908	418	5,422	43,318	415	1,180	0	0

Croatian	0%	65%	48,181	25,773	216,507	1,629,759	25,748	632	74	0

Czech	4%	86%	60,399	10,174	79,910	576,736	10,173	736	0	0

Danish	83%	95%	9,447	3,029	42,182	404,449	3,025	331	0	1

Dutch	1%	99%	74,885	66	1,775	22,338	62	889	0	0

Estonian	0%	90%	67,126	6,668	92,545	674,108	6,666	1,935	0	0

Finnish	9%	99%	66,857	163	3,228	36,445	134	365	0	0

French	1%	99%	74,033	76	714	4,482	76	1,201	9	0

German	1%	99%	74,040	15	1,810	27,174	1	1,546	0	0

Greek	0%	37%	27,372	46,581	323,162	2,324,709	46,579	436	0	0

Hebrew	1%	68%	50,669	23,095	204,710	1,550,581	23,078	1,071	1	0

Hindi	1%	60%	45,400	29,540	206,618	1,559,783	29,396	269	0	0

Hungarian	1%	49%	36,705	37,247	287,461	2,087,832	37,244	725	48	0

Indonesian	0%	99%	73,715	354	7,133	81,521	348	823	6	0

Italian	1%	99%	74,078	3	861	13,353	0	935	0	0

Japanese	1%	99%	75,133	252	6,411	76,839	244	3,483	0	0

Kabyle	0%	15%	11,272	62,522	390,448	2,756,482	62,521	207	0	0

Korean	0%	99%	73,783	277	2,837	18,420	275	3,615	0	0

Kurdish (Sorani)	0%	15%	11,704	62,090	382,474	2,703,768	62,089	776	0	0

Lao	38%	90%	34,986	6,659	48,360	389,723	5,064	105	0	0

Latvian	0%	44%	33,076	40,718	292,843	2,079,461	40,710	272	0	0

Lithuanian	1%	47%	35,442	38,509	292,864	2,119,893	38,507	465	5	0

Macedonian	0%	0%	0	139	215	1,533	139	0	0	0

Mongolian	0%	50%	37,337	36,627	270,972	1,996,040	36,623	717	0	0

Norwegian Bokmål	0%	49%	36,760	37,194	286,980	2,094,669	37,192	928	1	0

Persian	0%	82%	61,247	12,703	128,543	1,007,465	12,697	1,552	15	0

Polish	25%	99%	55,362	31	48	334	31	1,318	0	1

Portuguese	1%	88%	65,326	8,641	99,524	819,459	8,637	534	1	0

Portuguese (Brazil)	0%	99%	73,859	210	5,596	70,305	204	1,006	1	0

Romanian	1%	97%	72,396	1,581	22,330	257,483	1,577	894	1	0

Russian	0%	99%	73,871	190	5,035	66,506	184	343	0	0

Serbian	0%	0%	0	156	238	1,700	156	0	0	0

Serbian (Latin script)	0%	33%	24,693	49,257	336,630	2,401,325	49,255	88	0	0

Slovak	0%	64%	48,010	26,073	204,813	1,533,434	26,065	426	16	0

Slovenian	1%	67%	49,861	24,099	193,127	1,458,547	24,081	906	77	0

Spanish	1%	99%	73,320	253	4,335	46,046	199	1,616	0	0

Spanish (Latin America)	1%	100%	72,790	0	0	0	0	1,963	0	0

Swedish	10%	90%	61,009	7,222	59,644	489,946	7,217	322	0	0

Thai	1%	98%	72,847	1,226	12,134	109,819	1,221	200	5	0

Turkish	1%	96%	71,148	2,899	43,618	472,169	2,897	994	2	0

Ukrainian	1%	98%	72,921	1,039	16,643	145,810	1,026	495	4	9

Vietnamese	0%	99%	73,227	727	8,971	91,996	721	1,674	1	0

None

Repository rebase failed

Rebasing (1/536)
Auto-merging addons/account/i18n/es.po
CONFLICT (content): Merge conflict in addons/account/i18n/es.po
Auto-merging addons/account/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/account/i18n/es_419.po
Auto-merging addons/account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/account/i18n/fi.po
Auto-merging addons/account/i18n/id.po
CONFLICT (content): Merge conflict in addons/account/i18n/id.po
Auto-merging addons/account/i18n/ja.po
CONFLICT (content): Merge conflict in addons/account/i18n/ja.po
Auto-merging addons/account/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account/i18n/nl.po
Auto-merging addons/account/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account/i18n/sv.po
Auto-merging addons/account_add_gln/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_add_gln/i18n/bg.po
Auto-merging addons/account_audit_trail/i18n/id.po
CONFLICT (content): Merge conflict in addons/account_audit_trail/i18n/id.po
Auto-merging addons/account_check_printing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_check_printing/i18n/bg.po
Auto-merging addons/account_debit_note/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/nl.po
Auto-merging addons/account_edi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/bg.po
Auto-merging addons/account_edi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/fa.po
Auto-merging addons/account_edi_proxy_client/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/bg.po
Auto-merging addons/account_edi_proxy_client/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/sv.po
Auto-merging addons/account_edi_ubl_cii/i18n/ar.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/ar.po
Auto-merging addons/account_edi_ubl_cii/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/fa.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
Auto-merging addons/account_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment/i18n/bg.po
Auto-merging addons/account_payment_term/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment_term/i18n/bg.po
Auto-merging addons/account_peppol/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/bg.po
Auto-merging addons/account_peppol/i18n/de.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/de.po
Auto-merging addons/account_peppol/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/fa.po
Auto-merging addons/account_peppol/i18n/lo.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/lo.po
Auto-merging addons/account_peppol/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/zh_CN.po
Auto-merging addons/account_peppol_selfbilling/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/bg.po
Auto-merging addons/account_peppol_selfbilling/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/fa.po
Auto-merging addons/account_peppol_selfbilling/i18n/zh_TW.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/zh_TW.po
Auto-merging addons/account_qr_code_emv/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_emv/i18n/bg.po
Auto-merging addons/account_qr_code_sepa/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_sepa/i18n/bg.po
Auto-merging addons/account_update_tax_tags/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_update_tax_tags/i18n/bg.po
Auto-merging addons/analytic/i18n/bg.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/bg.po
Auto-merging addons/analytic/i18n/fa.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/fa.po
Auto-merging addons/analytic/i18n/sv.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/sv.po
Auto-merging addons/auth_ldap/i18n/bg.po
CONFLICT (content): Merge conflict in addons/auth_ldap/i18n/bg.po
Auto-merging addons/auth_signup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_signup/i18n/fi.po
Auto-merging addons/auth_totp_mail_enforce/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_totp_mail_enforce/i18n/fi.po
Auto-merging addons/base_automation/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_automation/i18n/sv.po
Auto-merging addons/base_import_module/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/bg.po
Auto-merging addons/base_import_module/i18n/fa.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/fa.po
Auto-merging addons/base_install_request/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_install_request/i18n/bg.po
Auto-merging addons/base_setup/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/bg.po
Auto-merging addons/base_setup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/fi.po
Auto-merging addons/base_setup/i18n/hi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/hi.po
Auto-merging addons/base_setup/i18n/id.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/id.po
Auto-merging addons/base_setup/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/sv.po
Auto-merging addons/base_sparse_field/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_sparse_field/i18n/bg.po
Auto-merging addons/base_vat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/bg.po
Auto-merging addons/base_vat/i18n/ru.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/ru.po
Auto-merging addons/board/i18n/bg.po
CONFLICT (content): Merge conflict in addons/board/i18n/bg.po
Auto-merging addons/bus/i18n/bg.po
CONFLICT (content): Merge conflict in addons/bus/i18n/bg.po
Auto-merging addons/bus/i18n/fa.po
CONFLICT (content): Merge conflict in addons/bus/i18n/fa.po
Auto-merging addons/calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/bg.po
Auto-merging addons/calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/fi.po
Auto-merging addons/calendar/i18n/id.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/id.po
Auto-merging addons/calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/sv.po
Auto-merging addons/calendar_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/bg.po
Auto-merging addons/calendar_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/fi.po
Auto-merging addons/calendar_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/sv.po
Auto-merging addons/contacts/i18n/sv.po
CONFLICT (content): Merge conflict in addons/contacts/i18n/sv.po
Auto-merging addons/crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm/i18n/bg.po
Auto-merging addons/crm/i18n/es.po
CONFLICT (content): Merge conflict in addons/crm/i18n/es.po
Auto-merging addons/crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fa.po
Auto-merging addons/crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fi.po
Auto-merging addons/crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm/i18n/id.po
Auto-merging addons/crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/crm/i18n/sv.po
Auto-merging addons/crm_iap_enrich/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/bg.po
Auto-merging addons/crm_iap_enrich/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/bg.po
Auto-merging addons/crm_iap_mine/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fa.po
Auto-merging addons/crm_iap_mine/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/id.po
Auto-merging addons/crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/bg.po
Auto-merging addons/crm_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/fi.po
Auto-merging addons/crm_mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/bg.po
Auto-merging addons/crm_mail_plugin/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/fi.po
Auto-merging addons/delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/fi.po
Auto-merging addons/delivery/i18n/sv.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/sv.po
Auto-merging addons/event/i18n/es.po
CONFLICT (content): Merge conflict in addons/event/i18n/es.po
Auto-merging addons/event/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event/i18n/es_419.po
Auto-merging addons/event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event/i18n/sv.po
Auto-merging addons/event_booth/i18n/es.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/es.po
Auto-merging addons/event_booth/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/sv.po
Auto-merging addons/event_booth_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_booth_sale/i18n/fi.po
Auto-merging addons/event_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/fi.po
Auto-merging addons/event_crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/sv.po
Auto-merging addons/event_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/es_419.po
Auto-merging addons/event_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/sv.po
Auto-merging addons/fleet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/fleet/i18n/sv.po
Auto-merging addons/gamification/i18n/sv.po
CONFLICT (content): Merge conflict in addons/gamification/i18n/sv.po
Auto-merging addons/google_calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/bg.po
Auto-merging addons/google_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/fi.po
Auto-merging addons/google_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/sv.po
Auto-merging addons/google_gmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/bg.po
Auto-merging addons/google_gmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/fi.po
Auto-merging addons/google_gmail/i18n/hi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/hi.po
Auto-merging addons/google_gmail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/sv.po
Auto-merging addons/google_recaptcha/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/bg.po
Auto-merging addons/google_recaptcha/i18n/fa.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/fa.po
Auto-merging addons/hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr/i18n/bg.po
Auto-merging addons/hr/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr/i18n/id.po
Auto-merging addons/hr/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr/i18n/my.po
Auto-merging addons/hr/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr/i18n/sv.po
Auto-merging addons/hr/i18n/th.po
CONFLICT (content): Merge conflict in addons/hr/i18n/th.po
Auto-merging addons/hr_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/bg.po
Auto-merging addons/hr_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/fa.po
Auto-merging addons/hr_attendance/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/my.po
Auto-merging addons/hr_attendance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/sv.po
Auto-merging addons/hr_contract/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/bg.po
Auto-merging addons/hr_contract/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/es.po
Auto-merging addons/hr_contract/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/hi.po
Auto-merging addons/hr_contract/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/id.po
Auto-merging addons/hr_contract/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/my.po
Auto-merging addons/hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/bg.po
Auto-merging addons/hr_expense/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/es.po
Auto-merging addons/hr_expense/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/fa.po
Auto-merging addons/hr_expense/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/id.po
Auto-merging addons/hr_expense/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/sv.po
Auto-merging addons/hr_fleet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_fleet/i18n/bg.po
Auto-merging addons/hr_gamification/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_gamification/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/da.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/da.po
Auto-merging addons/hr_holidays/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/es.po
Auto-merging addons/hr_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fa.po
Auto-merging addons/hr_holidays/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fi.po
Auto-merging addons/hr_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/hi.po
Auto-merging addons/hr_holidays/i18n/ru.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/ru.po
Auto-merging addons/hr_holidays/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sk.po
Auto-merging addons/hr_holidays/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sv.po
Auto-merging addons/hr_holidays_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/bg.po
Auto-merging addons/hr_holidays_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fa.po
Auto-merging addons/hr_holidays_attendance/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fi.po
Auto-merging addons/hr_homeworking/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/bg.po
Auto-merging addons/hr_homeworking/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/fa.po
Auto-merging addons/hr_hourly_cost/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/sk.po
Auto-merging addons/hr_recruitment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/es_419.po
Auto-merging addons/hr_recruitment/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/fi.po
Auto-merging addons/hr_recruitment/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/id.po
Auto-merging addons/hr_recruitment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/sv.po
Auto-merging addons/hr_skills/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/id.po
Auto-merging addons/hr_skills/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/sv.po
Auto-merging addons/hr_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/es_419.po
Auto-merging addons/hr_timesheet/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/id.po
Auto-merging addons/hr_timesheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/sv.po
Auto-merging addons/hr_work_entry/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_work_entry/i18n/sv.po
Auto-merging addons/iap_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/bg.po
Auto-merging addons/iap_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/fa.po
Auto-merging addons/im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/bg.po
Auto-merging addons/im_livechat/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/es_419.po
Auto-merging addons/im_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/fi.po
Auto-merging addons/im_livechat/i18n/id.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/id.po
Auto-merging addons/im_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/my.po
Auto-merging addons/im_livechat/i18n/sv.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/sv.po
Auto-merging addons/im_livechat_mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat_mail_bot/i18n/bg.po
Auto-merging addons/link_tracker/i18n/bg.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/bg.po
Auto-merging addons/link_tracker/i18n/fa.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fa.po
Auto-merging addons/link_tracker/i18n/fi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fi.po
Auto-merging addons/link_tracker/i18n/hi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/hi.po
Auto-merging addons/loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/bg.po
Auto-merging addons/loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/fa.po
Auto-merging addons/loyalty/i18n/it.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/it.po
Auto-merging addons/loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/lv.po
Auto-merging addons/loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/sv.po
Auto-merging addons/lunch/i18n/bg.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/bg.po
Auto-merging addons/lunch/i18n/es.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/es.po
Auto-merging addons/lunch/i18n/fa.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/fa.po
Auto-merging addons/lunch/i18n/my.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/my.po
Auto-merging addons/lunch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/sv.po
Auto-merging addons/mail/i18n/ar.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ar.po
Auto-merging addons/mail/i18n/az.po
CONFLICT (content): Merge conflict in addons/mail/i18n/az.po
Auto-merging addons/mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail/i18n/bg.po
Auto-merging addons/mail/i18n/da.po
CONFLICT (content): Merge conflict in addons/mail/i18n/da.po
Auto-merging addons/mail/i18n/de.po
CONFLICT (content): Merge conflict in addons/mail/i18n/de.po
Auto-merging addons/mail/i18n/es.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es.po
Auto-merging addons/mail/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es_419.po
Auto-merging addons/mail/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fa.po
Auto-merging addons/mail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fi.po
Auto-merging addons/mail/i18n/id.po
CONFLICT (content): Merge conflict in addons/mail/i18n/id.po
Auto-merging addons/mail/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail/i18n/lo.po
Auto-merging addons/mail/i18n/nl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/nl.po
Auto-merging addons/mail/i18n/pl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/pl.po
Auto-merging addons/mail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ru.po
Auto-merging addons/mail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail/i18n/sv.po
Auto-merging addons/mail/i18n/tr.po
CONFLICT (content): Merge conflict in addons/mail/i18n/tr.po
Auto-merging addons/mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_bot/i18n/bg.po
Auto-merging addons/mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/bg.po
Auto-merging addons/mail_group/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fa.po
Auto-merging addons/mail_group/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fi.po
Auto-merging addons/mail_group/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/lo.po
Auto-merging addons/mail_group/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/sv.po
Auto-merging addons/mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/bg.po
Auto-merging addons/mail_plugin/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/sv.po
Auto-merging addons/maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/bg.po
Auto-merging addons/maintenance/i18n/es.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/es.po
Auto-merging addons/maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sk.po
Auto-merging addons/maintenance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sv.po
Auto-merging addons/mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/bg.po
Auto-merging addons/mass_mailing/i18n/es.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es.po
Auto-merging addons/mass_mailing/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es_419.po
Auto-merging addons/mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fa.po
Auto-merging addons/mass_mailing/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fi.po
Auto-merging addons/mass_mailing/i18n/pt.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/pt.po
Auto-merging addons/mass_mailing/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/sv.po
Auto-merging addons/mass_mailing_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/bg.po
Auto-merging addons/mass_mailing_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/fa.po
Auto-merging addons/mass_mailing_crm_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm_sms/i18n/fa.po
Auto-merging addons/mass_mailing_event/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_event/i18n/bg.po
Auto-merging addons/mass_mailing_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/fi.po
Auto-merging addons/mass_mailing_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/sv.po
Auto-merging addons/mass_mailing_themes/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing_themes/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/fi.po
Auto-merging addons/microsoft_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/sv.po
Auto-merging addons/mrp/i18n/es.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/es.po
Auto-merging addons/mrp/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/fi.po
Auto-merging addons/mrp/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/id.po
Auto-merging addons/mrp/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/sv.po
Auto-merging addons/mrp_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp_account/i18n/id.po
Auto-merging addons/mrp_subcontracting/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/i18n/fi.po
Auto-merging addons/mrp_subcontracting_dropshipping/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/i18n/bg.po
Auto-merging addons/mrp_subcontracting_purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_purchase/i18n/fa.po
Auto-merging addons/onboarding/i18n/bg.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/bg.po
Auto-merging addons/onboarding/i18n/id.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/id.po
Auto-merging addons/partner_autocomplete/i18n/bg.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/bg.po
Auto-merging addons/partner_autocomplete/i18n/fa.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/fa.po
Auto-merging addons/payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment/i18n/bg.po
Auto-merging addons/payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment/i18n/fa.po
Auto-merging addons/payment/i18n/lt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/lt.po
Auto-merging addons/payment/i18n/my.po
CONFLICT (content): Merge conflict in addons/payment/i18n/my.po
Auto-merging addons/payment/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/pt.po
Auto-merging addons/payment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment/i18n/sv.po
Auto-merging addons/payment_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_adyen/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/pt.po
Auto-merging addons/payment_aps/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_aps/i18n/bg.po
Auto-merging addons/payment_asiapay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_asiapay/i18n/bg.po
Auto-merging addons/payment_authorize/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_authorize/i18n/bg.po
Auto-merging addons/payment_buckaroo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_buckaroo/i18n/bg.po
Auto-merging addons/payment_custom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/bg.po
Auto-merging addons/payment_custom/i18n/nl.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/nl.po
Auto-merging addons/payment_demo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/bg.po
Auto-merging addons/payment_demo/i18n/ru.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/ru.po
Auto-merging addons/payment_demo/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/sl.po
Auto-merging addons/payment_flutterwave/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/bg.po
Auto-merging addons/payment_flutterwave/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/fa.po
Auto-merging addons/payment_flutterwave/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/sl.po
Auto-merging addons/payment_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/bg.po
Auto-merging addons/payment_mercado_pago/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/sv.po
Auto-merging addons/payment_worldline/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/bg.po
Auto-merging addons/payment_worldline/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/pt.po
Auto-merging addons/point_of_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es.po
Auto-merging addons/point_of_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es_419.po
Auto-merging addons/point_of_sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/id.po
Auto-merging addons/point_of_sale/i18n/ja.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/ja.po
Auto-merging addons/point_of_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/sv.po
Auto-merging addons/portal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/portal/i18n/fi.po
Auto-merging addons/portal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/portal/i18n/sv.po
Auto-merging addons/pos_epson_printer/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/bg.po
Auto-merging addons/pos_epson_printer/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/fa.po
Auto-merging addons/pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/bg.po
Auto-merging addons/pos_hr/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/bg.po
Auto-merging addons/pos_loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/fi.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fi.po
Auto-merging addons/pos_loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/lv.po
Auto-merging addons/pos_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercado_pago/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/fa.po
Auto-merging addons/pos_mercury/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/hu.po
Auto-merging addons/pos_online_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/bg.po
Auto-merging addons/pos_online_payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/fa.po
Auto-merging addons/pos_online_payment/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/hu.po
Auto-merging addons/pos_online_payment_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment_self_order/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/fa.po
Auto-merging addons/pos_paytm/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/hu.po
Auto-merging addons/pos_razorpay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/bg.po
Auto-merging addons/pos_razorpay/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/bg.po
Auto-merging addons/pos_restaurant/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/fa.po
Auto-merging addons/pos_restaurant/i18n/hi.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hi.po
Auto-merging addons/pos_restaurant/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/ja.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/ja.po
Auto-merging addons/pos_restaurant_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/bg.po
Auto-merging addons/pos_restaurant_adyen/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/hu.po
Auto-merging addons/pos_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/bg.po
Auto-merging addons/pos_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/es.po
Auto-merging addons/pos_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/fa.po
Auto-merging addons/pos_sale_product_configurator/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/bg.po
Auto-merging addons/pos_sale_product_configurator/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/ar.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/ar.po
Auto-merging addons/pos_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/bg.po
Auto-merging addons/pos_self_order/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/id.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/id.po
Auto-merging addons/pos_self_order/i18n/nl.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/nl.po
Auto-merging addons/pos_self_order/i18n/tr.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/tr.po
Auto-merging addons/pos_self_order_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/bg.po
Auto-merging addons/pos_self_order_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/fa.po
Auto-merging addons/privacy_lookup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/privacy_lookup/i18n/fi.po
Auto-merging addons/product/i18n/es.po
CONFLICT (content): Merge conflict in addons/product/i18n/es.po
Auto-merging addons/product/i18n/fi.po
CONFLICT (content): Merge conflict in addons/product/i18n/fi.po
Auto-merging addons/product/i18n/sv.po
CONFLICT (content): Merge conflict in addons/product/i18n/sv.po
Auto-merging addons/project/i18n/es.po
CONFLICT (content): Merge conflict in addons/project/i18n/es.po
Auto-merging addons/project/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/project/i18n/es_419.po
Auto-merging addons/project/i18n/id.po
CONFLICT (content): Merge conflict in addons/project/i18n/id.po
Auto-merging addons/project/i18n/sv.po
CONFLICT (content): Merge conflict in addons/project/i18n/sv.po
Auto-merging addons/project_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/bg.po
Auto-merging addons/project_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/bg.po
Auto-merging addons/project_timesheet_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/hi.po
Auto-merging addons/project_todo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/bg.po
Auto-merging addons/project_todo/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/fa.po
Auto-merging addons/project_todo/i18n/pt.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/pt.po
Auto-merging addons/purchase/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es.po
Auto-merging addons/purchase/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es_419.po
Auto-merging addons/purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/fa.po
Auto-merging addons/purchase/i18n/ja.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/ja.po
Auto-merging addons/purchase/i18n/lt.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/lt.po
Auto-merging addons/purchase/i18n/my.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/my.po
Auto-merging addons/purchase/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/sv.po
Auto-merging addons/purchase_mrp/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/bg.po
Auto-merging addons/purchase_mrp/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/fa.po
Auto-merging addons/purchase_product_matrix/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/bg.po
Auto-merging addons/purchase_product_matrix/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/bg.po
Auto-merging addons/purchase_requisition/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/es.po
Auto-merging addons/purchase_requisition/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/sv.po
Auto-merging addons/purchase_requisition_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/bg.po
Auto-merging addons/purchase_requisition_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/bg.po
Auto-merging addons/purchase_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fi.po
Auto-merging addons/rating/i18n/bg.po
CONFLICT (content): Merge conflict in addons/rating/i18n/bg.po
Auto-merging addons/rating/i18n/fi.po
CONFLICT (content): Merge conflict in addons/rating/i18n/fi.po
Auto-merging addons/repair/i18n/bg.po
CONFLICT (content): Merge conflict in addons/repair/i18n/bg.po
Auto-merging addons/repair/i18n/es.po
CONFLICT (content): Merge conflict in addons/repair/i18n/es.po
Auto-merging addons/repair/i18n/fa.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fa.po
Auto-merging addons/repair/i18n/fi.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fi.po
Auto-merging addons/repair/i18n/sk.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sk.po
Auto-merging addons/repair/i18n/sv.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sv.po
Auto-merging addons/resource/i18n/bg.po
CONFLICT (content): Merge conflict in addons/resource/i18n/bg.po
Auto-merging addons/resource/i18n/hi.po
CONFLICT (content): Merge conflict in addons/resource/i18n/hi.po
Auto-merging addons/sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale/i18n/es.po
Auto-merging addons/sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fa.po
Auto-merging addons/sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fi.po
Auto-merging addons/sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale/i18n/id.po
Auto-merging addons/sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/sale/i18n/sv.po
Auto-merging addons/sale/i18n/th.po
CONFLICT (content): Merge conflict in addons/sale/i18n/th.po
Auto-merging addons/sale/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/sale/i18n/zh_CN.po
Auto-merging addons/sale_async_emails/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_async_emails/i18n/bg.po
Auto-merging addons/sale_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/fi.po
Auto-merging addons/sale_crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/id.po
Auto-merging addons/sale_management/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_management/i18n/id.po
Auto-merging addons/sale_pdf_quote_builder/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_pdf_quote_builder/i18n/id.po
Auto-merging addons/sale_project/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/fi.po
Auto-merging addons/sale_project/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/id.po
Auto-merging addons/sale_purchase/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_purchase/i18n/fi.po
Auto-merging addons/sale_stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/es.po
Auto-merging addons/sale_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/fi.po
Auto-merging addons/sale_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/bg.po
Auto-merging addons/sale_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/es_419.po
Auto-merging addons/sale_timesheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/fa.po
Auto-merging addons/sales_team/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/bg.po
Auto-merging addons/sales_team/i18n/id.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/id.po
Auto-merging addons/sales_team/i18n/my.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/my.po
Auto-merging addons/sms/i18n/bg.po
Auto-merging addons/sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fa.po
Auto-merging addons/sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fi.po
Auto-merging addons/sms/i18n/my.po
Auto-merging addons/snailmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/bg.po
Auto-merging addons/snailmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/fi.po
Auto-merging addons/snailmail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/ru.po
Auto-merging addons/snailmail_account/i18n/pl.po
CONFLICT (content): Merge conflict in addons/snailmail_account/i18n/pl.po
Auto-merging addons/social_media/i18n/bg.po
CONFLICT (content): Merge conflict in addons/social_media/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/ar.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/ar.po
Auto-merging addons/spreadsheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/es_419.po
Auto-merging addons/spreadsheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/fa.po
Auto-merging addons/spreadsheet/i18n/hi.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/hi.po
Auto-merging addons/spreadsheet/i18n/my.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/my.po
Auto-merging addons/spreadsheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/sv.po
Auto-merging addons/spreadsheet/i18n/tr.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/tr.po
Auto-merging addons/spreadsheet_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/bg.po
Auto-merging addons/spreadsheet_account/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/fa.po
Auto-merging addons/spreadsheet_dashboard/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/sv.po
Auto-merging addons/spreadsheet_dashboard_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_account/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_event_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_event_sale/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_sale/i18n/es_419.po
Auto-merging addons/stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es.po
Auto-merging addons/stock/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es_419.po
Auto-merging addons/stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock/i18n/fi.po
Auto-merging addons/stock/i18n/nl.po
CONFLICT (content): Merge conflict in addons/stock/i18n/nl.po
Auto-merging addons/stock/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock/i18n/sv.po
Auto-merging addons/stock_account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/fi.po
Auto-merging addons/stock_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/id.po
Auto-merging addons/stock_delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_delivery/i18n/fi.po
Auto-merging addons/stock_landed_costs/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/es.po
Auto-merging addons/stock_landed_costs/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/sv.po
Auto-merging addons/stock_picking_batch/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/es.po
Auto-merging addons/stock_picking_batch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/sv.po
Auto-merging addons/survey/i18n/bg.po
CONFLICT (content): Merge conflict in addons/survey/i18n/bg.po
Auto-merging addons/survey/i18n/es.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es.po
Auto-merging addons/survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es_419.po
Auto-merging addons/survey/i18n/fa.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fa.po
Auto-merging addons/survey/i18n/fi.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fi.po
Auto-merging addons/survey/i18n/lt.po
CONFLICT (content): Merge conflict in addons/survey/i18n/lt.po
Auto-merging addons/survey/i18n/my.po
CONFLICT (content): Merge conflict in addons/survey/i18n/my.po
Auto-merging addons/survey/i18n/sv.po
CONFLICT (content): Merge conflict in addons/survey/i18n/sv.po
Auto-merging addons/transifex/i18n/bg.po
CONFLICT (content): Merge conflict in addons/transifex/i18n/bg.po
Auto-merging addons/uom/i18n/ar.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ar.po
Auto-merging addons/uom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/uom/i18n/bg.po
Auto-merging addons/uom/i18n/es.po
CONFLICT (content): Merge conflict in addons/uom/i18n/es.po
Auto-merging addons/uom/i18n/fa.po
CONFLICT (content): Merge conflict in addons/uom/i18n/fa.po
Auto-merging addons/uom/i18n/hi.po
CONFLICT (content): Merge conflict in addons/uom/i18n/hi.po
Auto-merging addons/uom/i18n/id.po
CONFLICT (content): Merge conflict in addons/uom/i18n/id.po
Auto-merging addons/uom/i18n/ru.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ru.po
Auto-merging addons/uom/i18n/th.po
CONFLICT (content): Merge conflict in addons/uom/i18n/th.po
Auto-merging addons/uom/i18n/tr.po
CONFLICT (content): Merge conflict in addons/uom/i18n/tr.po
Auto-merging addons/uom/i18n/uk.po
CONFLICT (content): Merge conflict in addons/uom/i18n/uk.po
Auto-merging addons/utm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/utm/i18n/bg.po
Auto-merging addons/utm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/utm/i18n/fa.po
Auto-merging addons/utm/i18n/nl.po
CONFLICT (content): Merge conflict in addons/utm/i18n/nl.po
Auto-merging addons/web/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web/i18n/ar.po
Auto-merging addons/web/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web/i18n/bg.po
Auto-merging addons/web/i18n/ca.po
CONFLICT (content): Merge conflict in addons/web/i18n/ca.po
Auto-merging addons/web/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web/i18n/fa.po
Auto-merging addons/web/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web/i18n/fi.po
Auto-merging addons/web/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web/i18n/hi.po
Auto-merging addons/web/i18n/id.po
CONFLICT (content): Merge conflict in addons/web/i18n/id.po
Auto-merging addons/web/i18n/lt.po
CONFLICT (content): Merge conflict in addons/web/i18n/lt.po
Auto-merging addons/web/i18n/my.po
CONFLICT (content): Merge conflict in addons/web/i18n/my.po
Auto-merging addons/web/i18n/sv.po
CONFLICT (content): Merge conflict in addons/web/i18n/sv.po
Auto-merging addons/web/i18n/tr.po
CONFLICT (content): Merge conflict in addons/web/i18n/tr.po
Auto-merging addons/web_editor/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/ar.po
Auto-merging addons/web_editor/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/bg.po
Auto-merging addons/web_editor/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fa.po
Auto-merging addons/web_editor/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fi.po
Auto-merging addons/web_editor/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/hi.po
Auto-merging addons/web_editor/i18n/nl.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/nl.po
Auto-merging addons/web_editor/i18n/pt.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/pt.po
Auto-merging addons/web_hierarchy/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_hierarchy/i18n/bg.po
Auto-merging addons/web_tour/i18n/lo.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/lo.po
Auto-merging addons/web_tour/i18n/pl.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/pl.po
Auto-merging addons/web_unsplash/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_unsplash/i18n/bg.po
Auto-merging addons/website/i18n/ar.po
CONFLICT (content): Merge conflict in addons/website/i18n/ar.po
Auto-merging addons/website/i18n/de.po
CONFLICT (content): Merge conflict in addons/website/i18n/de.po
Auto-merging addons/website/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website/i18n/es_419.po
Auto-merging addons/website/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website/i18n/fa.po
Auto-merging addons/website/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website/i18n/fi.po
Auto-merging addons/website/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website/i18n/hi.po
Auto-merging addons/website/i18n/id.po
CONFLICT (content): Merge conflict in addons/website/i18n/id.po
Auto-merging addons/website/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website/i18n/lo.po
Auto-merging addons/website/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website/i18n/nl.po
Auto-merging addons/website/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website/i18n/pl.po
Auto-merging addons/website/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website/i18n/sv.po
Auto-merging addons/website/i18n/th.po
CONFLICT (content): Merge conflict in addons/website/i18n/th.po
Auto-merging addons/website/i18n/tr.po
CONFLICT (content): Merge conflict in addons/website/i18n/tr.po
Auto-merging addons/website_blog/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/bg.po
Auto-merging addons/website_blog/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/lt.po
Auto-merging addons/website_blog/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/my.po
Auto-merging addons/website_blog/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/nl.po
Auto-merging addons/website_blog/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/pl.po
Auto-merging addons/website_cf_turnstile/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/bg.po
Auto-merging addons/website_cf_turnstile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/pl.po
Auto-merging addons/website_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fa.po
Auto-merging addons/website_crm_iap_reveal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fi.po
Auto-merging addons/website_crm_iap_reveal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/sv.po
Auto-merging addons/website_crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_livechat/i18n/bg.po
Auto-merging addons/website_crm_partner_assign/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_partner_assign/i18n/fi.po
Auto-merging addons/website_event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event/i18n/sv.po
Auto-merging addons/website_event_exhibitor/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/es.po
Auto-merging addons/website_event_exhibitor/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/sv.po
Auto-merging addons/website_event_track/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es.po
Auto-merging addons/website_event_track/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es_419.po
Auto-merging addons/website_event_track/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/fi.po
Auto-merging addons/website_event_track/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/pl.po
Auto-merging addons/website_event_track/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/sv.po
Auto-merging addons/website_event_track_live_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_live_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/fa.po
Auto-merging addons/website_forum/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/bg.po
Auto-merging addons/website_forum/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/fi.po
Auto-merging addons/website_forum/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/hi.po
Auto-merging addons/website_forum/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/lt.po
Auto-merging addons/website_forum/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/my.po
Auto-merging addons/website_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/pl.po
Auto-merging addons/website_hr_recruitment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/bg.po
Auto-merging addons/website_hr_recruitment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/fa.po
Auto-merging addons/website_hr_recruitment/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/my.po
Auto-merging addons/website_hr_recruitment/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/nl.po
Auto-merging addons/website_jitsi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/bg.po
Auto-merging addons/website_jitsi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/fa.po
Auto-merging addons/website_links/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/bg.po
Auto-merging addons/website_links/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/lo.po
Auto-merging addons/website_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/bg.po
Auto-merging addons/website_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/my.po
Auto-merging addons/website_mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail/i18n/bg.po
Auto-merging addons/website_mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail_group/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/fa.po
Auto-merging addons/website_mass_mailing_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/bg.po
Auto-merging addons/website_mass_mailing_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/fa.po
Auto-merging addons/website_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/bg.po
Auto-merging addons/website_payment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/es_419.po
Auto-merging addons/website_payment/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/hi.po
Auto-merging addons/website_profile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/pl.po
Auto-merging addons/website_profile/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/sv.po
Auto-merging addons/website_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/fi.po
Auto-merging addons/website_sale/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/pl.po
Auto-merging addons/website_sale_comparison_wishlist/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_sale_comparison_wishlist/i18n/fa.po
Auto-merging addons/website_sale_loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_sale_loyalty/i18n/sv.po
Auto-merging addons/website_sale_mondialrelay/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale_mondialrelay/i18n/fi.po
Auto-merging addons/website_sale_stock/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale_stock/i18n/pl.po
Auto-merging addons/website_slides/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es.po
Auto-merging addons/website_slides/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es_419.po
Auto-merging addons/website_slides/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/fi.po
Auto-merging addons/website_slides/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/sv.po
Auto-merging addons/website_slides_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_forum/i18n/pl.po
Auto-merging addons/website_slides_survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/es_419.po
Auto-merging addons/website_slides_survey/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/pl.po
Auto-merging addons/website_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_sms/i18n/bg.po
Auto-merging addons/website_twitter/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_twitter/i18n/pl.po
Auto-merging odoo/addons/base/i18n/ca.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/ca.po
Auto-merging odoo/addons/base/i18n/es_419.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/es_419.po
Auto-merging odoo/addons/base/i18n/fi.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/fi.po
Auto-merging odoo/addons/base/i18n/id.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/id.po
Auto-merging odoo/addons/base/i18n/sv.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/sv.po
error: could not apply d1ff2894a302... [I18N] *: fetch latest Weblate translations
Could not apply d1ff2894a302... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/536)
Auto-merging addons/account/i18n/es.po
CONFLICT (content): Merge conflict in addons/account/i18n/es.po
Auto-merging addons/account/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/account/i18n/es_419.po
Auto-merging addons/account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/account/i18n/fi.po
Auto-merging addons/account/i18n/id.po
CONFLICT (content): Merge conflict in addons/account/i18n/id.po
Auto-merging addons/account/i18n/ja.po
CONFLICT (content): Merge conflict in addons/account/i18n/ja.po
Auto-merging addons/account/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account/i18n/nl.po
Auto-merging addons/account/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account/i18n/sv.po
Auto-merging addons/account_add_gln/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_add_gln/i18n/bg.po
Auto-merging addons/account_audit_trail/i18n/id.po
CONFLICT (content): Merge conflict in addons/account_audit_trail/i18n/id.po
Auto-merging addons/account_check_printing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_check_printing/i18n/bg.po
Auto-merging addons/account_debit_note/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/nl.po
Auto-merging addons/account_edi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/bg.po
Auto-merging addons/account_edi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/fa.po
Auto-merging addons/account_edi_proxy_client/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/bg.po
Auto-merging addons/account_edi_proxy_client/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/sv.po
Auto-merging addons/account_edi_ubl_cii/i18n/ar.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/ar.po
Auto-merging addons/account_edi_ubl_cii/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/fa.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
Auto-merging addons/account_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment/i18n/bg.po
Auto-merging addons/account_payment_term/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment_term/i18n/bg.po
Auto-merging addons/account_peppol/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/bg.po
Auto-merging addons/account_peppol/i18n/de.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/de.po
Auto-merging addons/account_peppol/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/fa.po
Auto-merging addons/account_peppol/i18n/lo.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/lo.po
Auto-merging addons/account_peppol/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/zh_CN.po
Auto-merging addons/account_peppol_selfbilling/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/bg.po
Auto-merging addons/account_peppol_selfbilling/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/fa.po
Auto-merging addons/account_peppol_selfbilling/i18n/zh_TW.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/zh_TW.po
Auto-merging addons/account_qr_code_emv/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_emv/i18n/bg.po
Auto-merging addons/account_qr_code_sepa/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_sepa/i18n/bg.po
Auto-merging addons/account_update_tax_tags/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_update_tax_tags/i18n/bg.po
Auto-merging addons/analytic/i18n/bg.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/bg.po
Auto-merging addons/analytic/i18n/fa.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/fa.po
Auto-merging addons/analytic/i18n/sv.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/sv.po
Auto-merging addons/auth_ldap/i18n/bg.po
CONFLICT (content): Merge conflict in addons/auth_ldap/i18n/bg.po
Auto-merging addons/auth_signup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_signup/i18n/fi.po
Auto-merging addons/auth_totp_mail_enforce/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_totp_mail_enforce/i18n/fi.po
Auto-merging addons/base_automation/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_automation/i18n/sv.po
Auto-merging addons/base_import_module/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/bg.po
Auto-merging addons/base_import_module/i18n/fa.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/fa.po
Auto-merging addons/base_install_request/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_install_request/i18n/bg.po
Auto-merging addons/base_setup/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/bg.po
Auto-merging addons/base_setup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/fi.po
Auto-merging addons/base_setup/i18n/hi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/hi.po
Auto-merging addons/base_setup/i18n/id.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/id.po
Auto-merging addons/base_setup/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/sv.po
Auto-merging addons/base_sparse_field/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_sparse_field/i18n/bg.po
Auto-merging addons/base_vat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/bg.po
Auto-merging addons/base_vat/i18n/ru.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/ru.po
Auto-merging addons/board/i18n/bg.po
CONFLICT (content): Merge conflict in addons/board/i18n/bg.po
Auto-merging addons/bus/i18n/bg.po
CONFLICT (content): Merge conflict in addons/bus/i18n/bg.po
Auto-merging addons/bus/i18n/fa.po
CONFLICT (content): Merge conflict in addons/bus/i18n/fa.po
Auto-merging addons/calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/bg.po
Auto-merging addons/calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/fi.po
Auto-merging addons/calendar/i18n/id.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/id.po
Auto-merging addons/calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/sv.po
Auto-merging addons/calendar_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/bg.po
Auto-merging addons/calendar_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/fi.po
Auto-merging addons/calendar_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/sv.po
Auto-merging addons/contacts/i18n/sv.po
CONFLICT (content): Merge conflict in addons/contacts/i18n/sv.po
Auto-merging addons/crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm/i18n/bg.po
Auto-merging addons/crm/i18n/es.po
CONFLICT (content): Merge conflict in addons/crm/i18n/es.po
Auto-merging addons/crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fa.po
Auto-merging addons/crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fi.po
Auto-merging addons/crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm/i18n/id.po
Auto-merging addons/crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/crm/i18n/sv.po
Auto-merging addons/crm_iap_enrich/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/bg.po
Auto-merging addons/crm_iap_enrich/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/bg.po
Auto-merging addons/crm_iap_mine/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fa.po
Auto-merging addons/crm_iap_mine/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/id.po
Auto-merging addons/crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/bg.po
Auto-merging addons/crm_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/fi.po
Auto-merging addons/crm_mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/bg.po
Auto-merging addons/crm_mail_plugin/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/fi.po
Auto-merging addons/delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/fi.po
Auto-merging addons/delivery/i18n/sv.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/sv.po
Auto-merging addons/event/i18n/es.po
CONFLICT (content): Merge conflict in addons/event/i18n/es.po
Auto-merging addons/event/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event/i18n/es_419.po
Auto-merging addons/event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event/i18n/sv.po
Auto-merging addons/event_booth/i18n/es.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/es.po
Auto-merging addons/event_booth/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/sv.po
Auto-merging addons/event_booth_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_booth_sale/i18n/fi.po
Auto-merging addons/event_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/fi.po
Auto-merging addons/event_crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/sv.po
Auto-merging addons/event_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/es_419.po
Auto-merging addons/event_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/sv.po
Auto-merging addons/fleet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/fleet/i18n/sv.po
Auto-merging addons/gamification/i18n/sv.po
CONFLICT (content): Merge conflict in addons/gamification/i18n/sv.po
Auto-merging addons/google_calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/bg.po
Auto-merging addons/google_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/fi.po
Auto-merging addons/google_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/sv.po
Auto-merging addons/google_gmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/bg.po
Auto-merging addons/google_gmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/fi.po
Auto-merging addons/google_gmail/i18n/hi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/hi.po
Auto-merging addons/google_gmail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/sv.po
Auto-merging addons/google_recaptcha/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/bg.po
Auto-merging addons/google_recaptcha/i18n/fa.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/fa.po
Auto-merging addons/hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr/i18n/bg.po
Auto-merging addons/hr/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr/i18n/id.po
Auto-merging addons/hr/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr/i18n/my.po
Auto-merging addons/hr/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr/i18n/sv.po
Auto-merging addons/hr/i18n/th.po
CONFLICT (content): Merge conflict in addons/hr/i18n/th.po
Auto-merging addons/hr_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/bg.po
Auto-merging addons/hr_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/fa.po
Auto-merging addons/hr_attendance/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/my.po
Auto-merging addons/hr_attendance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/sv.po
Auto-merging addons/hr_contract/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/bg.po
Auto-merging addons/hr_contract/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/es.po
Auto-merging addons/hr_contract/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/hi.po
Auto-merging addons/hr_contract/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/id.po
Auto-merging addons/hr_contract/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/my.po
Auto-merging addons/hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/bg.po
Auto-merging addons/hr_expense/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/es.po
Auto-merging addons/hr_expense/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/fa.po
Auto-merging addons/hr_expense/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/id.po
Auto-merging addons/hr_expense/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/sv.po
Auto-merging addons/hr_fleet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_fleet/i18n/bg.po
Auto-merging addons/hr_gamification/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_gamification/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/da.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/da.po
Auto-merging addons/hr_holidays/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/es.po
Auto-merging addons/hr_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fa.po
Auto-merging addons/hr_holidays/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fi.po
Auto-merging addons/hr_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/hi.po
Auto-merging addons/hr_holidays/i18n/ru.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/ru.po
Auto-merging addons/hr_holidays/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sk.po
Auto-merging addons/hr_holidays/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sv.po
Auto-merging addons/hr_holidays_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/bg.po
Auto-merging addons/hr_holidays_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fa.po
Auto-merging addons/hr_holidays_attendance/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fi.po
Auto-merging addons/hr_homeworking/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/bg.po
Auto-merging addons/hr_homeworking/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/fa.po
Auto-merging addons/hr_hourly_cost/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/sk.po
Auto-merging addons/hr_recruitment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/es_419.po
Auto-merging addons/hr_recruitment/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/fi.po
Auto-merging addons/hr_recruitment/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/id.po
Auto-merging addons/hr_recruitment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/sv.po
Auto-merging addons/hr_skills/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/id.po
Auto-merging addons/hr_skills/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/sv.po
Auto-merging addons/hr_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/es_419.po
Auto-merging addons/hr_timesheet/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/id.po
Auto-merging addons/hr_timesheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/sv.po
Auto-merging addons/hr_work_entry/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_work_entry/i18n/sv.po
Auto-merging addons/iap_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/bg.po
Auto-merging addons/iap_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/fa.po
Auto-merging addons/im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/bg.po
Auto-merging addons/im_livechat/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/es_419.po
Auto-merging addons/im_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/fi.po
Auto-merging addons/im_livechat/i18n/id.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/id.po
Auto-merging addons/im_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/my.po
Auto-merging addons/im_livechat/i18n/sv.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/sv.po
Auto-merging addons/im_livechat_mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat_mail_bot/i18n/bg.po
Auto-merging addons/link_tracker/i18n/bg.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/bg.po
Auto-merging addons/link_tracker/i18n/fa.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fa.po
Auto-merging addons/link_tracker/i18n/fi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fi.po
Auto-merging addons/link_tracker/i18n/hi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/hi.po
Auto-merging addons/loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/bg.po
Auto-merging addons/loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/fa.po
Auto-merging addons/loyalty/i18n/it.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/it.po
Auto-merging addons/loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/lv.po
Auto-merging addons/loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/sv.po
Auto-merging addons/lunch/i18n/bg.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/bg.po
Auto-merging addons/lunch/i18n/es.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/es.po
Auto-merging addons/lunch/i18n/fa.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/fa.po
Auto-merging addons/lunch/i18n/my.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/my.po
Auto-merging addons/lunch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/sv.po
Auto-merging addons/mail/i18n/ar.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ar.po
Auto-merging addons/mail/i18n/az.po
CONFLICT (content): Merge conflict in addons/mail/i18n/az.po
Auto-merging addons/mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail/i18n/bg.po
Auto-merging addons/mail/i18n/da.po
CONFLICT (content): Merge conflict in addons/mail/i18n/da.po
Auto-merging addons/mail/i18n/de.po
CONFLICT (content): Merge conflict in addons/mail/i18n/de.po
Auto-merging addons/mail/i18n/es.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es.po
Auto-merging addons/mail/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es_419.po
Auto-merging addons/mail/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fa.po
Auto-merging addons/mail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fi.po
Auto-merging addons/mail/i18n/id.po
CONFLICT (content): Merge conflict in addons/mail/i18n/id.po
Auto-merging addons/mail/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail/i18n/lo.po
Auto-merging addons/mail/i18n/nl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/nl.po
Auto-merging addons/mail/i18n/pl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/pl.po
Auto-merging addons/mail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ru.po
Auto-merging addons/mail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail/i18n/sv.po
Auto-merging addons/mail/i18n/tr.po
CONFLICT (content): Merge conflict in addons/mail/i18n/tr.po
Auto-merging addons/mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_bot/i18n/bg.po
Auto-merging addons/mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/bg.po
Auto-merging addons/mail_group/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fa.po
Auto-merging addons/mail_group/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fi.po
Auto-merging addons/mail_group/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/lo.po
Auto-merging addons/mail_group/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/sv.po
Auto-merging addons/mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/bg.po
Auto-merging addons/mail_plugin/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/sv.po
Auto-merging addons/maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/bg.po
Auto-merging addons/maintenance/i18n/es.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/es.po
Auto-merging addons/maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sk.po
Auto-merging addons/maintenance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sv.po
Auto-merging addons/mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/bg.po
Auto-merging addons/mass_mailing/i18n/es.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es.po
Auto-merging addons/mass_mailing/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es_419.po
Auto-merging addons/mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fa.po
Auto-merging addons/mass_mailing/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fi.po
Auto-merging addons/mass_mailing/i18n/pt.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/pt.po
Auto-merging addons/mass_mailing/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/sv.po
Auto-merging addons/mass_mailing_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/bg.po
Auto-merging addons/mass_mailing_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/fa.po
Auto-merging addons/mass_mailing_crm_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm_sms/i18n/fa.po
Auto-merging addons/mass_mailing_event/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_event/i18n/bg.po
Auto-merging addons/mass_mailing_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/fi.po
Auto-merging addons/mass_mailing_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/sv.po
Auto-merging addons/mass_mailing_themes/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing_themes/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/fi.po
Auto-merging addons/microsoft_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/sv.po
Auto-merging addons/mrp/i18n/es.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/es.po
Auto-merging addons/mrp/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/fi.po
Auto-merging addons/mrp/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/id.po
Auto-merging addons/mrp/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/sv.po
Auto-merging addons/mrp_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp_account/i18n/id.po
Auto-merging addons/mrp_subcontracting/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/i18n/fi.po
Auto-merging addons/mrp_subcontracting_dropshipping/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/i18n/bg.po
Auto-merging addons/mrp_subcontracting_purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_purchase/i18n/fa.po
Auto-merging addons/onboarding/i18n/bg.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/bg.po
Auto-merging addons/onboarding/i18n/id.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/id.po
Auto-merging addons/partner_autocomplete/i18n/bg.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/bg.po
Auto-merging addons/partner_autocomplete/i18n/fa.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/fa.po
Auto-merging addons/payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment/i18n/bg.po
Auto-merging addons/payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment/i18n/fa.po
Auto-merging addons/payment/i18n/lt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/lt.po
Auto-merging addons/payment/i18n/my.po
CONFLICT (content): Merge conflict in addons/payment/i18n/my.po
Auto-merging addons/payment/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/pt.po
Auto-merging addons/payment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment/i18n/sv.po
Auto-merging addons/payment_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_adyen/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/pt.po
Auto-merging addons/payment_aps/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_aps/i18n/bg.po
Auto-merging addons/payment_asiapay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_asiapay/i18n/bg.po
Auto-merging addons/payment_authorize/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_authorize/i18n/bg.po
Auto-merging addons/payment_buckaroo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_buckaroo/i18n/bg.po
Auto-merging addons/payment_custom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/bg.po
Auto-merging addons/payment_custom/i18n/nl.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/nl.po
Auto-merging addons/payment_demo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/bg.po
Auto-merging addons/payment_demo/i18n/ru.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/ru.po
Auto-merging addons/payment_demo/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/sl.po
Auto-merging addons/payment_flutterwave/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/bg.po
Auto-merging addons/payment_flutterwave/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/fa.po
Auto-merging addons/payment_flutterwave/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/sl.po
Auto-merging addons/payment_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/bg.po
Auto-merging addons/payment_mercado_pago/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/sv.po
Auto-merging addons/payment_worldline/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/bg.po
Auto-merging addons/payment_worldline/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/pt.po
Auto-merging addons/point_of_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es.po
Auto-merging addons/point_of_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es_419.po
Auto-merging addons/point_of_sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/id.po
Auto-merging addons/point_of_sale/i18n/ja.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/ja.po
Auto-merging addons/point_of_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/sv.po
Auto-merging addons/portal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/portal/i18n/fi.po
Auto-merging addons/portal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/portal/i18n/sv.po
Auto-merging addons/pos_epson_printer/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/bg.po
Auto-merging addons/pos_epson_printer/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/fa.po
Auto-merging addons/pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/bg.po
Auto-merging addons/pos_hr/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/bg.po
Auto-merging addons/pos_loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/fi.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fi.po
Auto-merging addons/pos_loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/lv.po
Auto-merging addons/pos_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercado_pago/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/fa.po
Auto-merging addons/pos_mercury/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/hu.po
Auto-merging addons/pos_online_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/bg.po
Auto-merging addons/pos_online_payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/fa.po
Auto-merging addons/pos_online_payment/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/hu.po
Auto-merging addons/pos_online_payment_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment_self_order/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/fa.po
Auto-merging addons/pos_paytm/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/hu.po
Auto-merging addons/pos_razorpay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/bg.po
Auto-merging addons/pos_razorpay/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/bg.po
Auto-merging addons/pos_restaurant/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/fa.po
Auto-merging addons/pos_restaurant/i18n/hi.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hi.po
Auto-merging addons/pos_restaurant/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/ja.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/ja.po
Auto-merging addons/pos_restaurant_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/bg.po
Auto-merging addons/pos_restaurant_adyen/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/hu.po
Auto-merging addons/pos_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/bg.po
Auto-merging addons/pos_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/es.po
Auto-merging addons/pos_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/fa.po
Auto-merging addons/pos_sale_product_configurator/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/bg.po
Auto-merging addons/pos_sale_product_configurator/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/ar.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/ar.po
Auto-merging addons/pos_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/bg.po
Auto-merging addons/pos_self_order/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/id.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/id.po
Auto-merging addons/pos_self_order/i18n/nl.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/nl.po
Auto-merging addons/pos_self_order/i18n/tr.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/tr.po
Auto-merging addons/pos_self_order_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/bg.po
Auto-merging addons/pos_self_order_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/fa.po
Auto-merging addons/privacy_lookup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/privacy_lookup/i18n/fi.po
Auto-merging addons/product/i18n/es.po
CONFLICT (content): Merge conflict in addons/product/i18n/es.po
Auto-merging addons/product/i18n/fi.po
CONFLICT (content): Merge conflict in addons/product/i18n/fi.po
Auto-merging addons/product/i18n/sv.po
CONFLICT (content): Merge conflict in addons/product/i18n/sv.po
Auto-merging addons/project/i18n/es.po
CONFLICT (content): Merge conflict in addons/project/i18n/es.po
Auto-merging addons/project/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/project/i18n/es_419.po
Auto-merging addons/project/i18n/id.po
CONFLICT (content): Merge conflict in addons/project/i18n/id.po
Auto-merging addons/project/i18n/sv.po
CONFLICT (content): Merge conflict in addons/project/i18n/sv.po
Auto-merging addons/project_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/bg.po
Auto-merging addons/project_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/bg.po
Auto-merging addons/project_timesheet_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/hi.po
Auto-merging addons/project_todo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/bg.po
Auto-merging addons/project_todo/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/fa.po
Auto-merging addons/project_todo/i18n/pt.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/pt.po
Auto-merging addons/purchase/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es.po
Auto-merging addons/purchase/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es_419.po
Auto-merging addons/purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/fa.po
Auto-merging addons/purchase/i18n/ja.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/ja.po
Auto-merging addons/purchase/i18n/lt.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/lt.po
Auto-merging addons/purchase/i18n/my.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/my.po
Auto-merging addons/purchase/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/sv.po
Auto-merging addons/purchase_mrp/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/bg.po
Auto-merging addons/purchase_mrp/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/fa.po
Auto-merging addons/purchase_product_matrix/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/bg.po
Auto-merging addons/purchase_product_matrix/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/bg.po
Auto-merging addons/purchase_requisition/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/es.po
Auto-merging addons/purchase_requisition/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/sv.po
Auto-merging addons/purchase_requisition_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/bg.po
Auto-merging addons/purchase_requisition_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/bg.po
Auto-merging addons/purchase_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fi.po
Auto-merging addons/rating/i18n/bg.po
CONFLICT (content): Merge conflict in addons/rating/i18n/bg.po
Auto-merging addons/rating/i18n/fi.po
CONFLICT (content): Merge conflict in addons/rating/i18n/fi.po
Auto-merging addons/repair/i18n/bg.po
CONFLICT (content): Merge conflict in addons/repair/i18n/bg.po
Auto-merging addons/repair/i18n/es.po
CONFLICT (content): Merge conflict in addons/repair/i18n/es.po
Auto-merging addons/repair/i18n/fa.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fa.po
Auto-merging addons/repair/i18n/fi.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fi.po
Auto-merging addons/repair/i18n/sk.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sk.po
Auto-merging addons/repair/i18n/sv.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sv.po
Auto-merging addons/resource/i18n/bg.po
CONFLICT (content): Merge conflict in addons/resource/i18n/bg.po
Auto-merging addons/resource/i18n/hi.po
CONFLICT (content): Merge conflict in addons/resource/i18n/hi.po
Auto-merging addons/sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale/i18n/es.po
Auto-merging addons/sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fa.po
Auto-merging addons/sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fi.po
Auto-merging addons/sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale/i18n/id.po
Auto-merging addons/sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/sale/i18n/sv.po
Auto-merging addons/sale/i18n/th.po
CONFLICT (content): Merge conflict in addons/sale/i18n/th.po
Auto-merging addons/sale/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/sale/i18n/zh_CN.po
Auto-merging addons/sale_async_emails/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_async_emails/i18n/bg.po
Auto-merging addons/sale_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/fi.po
Auto-merging addons/sale_crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/id.po
Auto-merging addons/sale_management/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_management/i18n/id.po
Auto-merging addons/sale_pdf_quote_builder/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_pdf_quote_builder/i18n/id.po
Auto-merging addons/sale_project/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/fi.po
Auto-merging addons/sale_project/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/id.po
Auto-merging addons/sale_purchase/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_purchase/i18n/fi.po
Auto-merging addons/sale_stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/es.po
Auto-merging addons/sale_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/fi.po
Auto-merging addons/sale_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/bg.po
Auto-merging addons/sale_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/es_419.po
Auto-merging addons/sale_timesheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/fa.po
Auto-merging addons/sales_team/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/bg.po
Auto-merging addons/sales_team/i18n/id.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/id.po
Auto-merging addons/sales_team/i18n/my.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/my.po
Auto-merging addons/sms/i18n/bg.po
Auto-merging addons/sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fa.po
Auto-merging addons/sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fi.po
Auto-merging addons/sms/i18n/my.po
Auto-merging addons/snailmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/bg.po
Auto-merging addons/snailmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/fi.po
Auto-merging addons/snailmail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/ru.po
Auto-merging addons/snailmail_account/i18n/pl.po
CONFLICT (content): Merge conflict in addons/snailmail_account/i18n/pl.po
Auto-merging addons/social_media/i18n/bg.po
CONFLICT (content): Merge conflict in addons/social_media/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/ar.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/ar.po
Auto-merging addons/spreadsheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/es_419.po
Auto-merging addons/spreadsheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/fa.po
Auto-merging addons/spreadsheet/i18n/hi.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/hi.po
Auto-merging addons/spreadsheet/i18n/my.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/my.po
Auto-merging addons/spreadsheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/sv.po
Auto-merging addons/spreadsheet/i18n/tr.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/tr.po
Auto-merging addons/spreadsheet_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/bg.po
Auto-merging addons/spreadsheet_account/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/fa.po
Auto-merging addons/spreadsheet_dashboard/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/sv.po
Auto-merging addons/spreadsheet_dashboard_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_account/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_event_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_event_sale/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_sale/i18n/es_419.po
Auto-merging addons/stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es.po
Auto-merging addons/stock/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es_419.po
Auto-merging addons/stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock/i18n/fi.po
Auto-merging addons/stock/i18n/nl.po
CONFLICT (content): Merge conflict in addons/stock/i18n/nl.po
Auto-merging addons/stock/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock/i18n/sv.po
Auto-merging addons/stock_account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/fi.po
Auto-merging addons/stock_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/id.po
Auto-merging addons/stock_delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_delivery/i18n/fi.po
Auto-merging addons/stock_landed_costs/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/es.po
Auto-merging addons/stock_landed_costs/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/sv.po
Auto-merging addons/stock_picking_batch/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/es.po
Auto-merging addons/stock_picking_batch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/sv.po
Auto-merging addons/survey/i18n/bg.po
CONFLICT (content): Merge conflict in addons/survey/i18n/bg.po
Auto-merging addons/survey/i18n/es.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es.po
Auto-merging addons/survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es_419.po
Auto-merging addons/survey/i18n/fa.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fa.po
Auto-merging addons/survey/i18n/fi.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fi.po
Auto-merging addons/survey/i18n/lt.po
CONFLICT (content): Merge conflict in addons/survey/i18n/lt.po
Auto-merging addons/survey/i18n/my.po
CONFLICT (content): Merge conflict in addons/survey/i18n/my.po
Auto-merging addons/survey/i18n/sv.po
CONFLICT (content): Merge conflict in addons/survey/i18n/sv.po
Auto-merging addons/transifex/i18n/bg.po
CONFLICT (content): Merge conflict in addons/transifex/i18n/bg.po
Auto-merging addons/uom/i18n/ar.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ar.po
Auto-merging addons/uom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/uom/i18n/bg.po
Auto-merging addons/uom/i18n/es.po
CONFLICT (content): Merge conflict in addons/uom/i18n/es.po
Auto-merging addons/uom/i18n/fa.po
CONFLICT (content): Merge conflict in addons/uom/i18n/fa.po
Auto-merging addons/uom/i18n/hi.po
CONFLICT (content): Merge conflict in addons/uom/i18n/hi.po
Auto-merging addons/uom/i18n/id.po
CONFLICT (content): Merge conflict in addons/uom/i18n/id.po
Auto-merging addons/uom/i18n/ru.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ru.po
Auto-merging addons/uom/i18n/th.po
CONFLICT (content): Merge conflict in addons/uom/i18n/th.po
Auto-merging addons/uom/i18n/tr.po
CONFLICT (content): Merge conflict in addons/uom/i18n/tr.po
Auto-merging addons/uom/i18n/uk.po
CONFLICT (content): Merge conflict in addons/uom/i18n/uk.po
Auto-merging addons/utm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/utm/i18n/bg.po
Auto-merging addons/utm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/utm/i18n/fa.po
Auto-merging addons/utm/i18n/nl.po
CONFLICT (content): Merge conflict in addons/utm/i18n/nl.po
Auto-merging addons/web/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web/i18n/ar.po
Auto-merging addons/web/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web/i18n/bg.po
Auto-merging addons/web/i18n/ca.po
CONFLICT (content): Merge conflict in addons/web/i18n/ca.po
Auto-merging addons/web/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web/i18n/fa.po
Auto-merging addons/web/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web/i18n/fi.po
Auto-merging addons/web/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web/i18n/hi.po
Auto-merging addons/web/i18n/id.po
CONFLICT (content): Merge conflict in addons/web/i18n/id.po
Auto-merging addons/web/i18n/lt.po
CONFLICT (content): Merge conflict in addons/web/i18n/lt.po
Auto-merging addons/web/i18n/my.po
CONFLICT (content): Merge conflict in addons/web/i18n/my.po
Auto-merging addons/web/i18n/sv.po
CONFLICT (content): Merge conflict in addons/web/i18n/sv.po
Auto-merging addons/web/i18n/tr.po
CONFLICT (content): Merge conflict in addons/web/i18n/tr.po
Auto-merging addons/web_editor/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/ar.po
Auto-merging addons/web_editor/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/bg.po
Auto-merging addons/web_editor/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fa.po
Auto-merging addons/web_editor/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fi.po
Auto-merging addons/web_editor/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/hi.po
Auto-merging addons/web_editor/i18n/nl.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/nl.po
Auto-merging addons/web_editor/i18n/pt.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/pt.po
Auto-merging addons/web_hierarchy/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_hierarchy/i18n/bg.po
Auto-merging addons/web_tour/i18n/lo.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/lo.po
Auto-merging addons/web_tour/i18n/pl.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/pl.po
Auto-merging addons/web_unsplash/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_unsplash/i18n/bg.po
Auto-merging addons/website/i18n/ar.po
CONFLICT (content): Merge conflict in addons/website/i18n/ar.po
Auto-merging addons/website/i18n/de.po
CONFLICT (content): Merge conflict in addons/website/i18n/de.po
Auto-merging addons/website/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website/i18n/es_419.po
Auto-merging addons/website/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website/i18n/fa.po
Auto-merging addons/website/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website/i18n/fi.po
Auto-merging addons/website/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website/i18n/hi.po
Auto-merging addons/website/i18n/id.po
CONFLICT (content): Merge conflict in addons/website/i18n/id.po
Auto-merging addons/website/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website/i18n/lo.po
Auto-merging addons/website/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website/i18n/nl.po
Auto-merging addons/website/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website/i18n/pl.po
Auto-merging addons/website/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website/i18n/sv.po
Auto-merging addons/website/i18n/th.po
CONFLICT (content): Merge conflict in addons/website/i18n/th.po
Auto-merging addons/website/i18n/tr.po
CONFLICT (content): Merge conflict in addons/website/i18n/tr.po
Auto-merging addons/website_blog/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/bg.po
Auto-merging addons/website_blog/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/lt.po
Auto-merging addons/website_blog/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/my.po
Auto-merging addons/website_blog/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/nl.po
Auto-merging addons/website_blog/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/pl.po
Auto-merging addons/website_cf_turnstile/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/bg.po
Auto-merging addons/website_cf_turnstile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/pl.po
Auto-merging addons/website_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fa.po
Auto-merging addons/website_crm_iap_reveal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fi.po
Auto-merging addons/website_crm_iap_reveal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/sv.po
Auto-merging addons/website_crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_livechat/i18n/bg.po
Auto-merging addons/website_crm_partner_assign/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_partner_assign/i18n/fi.po
Auto-merging addons/website_event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event/i18n/sv.po
Auto-merging addons/website_event_exhibitor/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/es.po
Auto-merging addons/website_event_exhibitor/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/sv.po
Auto-merging addons/website_event_track/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es.po
Auto-merging addons/website_event_track/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es_419.po
Auto-merging addons/website_event_track/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/fi.po
Auto-merging addons/website_event_track/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/pl.po
Auto-merging addons/website_event_track/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/sv.po
Auto-merging addons/website_event_track_live_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_live_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/fa.po
Auto-merging addons/website_forum/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/bg.po
Auto-merging addons/website_forum/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/fi.po
Auto-merging addons/website_forum/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/hi.po
Auto-merging addons/website_forum/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/lt.po
Auto-merging addons/website_forum/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/my.po
Auto-merging addons/website_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/pl.po
Auto-merging addons/website_hr_recruitment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/bg.po
Auto-merging addons/website_hr_recruitment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/fa.po
Auto-merging addons/website_hr_recruitment/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/my.po
Auto-merging addons/website_hr_recruitment/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/nl.po
Auto-merging addons/website_jitsi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/bg.po
Auto-merging addons/website_jitsi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/fa.po
Auto-merging addons/website_links/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/bg.po
Auto-merging addons/website_links/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/lo.po
Auto-merging addons/website_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/bg.po
Auto-merging addons/website_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/my.po
Auto-merging addons/website_mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail/i18n/bg.po
Auto-merging addons/website_mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail_group/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/fa.po
Auto-merging addons/website_mass_mailing_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/bg.po
Auto-merging addons/website_mass_mailing_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/fa.po
Auto-merging addons/website_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/bg.po
Auto-merging addons/website_payment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/es_419.po
Auto-merging addons/website_payment/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/hi.po
Auto-merging addons/website_profile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/pl.po
Auto-merging addons/website_profile/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/sv.po
Auto-merging addons/website_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/fi.po
Auto-merging addons/website_sale/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/pl.po
Auto-merging addons/website_sale_comparison_wishlist/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_sale_comparison_wishlist/i18n/fa.po
Auto-merging addons/website_sale_loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_sale_loyalty/i18n/sv.po
Auto-merging addons/website_sale_mondialrelay/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale_mondialrelay/i18n/fi.po
Auto-merging addons/website_sale_stock/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale_stock/i18n/pl.po
Auto-merging addons/website_slides/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es.po
Auto-merging addons/website_slides/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es_419.po
Auto-merging addons/website_slides/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/fi.po
Auto-merging addons/website_slides/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/sv.po
Auto-merging addons/website_slides_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_forum/i18n/pl.po
Auto-merging addons/website_slides_survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/es_419.po
Auto-merging addons/website_slides_survey/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/pl.po
Auto-merging addons/website_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_sms/i18n/bg.po
Auto-merging addons/website_twitter/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_twitter/i18n/pl.po
Auto-merging odoo/addons/base/i18n/ca.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/ca.po
Auto-merging odoo/addons/base/i18n/es_419.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/es_419.po
Auto-merging odoo/addons/base/i18n/fi.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/fi.po
Auto-merging odoo/addons/base/i18n/id.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/id.po
Auto-merging odoo/addons/base/i18n/sv.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/sv.po
error: could not apply d1ff2894a302... [I18N] *: fetch latest Weblate translations
Could not apply d1ff2894a302... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/536)
Auto-merging addons/account/i18n/es.po
CONFLICT (content): Merge conflict in addons/account/i18n/es.po
Auto-merging addons/account/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/account/i18n/es_419.po
Auto-merging addons/account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/account/i18n/fi.po
Auto-merging addons/account/i18n/id.po
CONFLICT (content): Merge conflict in addons/account/i18n/id.po
Auto-merging addons/account/i18n/ja.po
CONFLICT (content): Merge conflict in addons/account/i18n/ja.po
Auto-merging addons/account/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account/i18n/nl.po
Auto-merging addons/account/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account/i18n/sv.po
Auto-merging addons/account_add_gln/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_add_gln/i18n/bg.po
Auto-merging addons/account_audit_trail/i18n/id.po
CONFLICT (content): Merge conflict in addons/account_audit_trail/i18n/id.po
Auto-merging addons/account_check_printing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_check_printing/i18n/bg.po
Auto-merging addons/account_debit_note/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/nl.po
Auto-merging addons/account_edi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/bg.po
Auto-merging addons/account_edi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/fa.po
Auto-merging addons/account_edi_proxy_client/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/bg.po
Auto-merging addons/account_edi_proxy_client/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/sv.po
Auto-merging addons/account_edi_ubl_cii/i18n/ar.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/ar.po
Auto-merging addons/account_edi_ubl_cii/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/fa.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
Auto-merging addons/account_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment/i18n/bg.po
Auto-merging addons/account_payment_term/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment_term/i18n/bg.po
Auto-merging addons/account_peppol/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/bg.po
Auto-merging addons/account_peppol/i18n/de.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/de.po
Auto-merging addons/account_peppol/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/fa.po
Auto-merging addons/account_peppol/i18n/lo.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/lo.po
Auto-merging addons/account_peppol/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/zh_CN.po
Auto-merging addons/account_peppol_selfbilling/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/bg.po
Auto-merging addons/account_peppol_selfbilling/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/fa.po
Auto-merging addons/account_peppol_selfbilling/i18n/zh_TW.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/zh_TW.po
Auto-merging addons/account_qr_code_emv/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_emv/i18n/bg.po
Auto-merging addons/account_qr_code_sepa/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_sepa/i18n/bg.po
Auto-merging addons/account_update_tax_tags/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_update_tax_tags/i18n/bg.po
Auto-merging addons/analytic/i18n/bg.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/bg.po
Auto-merging addons/analytic/i18n/fa.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/fa.po
Auto-merging addons/analytic/i18n/sv.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/sv.po
Auto-merging addons/auth_ldap/i18n/bg.po
CONFLICT (content): Merge conflict in addons/auth_ldap/i18n/bg.po
Auto-merging addons/auth_signup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_signup/i18n/fi.po
Auto-merging addons/auth_totp_mail_enforce/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_totp_mail_enforce/i18n/fi.po
Auto-merging addons/base_automation/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_automation/i18n/sv.po
Auto-merging addons/base_import_module/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/bg.po
Auto-merging addons/base_import_module/i18n/fa.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/fa.po
Auto-merging addons/base_install_request/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_install_request/i18n/bg.po
Auto-merging addons/base_setup/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/bg.po
Auto-merging addons/base_setup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/fi.po
Auto-merging addons/base_setup/i18n/hi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/hi.po
Auto-merging addons/base_setup/i18n/id.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/id.po
Auto-merging addons/base_setup/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/sv.po
Auto-merging addons/base_sparse_field/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_sparse_field/i18n/bg.po
Auto-merging addons/base_vat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/bg.po
Auto-merging addons/base_vat/i18n/ru.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/ru.po
Auto-merging addons/board/i18n/bg.po
CONFLICT (content): Merge conflict in addons/board/i18n/bg.po
Auto-merging addons/bus/i18n/bg.po
CONFLICT (content): Merge conflict in addons/bus/i18n/bg.po
Auto-merging addons/bus/i18n/fa.po
CONFLICT (content): Merge conflict in addons/bus/i18n/fa.po
Auto-merging addons/calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/bg.po
Auto-merging addons/calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/fi.po
Auto-merging addons/calendar/i18n/id.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/id.po
Auto-merging addons/calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/sv.po
Auto-merging addons/calendar_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/bg.po
Auto-merging addons/calendar_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/fi.po
Auto-merging addons/calendar_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/sv.po
Auto-merging addons/contacts/i18n/sv.po
CONFLICT (content): Merge conflict in addons/contacts/i18n/sv.po
Auto-merging addons/crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm/i18n/bg.po
Auto-merging addons/crm/i18n/es.po
CONFLICT (content): Merge conflict in addons/crm/i18n/es.po
Auto-merging addons/crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fa.po
Auto-merging addons/crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fi.po
Auto-merging addons/crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm/i18n/id.po
Auto-merging addons/crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/crm/i18n/sv.po
Auto-merging addons/crm_iap_enrich/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/bg.po
Auto-merging addons/crm_iap_enrich/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/bg.po
Auto-merging addons/crm_iap_mine/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fa.po
Auto-merging addons/crm_iap_mine/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/id.po
Auto-merging addons/crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/bg.po
Auto-merging addons/crm_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/fi.po
Auto-merging addons/crm_mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/bg.po
Auto-merging addons/crm_mail_plugin/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/fi.po
Auto-merging addons/delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/fi.po
Auto-merging addons/delivery/i18n/sv.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/sv.po
Auto-merging addons/event/i18n/es.po
CONFLICT (content): Merge conflict in addons/event/i18n/es.po
Auto-merging addons/event/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event/i18n/es_419.po
Auto-merging addons/event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event/i18n/sv.po
Auto-merging addons/event_booth/i18n/es.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/es.po
Auto-merging addons/event_booth/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/sv.po
Auto-merging addons/event_booth_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_booth_sale/i18n/fi.po
Auto-merging addons/event_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/fi.po
Auto-merging addons/event_crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/sv.po
Auto-merging addons/event_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/es_419.po
Auto-merging addons/event_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/sv.po
Auto-merging addons/fleet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/fleet/i18n/sv.po
Auto-merging addons/gamification/i18n/sv.po
CONFLICT (content): Merge conflict in addons/gamification/i18n/sv.po
Auto-merging addons/google_calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/bg.po
Auto-merging addons/google_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/fi.po
Auto-merging addons/google_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/sv.po
Auto-merging addons/google_gmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/bg.po
Auto-merging addons/google_gmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/fi.po
Auto-merging addons/google_gmail/i18n/hi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/hi.po
Auto-merging addons/google_gmail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/sv.po
Auto-merging addons/google_recaptcha/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/bg.po
Auto-merging addons/google_recaptcha/i18n/fa.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/fa.po
Auto-merging addons/hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr/i18n/bg.po
Auto-merging addons/hr/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr/i18n/id.po
Auto-merging addons/hr/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr/i18n/my.po
Auto-merging addons/hr/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr/i18n/sv.po
Auto-merging addons/hr/i18n/th.po
CONFLICT (content): Merge conflict in addons/hr/i18n/th.po
Auto-merging addons/hr_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/bg.po
Auto-merging addons/hr_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/fa.po
Auto-merging addons/hr_attendance/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/my.po
Auto-merging addons/hr_attendance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/sv.po
Auto-merging addons/hr_contract/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/bg.po
Auto-merging addons/hr_contract/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/es.po
Auto-merging addons/hr_contract/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/hi.po
Auto-merging addons/hr_contract/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/id.po
Auto-merging addons/hr_contract/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/my.po
Auto-merging addons/hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/bg.po
Auto-merging addons/hr_expense/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/es.po
Auto-merging addons/hr_expense/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/fa.po
Auto-merging addons/hr_expense/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/id.po
Auto-merging addons/hr_expense/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/sv.po
Auto-merging addons/hr_fleet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_fleet/i18n/bg.po
Auto-merging addons/hr_gamification/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_gamification/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/da.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/da.po
Auto-merging addons/hr_holidays/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/es.po
Auto-merging addons/hr_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fa.po
Auto-merging addons/hr_holidays/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fi.po
Auto-merging addons/hr_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/hi.po
Auto-merging addons/hr_holidays/i18n/ru.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/ru.po
Auto-merging addons/hr_holidays/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sk.po
Auto-merging addons/hr_holidays/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sv.po
Auto-merging addons/hr_holidays_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/bg.po
Auto-merging addons/hr_holidays_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fa.po
Auto-merging addons/hr_holidays_attendance/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fi.po
Auto-merging addons/hr_homeworking/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/bg.po
Auto-merging addons/hr_homeworking/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/fa.po
Auto-merging addons/hr_hourly_cost/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/sk.po
Auto-merging addons/hr_recruitment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/es_419.po
Auto-merging addons/hr_recruitment/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/fi.po
Auto-merging addons/hr_recruitment/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/id.po
Auto-merging addons/hr_recruitment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/sv.po
Auto-merging addons/hr_skills/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/id.po
Auto-merging addons/hr_skills/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/sv.po
Auto-merging addons/hr_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/es_419.po
Auto-merging addons/hr_timesheet/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/id.po
Auto-merging addons/hr_timesheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/sv.po
Auto-merging addons/hr_work_entry/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_work_entry/i18n/sv.po
Auto-merging addons/iap_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/bg.po
Auto-merging addons/iap_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/fa.po
Auto-merging addons/im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/bg.po
Auto-merging addons/im_livechat/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/es_419.po
Auto-merging addons/im_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/fi.po
Auto-merging addons/im_livechat/i18n/id.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/id.po
Auto-merging addons/im_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/my.po
Auto-merging addons/im_livechat/i18n/sv.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/sv.po
Auto-merging addons/im_livechat_mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat_mail_bot/i18n/bg.po
Auto-merging addons/link_tracker/i18n/bg.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/bg.po
Auto-merging addons/link_tracker/i18n/fa.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fa.po
Auto-merging addons/link_tracker/i18n/fi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fi.po
Auto-merging addons/link_tracker/i18n/hi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/hi.po
Auto-merging addons/loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/bg.po
Auto-merging addons/loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/fa.po
Auto-merging addons/loyalty/i18n/it.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/it.po
Auto-merging addons/loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/lv.po
Auto-merging addons/loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/sv.po
Auto-merging addons/lunch/i18n/bg.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/bg.po
Auto-merging addons/lunch/i18n/es.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/es.po
Auto-merging addons/lunch/i18n/fa.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/fa.po
Auto-merging addons/lunch/i18n/my.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/my.po
Auto-merging addons/lunch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/sv.po
Auto-merging addons/mail/i18n/ar.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ar.po
Auto-merging addons/mail/i18n/az.po
CONFLICT (content): Merge conflict in addons/mail/i18n/az.po
Auto-merging addons/mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail/i18n/bg.po
Auto-merging addons/mail/i18n/da.po
CONFLICT (content): Merge conflict in addons/mail/i18n/da.po
Auto-merging addons/mail/i18n/de.po
CONFLICT (content): Merge conflict in addons/mail/i18n/de.po
Auto-merging addons/mail/i18n/es.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es.po
Auto-merging addons/mail/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es_419.po
Auto-merging addons/mail/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fa.po
Auto-merging addons/mail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fi.po
Auto-merging addons/mail/i18n/id.po
CONFLICT (content): Merge conflict in addons/mail/i18n/id.po
Auto-merging addons/mail/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail/i18n/lo.po
Auto-merging addons/mail/i18n/nl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/nl.po
Auto-merging addons/mail/i18n/pl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/pl.po
Auto-merging addons/mail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ru.po
Auto-merging addons/mail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail/i18n/sv.po
Auto-merging addons/mail/i18n/tr.po
CONFLICT (content): Merge conflict in addons/mail/i18n/tr.po
Auto-merging addons/mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_bot/i18n/bg.po
Auto-merging addons/mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/bg.po
Auto-merging addons/mail_group/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fa.po
Auto-merging addons/mail_group/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fi.po
Auto-merging addons/mail_group/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/lo.po
Auto-merging addons/mail_group/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/sv.po
Auto-merging addons/mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/bg.po
Auto-merging addons/mail_plugin/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/sv.po
Auto-merging addons/maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/bg.po
Auto-merging addons/maintenance/i18n/es.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/es.po
Auto-merging addons/maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sk.po
Auto-merging addons/maintenance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sv.po
Auto-merging addons/mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/bg.po
Auto-merging addons/mass_mailing/i18n/es.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es.po
Auto-merging addons/mass_mailing/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es_419.po
Auto-merging addons/mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fa.po
Auto-merging addons/mass_mailing/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fi.po
Auto-merging addons/mass_mailing/i18n/pt.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/pt.po
Auto-merging addons/mass_mailing/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/sv.po
Auto-merging addons/mass_mailing_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/bg.po
Auto-merging addons/mass_mailing_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/fa.po
Auto-merging addons/mass_mailing_crm_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm_sms/i18n/fa.po
Auto-merging addons/mass_mailing_event/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_event/i18n/bg.po
Auto-merging addons/mass_mailing_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/fi.po
Auto-merging addons/mass_mailing_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/sv.po
Auto-merging addons/mass_mailing_themes/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing_themes/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/fi.po
Auto-merging addons/microsoft_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/sv.po
Auto-merging addons/mrp/i18n/es.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/es.po
Auto-merging addons/mrp/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/fi.po
Auto-merging addons/mrp/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/id.po
Auto-merging addons/mrp/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/sv.po
Auto-merging addons/mrp_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp_account/i18n/id.po
Auto-merging addons/mrp_subcontracting/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/i18n/fi.po
Auto-merging addons/mrp_subcontracting_dropshipping/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/i18n/bg.po
Auto-merging addons/mrp_subcontracting_purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_purchase/i18n/fa.po
Auto-merging addons/onboarding/i18n/bg.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/bg.po
Auto-merging addons/onboarding/i18n/id.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/id.po
Auto-merging addons/partner_autocomplete/i18n/bg.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/bg.po
Auto-merging addons/partner_autocomplete/i18n/fa.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/fa.po
Auto-merging addons/payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment/i18n/bg.po
Auto-merging addons/payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment/i18n/fa.po
Auto-merging addons/payment/i18n/lt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/lt.po
Auto-merging addons/payment/i18n/my.po
CONFLICT (content): Merge conflict in addons/payment/i18n/my.po
Auto-merging addons/payment/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/pt.po
Auto-merging addons/payment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment/i18n/sv.po
Auto-merging addons/payment_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_adyen/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/pt.po
Auto-merging addons/payment_aps/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_aps/i18n/bg.po
Auto-merging addons/payment_asiapay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_asiapay/i18n/bg.po
Auto-merging addons/payment_authorize/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_authorize/i18n/bg.po
Auto-merging addons/payment_buckaroo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_buckaroo/i18n/bg.po
Auto-merging addons/payment_custom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/bg.po
Auto-merging addons/payment_custom/i18n/nl.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/nl.po
Auto-merging addons/payment_demo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/bg.po
Auto-merging addons/payment_demo/i18n/ru.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/ru.po
Auto-merging addons/payment_demo/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/sl.po
Auto-merging addons/payment_flutterwave/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/bg.po
Auto-merging addons/payment_flutterwave/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/fa.po
Auto-merging addons/payment_flutterwave/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/sl.po
Auto-merging addons/payment_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/bg.po
Auto-merging addons/payment_mercado_pago/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/sv.po
Auto-merging addons/payment_worldline/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/bg.po
Auto-merging addons/payment_worldline/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/pt.po
Auto-merging addons/point_of_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es.po
Auto-merging addons/point_of_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es_419.po
Auto-merging addons/point_of_sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/id.po
Auto-merging addons/point_of_sale/i18n/ja.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/ja.po
Auto-merging addons/point_of_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/sv.po
Auto-merging addons/portal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/portal/i18n/fi.po
Auto-merging addons/portal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/portal/i18n/sv.po
Auto-merging addons/pos_epson_printer/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/bg.po
Auto-merging addons/pos_epson_printer/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/fa.po
Auto-merging addons/pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/bg.po
Auto-merging addons/pos_hr/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/bg.po
Auto-merging addons/pos_loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/fi.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fi.po
Auto-merging addons/pos_loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/lv.po
Auto-merging addons/pos_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercado_pago/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/fa.po
Auto-merging addons/pos_mercury/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/hu.po
Auto-merging addons/pos_online_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/bg.po
Auto-merging addons/pos_online_payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/fa.po
Auto-merging addons/pos_online_payment/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/hu.po
Auto-merging addons/pos_online_payment_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment_self_order/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/fa.po
Auto-merging addons/pos_paytm/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/hu.po
Auto-merging addons/pos_razorpay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/bg.po
Auto-merging addons/pos_razorpay/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/bg.po
Auto-merging addons/pos_restaurant/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/fa.po
Auto-merging addons/pos_restaurant/i18n/hi.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hi.po
Auto-merging addons/pos_restaurant/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/ja.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/ja.po
Auto-merging addons/pos_restaurant_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/bg.po
Auto-merging addons/pos_restaurant_adyen/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/hu.po
Auto-merging addons/pos_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/bg.po
Auto-merging addons/pos_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/es.po
Auto-merging addons/pos_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/fa.po
Auto-merging addons/pos_sale_product_configurator/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/bg.po
Auto-merging addons/pos_sale_product_configurator/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/ar.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/ar.po
Auto-merging addons/pos_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/bg.po
Auto-merging addons/pos_self_order/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/id.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/id.po
Auto-merging addons/pos_self_order/i18n/nl.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/nl.po
Auto-merging addons/pos_self_order/i18n/tr.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/tr.po
Auto-merging addons/pos_self_order_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/bg.po
Auto-merging addons/pos_self_order_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/fa.po
Auto-merging addons/privacy_lookup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/privacy_lookup/i18n/fi.po
Auto-merging addons/product/i18n/es.po
CONFLICT (content): Merge conflict in addons/product/i18n/es.po
Auto-merging addons/product/i18n/fi.po
CONFLICT (content): Merge conflict in addons/product/i18n/fi.po
Auto-merging addons/product/i18n/sv.po
CONFLICT (content): Merge conflict in addons/product/i18n/sv.po
Auto-merging addons/project/i18n/es.po
CONFLICT (content): Merge conflict in addons/project/i18n/es.po
Auto-merging addons/project/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/project/i18n/es_419.po
Auto-merging addons/project/i18n/id.po
CONFLICT (content): Merge conflict in addons/project/i18n/id.po
Auto-merging addons/project/i18n/sv.po
CONFLICT (content): Merge conflict in addons/project/i18n/sv.po
Auto-merging addons/project_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/bg.po
Auto-merging addons/project_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/bg.po
Auto-merging addons/project_timesheet_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/hi.po
Auto-merging addons/project_todo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/bg.po
Auto-merging addons/project_todo/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/fa.po
Auto-merging addons/project_todo/i18n/pt.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/pt.po
Auto-merging addons/purchase/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es.po
Auto-merging addons/purchase/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es_419.po
Auto-merging addons/purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/fa.po
Auto-merging addons/purchase/i18n/ja.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/ja.po
Auto-merging addons/purchase/i18n/lt.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/lt.po
Auto-merging addons/purchase/i18n/my.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/my.po
Auto-merging addons/purchase/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/sv.po
Auto-merging addons/purchase_mrp/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/bg.po
Auto-merging addons/purchase_mrp/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/fa.po
Auto-merging addons/purchase_product_matrix/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/bg.po
Auto-merging addons/purchase_product_matrix/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/bg.po
Auto-merging addons/purchase_requisition/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/es.po
Auto-merging addons/purchase_requisition/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/sv.po
Auto-merging addons/purchase_requisition_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/bg.po
Auto-merging addons/purchase_requisition_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/bg.po
Auto-merging addons/purchase_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fi.po
Auto-merging addons/rating/i18n/bg.po
CONFLICT (content): Merge conflict in addons/rating/i18n/bg.po
Auto-merging addons/rating/i18n/fi.po
CONFLICT (content): Merge conflict in addons/rating/i18n/fi.po
Auto-merging addons/repair/i18n/bg.po
CONFLICT (content): Merge conflict in addons/repair/i18n/bg.po
Auto-merging addons/repair/i18n/es.po
CONFLICT (content): Merge conflict in addons/repair/i18n/es.po
Auto-merging addons/repair/i18n/fa.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fa.po
Auto-merging addons/repair/i18n/fi.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fi.po
Auto-merging addons/repair/i18n/sk.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sk.po
Auto-merging addons/repair/i18n/sv.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sv.po
Auto-merging addons/resource/i18n/bg.po
CONFLICT (content): Merge conflict in addons/resource/i18n/bg.po
Auto-merging addons/resource/i18n/hi.po
CONFLICT (content): Merge conflict in addons/resource/i18n/hi.po
Auto-merging addons/sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale/i18n/es.po
Auto-merging addons/sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fa.po
Auto-merging addons/sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fi.po
Auto-merging addons/sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale/i18n/id.po
Auto-merging addons/sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/sale/i18n/sv.po
Auto-merging addons/sale/i18n/th.po
CONFLICT (content): Merge conflict in addons/sale/i18n/th.po
Auto-merging addons/sale/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/sale/i18n/zh_CN.po
Auto-merging addons/sale_async_emails/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_async_emails/i18n/bg.po
Auto-merging addons/sale_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/fi.po
Auto-merging addons/sale_crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/id.po
Auto-merging addons/sale_management/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_management/i18n/id.po
Auto-merging addons/sale_pdf_quote_builder/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_pdf_quote_builder/i18n/id.po
Auto-merging addons/sale_project/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/fi.po
Auto-merging addons/sale_project/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/id.po
Auto-merging addons/sale_purchase/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_purchase/i18n/fi.po
Auto-merging addons/sale_stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/es.po
Auto-merging addons/sale_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/fi.po
Auto-merging addons/sale_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/bg.po
Auto-merging addons/sale_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/es_419.po
Auto-merging addons/sale_timesheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/fa.po
Auto-merging addons/sales_team/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/bg.po
Auto-merging addons/sales_team/i18n/id.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/id.po
Auto-merging addons/sales_team/i18n/my.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/my.po
Auto-merging addons/sms/i18n/bg.po
Auto-merging addons/sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fa.po
Auto-merging addons/sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fi.po
Auto-merging addons/sms/i18n/my.po
Auto-merging addons/snailmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/bg.po
Auto-merging addons/snailmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/fi.po
Auto-merging addons/snailmail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/ru.po
Auto-merging addons/snailmail_account/i18n/pl.po
CONFLICT (content): Merge conflict in addons/snailmail_account/i18n/pl.po
Auto-merging addons/social_media/i18n/bg.po
CONFLICT (content): Merge conflict in addons/social_media/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/ar.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/ar.po
Auto-merging addons/spreadsheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/es_419.po
Auto-merging addons/spreadsheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/fa.po
Auto-merging addons/spreadsheet/i18n/hi.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/hi.po
Auto-merging addons/spreadsheet/i18n/my.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/my.po
Auto-merging addons/spreadsheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/sv.po
Auto-merging addons/spreadsheet/i18n/tr.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/tr.po
Auto-merging addons/spreadsheet_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/bg.po
Auto-merging addons/spreadsheet_account/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/fa.po
Auto-merging addons/spreadsheet_dashboard/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/sv.po
Auto-merging addons/spreadsheet_dashboard_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_account/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_event_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_event_sale/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_sale/i18n/es_419.po
Auto-merging addons/stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es.po
Auto-merging addons/stock/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es_419.po
Auto-merging addons/stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock/i18n/fi.po
Auto-merging addons/stock/i18n/nl.po
CONFLICT (content): Merge conflict in addons/stock/i18n/nl.po
Auto-merging addons/stock/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock/i18n/sv.po
Auto-merging addons/stock_account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/fi.po
Auto-merging addons/stock_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/id.po
Auto-merging addons/stock_delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_delivery/i18n/fi.po
Auto-merging addons/stock_landed_costs/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/es.po
Auto-merging addons/stock_landed_costs/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/sv.po
Auto-merging addons/stock_picking_batch/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/es.po
Auto-merging addons/stock_picking_batch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/sv.po
Auto-merging addons/survey/i18n/bg.po
CONFLICT (content): Merge conflict in addons/survey/i18n/bg.po
Auto-merging addons/survey/i18n/es.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es.po
Auto-merging addons/survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es_419.po
Auto-merging addons/survey/i18n/fa.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fa.po
Auto-merging addons/survey/i18n/fi.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fi.po
Auto-merging addons/survey/i18n/lt.po
CONFLICT (content): Merge conflict in addons/survey/i18n/lt.po
Auto-merging addons/survey/i18n/my.po
CONFLICT (content): Merge conflict in addons/survey/i18n/my.po
Auto-merging addons/survey/i18n/sv.po
CONFLICT (content): Merge conflict in addons/survey/i18n/sv.po
Auto-merging addons/transifex/i18n/bg.po
CONFLICT (content): Merge conflict in addons/transifex/i18n/bg.po
Auto-merging addons/uom/i18n/ar.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ar.po
Auto-merging addons/uom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/uom/i18n/bg.po
Auto-merging addons/uom/i18n/es.po
CONFLICT (content): Merge conflict in addons/uom/i18n/es.po
Auto-merging addons/uom/i18n/fa.po
CONFLICT (content): Merge conflict in addons/uom/i18n/fa.po
Auto-merging addons/uom/i18n/hi.po
CONFLICT (content): Merge conflict in addons/uom/i18n/hi.po
Auto-merging addons/uom/i18n/id.po
CONFLICT (content): Merge conflict in addons/uom/i18n/id.po
Auto-merging addons/uom/i18n/ru.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ru.po
Auto-merging addons/uom/i18n/th.po
CONFLICT (content): Merge conflict in addons/uom/i18n/th.po
Auto-merging addons/uom/i18n/tr.po
CONFLICT (content): Merge conflict in addons/uom/i18n/tr.po
Auto-merging addons/uom/i18n/uk.po
CONFLICT (content): Merge conflict in addons/uom/i18n/uk.po
Auto-merging addons/utm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/utm/i18n/bg.po
Auto-merging addons/utm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/utm/i18n/fa.po
Auto-merging addons/utm/i18n/nl.po
CONFLICT (content): Merge conflict in addons/utm/i18n/nl.po
Auto-merging addons/web/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web/i18n/ar.po
Auto-merging addons/web/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web/i18n/bg.po
Auto-merging addons/web/i18n/ca.po
CONFLICT (content): Merge conflict in addons/web/i18n/ca.po
Auto-merging addons/web/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web/i18n/fa.po
Auto-merging addons/web/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web/i18n/fi.po
Auto-merging addons/web/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web/i18n/hi.po
Auto-merging addons/web/i18n/id.po
CONFLICT (content): Merge conflict in addons/web/i18n/id.po
Auto-merging addons/web/i18n/lt.po
CONFLICT (content): Merge conflict in addons/web/i18n/lt.po
Auto-merging addons/web/i18n/my.po
CONFLICT (content): Merge conflict in addons/web/i18n/my.po
Auto-merging addons/web/i18n/sv.po
CONFLICT (content): Merge conflict in addons/web/i18n/sv.po
Auto-merging addons/web/i18n/tr.po
CONFLICT (content): Merge conflict in addons/web/i18n/tr.po
Auto-merging addons/web_editor/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/ar.po
Auto-merging addons/web_editor/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/bg.po
Auto-merging addons/web_editor/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fa.po
Auto-merging addons/web_editor/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fi.po
Auto-merging addons/web_editor/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/hi.po
Auto-merging addons/web_editor/i18n/nl.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/nl.po
Auto-merging addons/web_editor/i18n/pt.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/pt.po
Auto-merging addons/web_hierarchy/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_hierarchy/i18n/bg.po
Auto-merging addons/web_tour/i18n/lo.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/lo.po
Auto-merging addons/web_tour/i18n/pl.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/pl.po
Auto-merging addons/web_unsplash/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_unsplash/i18n/bg.po
Auto-merging addons/website/i18n/ar.po
CONFLICT (content): Merge conflict in addons/website/i18n/ar.po
Auto-merging addons/website/i18n/de.po
CONFLICT (content): Merge conflict in addons/website/i18n/de.po
Auto-merging addons/website/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website/i18n/es_419.po
Auto-merging addons/website/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website/i18n/fa.po
Auto-merging addons/website/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website/i18n/fi.po
Auto-merging addons/website/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website/i18n/hi.po
Auto-merging addons/website/i18n/id.po
CONFLICT (content): Merge conflict in addons/website/i18n/id.po
Auto-merging addons/website/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website/i18n/lo.po
Auto-merging addons/website/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website/i18n/nl.po
Auto-merging addons/website/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website/i18n/pl.po
Auto-merging addons/website/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website/i18n/sv.po
Auto-merging addons/website/i18n/th.po
CONFLICT (content): Merge conflict in addons/website/i18n/th.po
Auto-merging addons/website/i18n/tr.po
CONFLICT (content): Merge conflict in addons/website/i18n/tr.po
Auto-merging addons/website_blog/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/bg.po
Auto-merging addons/website_blog/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/lt.po
Auto-merging addons/website_blog/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/my.po
Auto-merging addons/website_blog/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/nl.po
Auto-merging addons/website_blog/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/pl.po
Auto-merging addons/website_cf_turnstile/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/bg.po
Auto-merging addons/website_cf_turnstile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/pl.po
Auto-merging addons/website_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fa.po
Auto-merging addons/website_crm_iap_reveal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fi.po
Auto-merging addons/website_crm_iap_reveal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/sv.po
Auto-merging addons/website_crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_livechat/i18n/bg.po
Auto-merging addons/website_crm_partner_assign/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_partner_assign/i18n/fi.po
Auto-merging addons/website_event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event/i18n/sv.po
Auto-merging addons/website_event_exhibitor/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/es.po
Auto-merging addons/website_event_exhibitor/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/sv.po
Auto-merging addons/website_event_track/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es.po
Auto-merging addons/website_event_track/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es_419.po
Auto-merging addons/website_event_track/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/fi.po
Auto-merging addons/website_event_track/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/pl.po
Auto-merging addons/website_event_track/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/sv.po
Auto-merging addons/website_event_track_live_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_live_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/fa.po
Auto-merging addons/website_forum/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/bg.po
Auto-merging addons/website_forum/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/fi.po
Auto-merging addons/website_forum/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/hi.po
Auto-merging addons/website_forum/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/lt.po
Auto-merging addons/website_forum/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/my.po
Auto-merging addons/website_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/pl.po
Auto-merging addons/website_hr_recruitment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/bg.po
Auto-merging addons/website_hr_recruitment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/fa.po
Auto-merging addons/website_hr_recruitment/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/my.po
Auto-merging addons/website_hr_recruitment/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/nl.po
Auto-merging addons/website_jitsi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/bg.po
Auto-merging addons/website_jitsi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/fa.po
Auto-merging addons/website_links/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/bg.po
Auto-merging addons/website_links/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/lo.po
Auto-merging addons/website_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/bg.po
Auto-merging addons/website_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/my.po
Auto-merging addons/website_mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail/i18n/bg.po
Auto-merging addons/website_mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail_group/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/fa.po
Auto-merging addons/website_mass_mailing_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/bg.po
Auto-merging addons/website_mass_mailing_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/fa.po
Auto-merging addons/website_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/bg.po
Auto-merging addons/website_payment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/es_419.po
Auto-merging addons/website_payment/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/hi.po
Auto-merging addons/website_profile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/pl.po
Auto-merging addons/website_profile/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/sv.po
Auto-merging addons/website_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/fi.po
Auto-merging addons/website_sale/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/pl.po
Auto-merging addons/website_sale_comparison_wishlist/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_sale_comparison_wishlist/i18n/fa.po
Auto-merging addons/website_sale_loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_sale_loyalty/i18n/sv.po
Auto-merging addons/website_sale_mondialrelay/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale_mondialrelay/i18n/fi.po
Auto-merging addons/website_sale_stock/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale_stock/i18n/pl.po
Auto-merging addons/website_slides/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es.po
Auto-merging addons/website_slides/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es_419.po
Auto-merging addons/website_slides/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/fi.po
Auto-merging addons/website_slides/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/sv.po
Auto-merging addons/website_slides_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_forum/i18n/pl.po
Auto-merging addons/website_slides_survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/es_419.po
Auto-merging addons/website_slides_survey/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/pl.po
Auto-merging addons/website_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_sms/i18n/bg.po
Auto-merging addons/website_twitter/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_twitter/i18n/pl.po
Auto-merging odoo/addons/base/i18n/ca.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/ca.po
Auto-merging odoo/addons/base/i18n/es_419.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/es_419.po
Auto-merging odoo/addons/base/i18n/fi.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/fi.po
Auto-merging odoo/addons/base/i18n/id.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/id.po
Auto-merging odoo/addons/base/i18n/sv.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/sv.po
error: could not apply d1ff2894a302... [I18N] *: fetch latest Weblate translations
Could not apply d1ff2894a302... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/536)
Auto-merging addons/account/i18n/es.po
CONFLICT (content): Merge conflict in addons/account/i18n/es.po
Auto-merging addons/account/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/account/i18n/es_419.po
Auto-merging addons/account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/account/i18n/fi.po
Auto-merging addons/account/i18n/id.po
CONFLICT (content): Merge conflict in addons/account/i18n/id.po
Auto-merging addons/account/i18n/ja.po
CONFLICT (content): Merge conflict in addons/account/i18n/ja.po
Auto-merging addons/account/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account/i18n/nl.po
Auto-merging addons/account/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account/i18n/sv.po
Auto-merging addons/account_add_gln/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_add_gln/i18n/bg.po
Auto-merging addons/account_audit_trail/i18n/id.po
CONFLICT (content): Merge conflict in addons/account_audit_trail/i18n/id.po
Auto-merging addons/account_check_printing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_check_printing/i18n/bg.po
Auto-merging addons/account_debit_note/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/nl.po
Auto-merging addons/account_edi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/bg.po
Auto-merging addons/account_edi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/fa.po
Auto-merging addons/account_edi_proxy_client/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/bg.po
Auto-merging addons/account_edi_proxy_client/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/sv.po
Auto-merging addons/account_edi_ubl_cii/i18n/ar.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/ar.po
Auto-merging addons/account_edi_ubl_cii/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/fa.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
Auto-merging addons/account_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment/i18n/bg.po
Auto-merging addons/account_payment_term/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment_term/i18n/bg.po
Auto-merging addons/account_peppol/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/bg.po
Auto-merging addons/account_peppol/i18n/de.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/de.po
Auto-merging addons/account_peppol/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/fa.po
Auto-merging addons/account_peppol/i18n/lo.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/lo.po
Auto-merging addons/account_peppol/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/zh_CN.po
Auto-merging addons/account_peppol_selfbilling/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/bg.po
Auto-merging addons/account_peppol_selfbilling/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/fa.po
Auto-merging addons/account_peppol_selfbilling/i18n/zh_TW.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/zh_TW.po
Auto-merging addons/account_qr_code_emv/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_emv/i18n/bg.po
Auto-merging addons/account_qr_code_sepa/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_sepa/i18n/bg.po
Auto-merging addons/account_update_tax_tags/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_update_tax_tags/i18n/bg.po
Auto-merging addons/analytic/i18n/bg.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/bg.po
Auto-merging addons/analytic/i18n/fa.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/fa.po
Auto-merging addons/analytic/i18n/sv.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/sv.po
Auto-merging addons/auth_ldap/i18n/bg.po
CONFLICT (content): Merge conflict in addons/auth_ldap/i18n/bg.po
Auto-merging addons/auth_signup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_signup/i18n/fi.po
Auto-merging addons/auth_totp_mail_enforce/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_totp_mail_enforce/i18n/fi.po
Auto-merging addons/base_automation/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_automation/i18n/sv.po
Auto-merging addons/base_import_module/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/bg.po
Auto-merging addons/base_import_module/i18n/fa.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/fa.po
Auto-merging addons/base_install_request/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_install_request/i18n/bg.po
Auto-merging addons/base_setup/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/bg.po
Auto-merging addons/base_setup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/fi.po
Auto-merging addons/base_setup/i18n/hi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/hi.po
Auto-merging addons/base_setup/i18n/id.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/id.po
Auto-merging addons/base_setup/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/sv.po
Auto-merging addons/base_sparse_field/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_sparse_field/i18n/bg.po
Auto-merging addons/base_vat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/bg.po
Auto-merging addons/base_vat/i18n/ru.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/ru.po
Auto-merging addons/board/i18n/bg.po
CONFLICT (content): Merge conflict in addons/board/i18n/bg.po
Auto-merging addons/bus/i18n/bg.po
CONFLICT (content): Merge conflict in addons/bus/i18n/bg.po
Auto-merging addons/bus/i18n/fa.po
CONFLICT (content): Merge conflict in addons/bus/i18n/fa.po
Auto-merging addons/calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/bg.po
Auto-merging addons/calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/fi.po
Auto-merging addons/calendar/i18n/id.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/id.po
Auto-merging addons/calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/sv.po
Auto-merging addons/calendar_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/bg.po
Auto-merging addons/calendar_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/fi.po
Auto-merging addons/calendar_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/sv.po
Auto-merging addons/contacts/i18n/sv.po
CONFLICT (content): Merge conflict in addons/contacts/i18n/sv.po
Auto-merging addons/crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm/i18n/bg.po
Auto-merging addons/crm/i18n/es.po
CONFLICT (content): Merge conflict in addons/crm/i18n/es.po
Auto-merging addons/crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fa.po
Auto-merging addons/crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fi.po
Auto-merging addons/crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm/i18n/id.po
Auto-merging addons/crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/crm/i18n/sv.po
Auto-merging addons/crm_iap_enrich/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/bg.po
Auto-merging addons/crm_iap_enrich/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/bg.po
Auto-merging addons/crm_iap_mine/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fa.po
Auto-merging addons/crm_iap_mine/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/id.po
Auto-merging addons/crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/bg.po
Auto-merging addons/crm_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/fi.po
Auto-merging addons/crm_mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/bg.po
Auto-merging addons/crm_mail_plugin/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/fi.po
Auto-merging addons/delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/fi.po
Auto-merging addons/delivery/i18n/sv.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/sv.po
Auto-merging addons/event/i18n/es.po
CONFLICT (content): Merge conflict in addons/event/i18n/es.po
Auto-merging addons/event/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event/i18n/es_419.po
Auto-merging addons/event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event/i18n/sv.po
Auto-merging addons/event_booth/i18n/es.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/es.po
Auto-merging addons/event_booth/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/sv.po
Auto-merging addons/event_booth_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_booth_sale/i18n/fi.po
Auto-merging addons/event_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/fi.po
Auto-merging addons/event_crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/sv.po
Auto-merging addons/event_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/es_419.po
Auto-merging addons/event_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/sv.po
Auto-merging addons/fleet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/fleet/i18n/sv.po
Auto-merging addons/gamification/i18n/sv.po
CONFLICT (content): Merge conflict in addons/gamification/i18n/sv.po
Auto-merging addons/google_calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/bg.po
Auto-merging addons/google_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/fi.po
Auto-merging addons/google_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/sv.po
Auto-merging addons/google_gmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/bg.po
Auto-merging addons/google_gmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/fi.po
Auto-merging addons/google_gmail/i18n/hi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/hi.po
Auto-merging addons/google_gmail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/sv.po
Auto-merging addons/google_recaptcha/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/bg.po
Auto-merging addons/google_recaptcha/i18n/fa.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/fa.po
Auto-merging addons/hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr/i18n/bg.po
Auto-merging addons/hr/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr/i18n/id.po
Auto-merging addons/hr/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr/i18n/my.po
Auto-merging addons/hr/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr/i18n/sv.po
Auto-merging addons/hr/i18n/th.po
CONFLICT (content): Merge conflict in addons/hr/i18n/th.po
Auto-merging addons/hr_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/bg.po
Auto-merging addons/hr_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/fa.po
Auto-merging addons/hr_attendance/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/my.po
Auto-merging addons/hr_attendance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/sv.po
Auto-merging addons/hr_contract/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/bg.po
Auto-merging addons/hr_contract/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/es.po
Auto-merging addons/hr_contract/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/hi.po
Auto-merging addons/hr_contract/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/id.po
Auto-merging addons/hr_contract/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/my.po
Auto-merging addons/hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/bg.po
Auto-merging addons/hr_expense/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/es.po
Auto-merging addons/hr_expense/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/fa.po
Auto-merging addons/hr_expense/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/id.po
Auto-merging addons/hr_expense/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/sv.po
Auto-merging addons/hr_fleet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_fleet/i18n/bg.po
Auto-merging addons/hr_gamification/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_gamification/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/da.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/da.po
Auto-merging addons/hr_holidays/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/es.po
Auto-merging addons/hr_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fa.po
Auto-merging addons/hr_holidays/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fi.po
Auto-merging addons/hr_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/hi.po
Auto-merging addons/hr_holidays/i18n/ru.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/ru.po
Auto-merging addons/hr_holidays/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sk.po
Auto-merging addons/hr_holidays/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sv.po
Auto-merging addons/hr_holidays_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/bg.po
Auto-merging addons/hr_holidays_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fa.po
Auto-merging addons/hr_holidays_attendance/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fi.po
Auto-merging addons/hr_homeworking/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/bg.po
Auto-merging addons/hr_homeworking/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/fa.po
Auto-merging addons/hr_hourly_cost/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/sk.po
Auto-merging addons/hr_recruitment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/es_419.po
Auto-merging addons/hr_recruitment/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/fi.po
Auto-merging addons/hr_recruitment/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/id.po
Auto-merging addons/hr_recruitment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/sv.po
Auto-merging addons/hr_skills/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/id.po
Auto-merging addons/hr_skills/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/sv.po
Auto-merging addons/hr_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/es_419.po
Auto-merging addons/hr_timesheet/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/id.po
Auto-merging addons/hr_timesheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/sv.po
Auto-merging addons/hr_work_entry/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_work_entry/i18n/sv.po
Auto-merging addons/iap_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/bg.po
Auto-merging addons/iap_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/fa.po
Auto-merging addons/im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/bg.po
Auto-merging addons/im_livechat/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/es_419.po
Auto-merging addons/im_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/fi.po
Auto-merging addons/im_livechat/i18n/id.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/id.po
Auto-merging addons/im_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/my.po
Auto-merging addons/im_livechat/i18n/sv.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/sv.po
Auto-merging addons/im_livechat_mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat_mail_bot/i18n/bg.po
Auto-merging addons/link_tracker/i18n/bg.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/bg.po
Auto-merging addons/link_tracker/i18n/fa.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fa.po
Auto-merging addons/link_tracker/i18n/fi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fi.po
Auto-merging addons/link_tracker/i18n/hi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/hi.po
Auto-merging addons/loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/bg.po
Auto-merging addons/loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/fa.po
Auto-merging addons/loyalty/i18n/it.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/it.po
Auto-merging addons/loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/lv.po
Auto-merging addons/loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/sv.po
Auto-merging addons/lunch/i18n/bg.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/bg.po
Auto-merging addons/lunch/i18n/es.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/es.po
Auto-merging addons/lunch/i18n/fa.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/fa.po
Auto-merging addons/lunch/i18n/my.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/my.po
Auto-merging addons/lunch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/sv.po
Auto-merging addons/mail/i18n/ar.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ar.po
Auto-merging addons/mail/i18n/az.po
CONFLICT (content): Merge conflict in addons/mail/i18n/az.po
Auto-merging addons/mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail/i18n/bg.po
Auto-merging addons/mail/i18n/da.po
CONFLICT (content): Merge conflict in addons/mail/i18n/da.po
Auto-merging addons/mail/i18n/de.po
CONFLICT (content): Merge conflict in addons/mail/i18n/de.po
Auto-merging addons/mail/i18n/es.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es.po
Auto-merging addons/mail/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es_419.po
Auto-merging addons/mail/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fa.po
Auto-merging addons/mail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fi.po
Auto-merging addons/mail/i18n/id.po
CONFLICT (content): Merge conflict in addons/mail/i18n/id.po
Auto-merging addons/mail/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail/i18n/lo.po
Auto-merging addons/mail/i18n/nl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/nl.po
Auto-merging addons/mail/i18n/pl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/pl.po
Auto-merging addons/mail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ru.po
Auto-merging addons/mail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail/i18n/sv.po
Auto-merging addons/mail/i18n/tr.po
CONFLICT (content): Merge conflict in addons/mail/i18n/tr.po
Auto-merging addons/mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_bot/i18n/bg.po
Auto-merging addons/mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/bg.po
Auto-merging addons/mail_group/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fa.po
Auto-merging addons/mail_group/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fi.po
Auto-merging addons/mail_group/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/lo.po
Auto-merging addons/mail_group/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/sv.po
Auto-merging addons/mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/bg.po
Auto-merging addons/mail_plugin/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/sv.po
Auto-merging addons/maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/bg.po
Auto-merging addons/maintenance/i18n/es.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/es.po
Auto-merging addons/maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sk.po
Auto-merging addons/maintenance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sv.po
Auto-merging addons/mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/bg.po
Auto-merging addons/mass_mailing/i18n/es.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es.po
Auto-merging addons/mass_mailing/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es_419.po
Auto-merging addons/mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fa.po
Auto-merging addons/mass_mailing/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fi.po
Auto-merging addons/mass_mailing/i18n/pt.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/pt.po
Auto-merging addons/mass_mailing/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/sv.po
Auto-merging addons/mass_mailing_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/bg.po
Auto-merging addons/mass_mailing_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/fa.po
Auto-merging addons/mass_mailing_crm_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm_sms/i18n/fa.po
Auto-merging addons/mass_mailing_event/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_event/i18n/bg.po
Auto-merging addons/mass_mailing_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/fi.po
Auto-merging addons/mass_mailing_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/sv.po
Auto-merging addons/mass_mailing_themes/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing_themes/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/fi.po
Auto-merging addons/microsoft_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/sv.po
Auto-merging addons/mrp/i18n/es.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/es.po
Auto-merging addons/mrp/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/fi.po
Auto-merging addons/mrp/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/id.po
Auto-merging addons/mrp/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/sv.po
Auto-merging addons/mrp_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp_account/i18n/id.po
Auto-merging addons/mrp_subcontracting/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/i18n/fi.po
Auto-merging addons/mrp_subcontracting_dropshipping/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/i18n/bg.po
Auto-merging addons/mrp_subcontracting_purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_purchase/i18n/fa.po
Auto-merging addons/onboarding/i18n/bg.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/bg.po
Auto-merging addons/onboarding/i18n/id.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/id.po
Auto-merging addons/partner_autocomplete/i18n/bg.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/bg.po
Auto-merging addons/partner_autocomplete/i18n/fa.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/fa.po
Auto-merging addons/payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment/i18n/bg.po
Auto-merging addons/payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment/i18n/fa.po
Auto-merging addons/payment/i18n/lt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/lt.po
Auto-merging addons/payment/i18n/my.po
CONFLICT (content): Merge conflict in addons/payment/i18n/my.po
Auto-merging addons/payment/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/pt.po
Auto-merging addons/payment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment/i18n/sv.po
Auto-merging addons/payment_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_adyen/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/pt.po
Auto-merging addons/payment_aps/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_aps/i18n/bg.po
Auto-merging addons/payment_asiapay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_asiapay/i18n/bg.po
Auto-merging addons/payment_authorize/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_authorize/i18n/bg.po
Auto-merging addons/payment_buckaroo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_buckaroo/i18n/bg.po
Auto-merging addons/payment_custom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/bg.po
Auto-merging addons/payment_custom/i18n/nl.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/nl.po
Auto-merging addons/payment_demo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/bg.po
Auto-merging addons/payment_demo/i18n/ru.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/ru.po
Auto-merging addons/payment_demo/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/sl.po
Auto-merging addons/payment_flutterwave/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/bg.po
Auto-merging addons/payment_flutterwave/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/fa.po
Auto-merging addons/payment_flutterwave/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/sl.po
Auto-merging addons/payment_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/bg.po
Auto-merging addons/payment_mercado_pago/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/sv.po
Auto-merging addons/payment_worldline/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/bg.po
Auto-merging addons/payment_worldline/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/pt.po
Auto-merging addons/point_of_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es.po
Auto-merging addons/point_of_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es_419.po
Auto-merging addons/point_of_sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/id.po
Auto-merging addons/point_of_sale/i18n/ja.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/ja.po
Auto-merging addons/point_of_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/sv.po
Auto-merging addons/portal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/portal/i18n/fi.po
Auto-merging addons/portal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/portal/i18n/sv.po
Auto-merging addons/pos_epson_printer/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/bg.po
Auto-merging addons/pos_epson_printer/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/fa.po
Auto-merging addons/pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/bg.po
Auto-merging addons/pos_hr/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/bg.po
Auto-merging addons/pos_loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/fi.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fi.po
Auto-merging addons/pos_loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/lv.po
Auto-merging addons/pos_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercado_pago/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/fa.po
Auto-merging addons/pos_mercury/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/hu.po
Auto-merging addons/pos_online_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/bg.po
Auto-merging addons/pos_online_payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/fa.po
Auto-merging addons/pos_online_payment/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/hu.po
Auto-merging addons/pos_online_payment_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment_self_order/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/fa.po
Auto-merging addons/pos_paytm/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/hu.po
Auto-merging addons/pos_razorpay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/bg.po
Auto-merging addons/pos_razorpay/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/bg.po
Auto-merging addons/pos_restaurant/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/fa.po
Auto-merging addons/pos_restaurant/i18n/hi.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hi.po
Auto-merging addons/pos_restaurant/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/ja.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/ja.po
Auto-merging addons/pos_restaurant_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/bg.po
Auto-merging addons/pos_restaurant_adyen/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/hu.po
Auto-merging addons/pos_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/bg.po
Auto-merging addons/pos_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/es.po
Auto-merging addons/pos_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/fa.po
Auto-merging addons/pos_sale_product_configurator/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/bg.po
Auto-merging addons/pos_sale_product_configurator/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/ar.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/ar.po
Auto-merging addons/pos_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/bg.po
Auto-merging addons/pos_self_order/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/id.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/id.po
Auto-merging addons/pos_self_order/i18n/nl.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/nl.po
Auto-merging addons/pos_self_order/i18n/tr.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/tr.po
Auto-merging addons/pos_self_order_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/bg.po
Auto-merging addons/pos_self_order_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/fa.po
Auto-merging addons/privacy_lookup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/privacy_lookup/i18n/fi.po
Auto-merging addons/product/i18n/es.po
CONFLICT (content): Merge conflict in addons/product/i18n/es.po
Auto-merging addons/product/i18n/fi.po
CONFLICT (content): Merge conflict in addons/product/i18n/fi.po
Auto-merging addons/product/i18n/sv.po
CONFLICT (content): Merge conflict in addons/product/i18n/sv.po
Auto-merging addons/project/i18n/es.po
CONFLICT (content): Merge conflict in addons/project/i18n/es.po
Auto-merging addons/project/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/project/i18n/es_419.po
Auto-merging addons/project/i18n/id.po
CONFLICT (content): Merge conflict in addons/project/i18n/id.po
Auto-merging addons/project/i18n/sv.po
CONFLICT (content): Merge conflict in addons/project/i18n/sv.po
Auto-merging addons/project_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/bg.po
Auto-merging addons/project_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/bg.po
Auto-merging addons/project_timesheet_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/hi.po
Auto-merging addons/project_todo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/bg.po
Auto-merging addons/project_todo/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/fa.po
Auto-merging addons/project_todo/i18n/pt.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/pt.po
Auto-merging addons/purchase/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es.po
Auto-merging addons/purchase/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es_419.po
Auto-merging addons/purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/fa.po
Auto-merging addons/purchase/i18n/ja.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/ja.po
Auto-merging addons/purchase/i18n/lt.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/lt.po
Auto-merging addons/purchase/i18n/my.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/my.po
Auto-merging addons/purchase/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/sv.po
Auto-merging addons/purchase_mrp/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/bg.po
Auto-merging addons/purchase_mrp/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/fa.po
Auto-merging addons/purchase_product_matrix/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/bg.po
Auto-merging addons/purchase_product_matrix/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/bg.po
Auto-merging addons/purchase_requisition/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/es.po
Auto-merging addons/purchase_requisition/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/sv.po
Auto-merging addons/purchase_requisition_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/bg.po
Auto-merging addons/purchase_requisition_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/bg.po
Auto-merging addons/purchase_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fi.po
Auto-merging addons/rating/i18n/bg.po
CONFLICT (content): Merge conflict in addons/rating/i18n/bg.po
Auto-merging addons/rating/i18n/fi.po
CONFLICT (content): Merge conflict in addons/rating/i18n/fi.po
Auto-merging addons/repair/i18n/bg.po
CONFLICT (content): Merge conflict in addons/repair/i18n/bg.po
Auto-merging addons/repair/i18n/es.po
CONFLICT (content): Merge conflict in addons/repair/i18n/es.po
Auto-merging addons/repair/i18n/fa.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fa.po
Auto-merging addons/repair/i18n/fi.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fi.po
Auto-merging addons/repair/i18n/sk.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sk.po
Auto-merging addons/repair/i18n/sv.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sv.po
Auto-merging addons/resource/i18n/bg.po
CONFLICT (content): Merge conflict in addons/resource/i18n/bg.po
Auto-merging addons/resource/i18n/hi.po
CONFLICT (content): Merge conflict in addons/resource/i18n/hi.po
Auto-merging addons/sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale/i18n/es.po
Auto-merging addons/sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fa.po
Auto-merging addons/sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fi.po
Auto-merging addons/sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale/i18n/id.po
Auto-merging addons/sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/sale/i18n/sv.po
Auto-merging addons/sale/i18n/th.po
CONFLICT (content): Merge conflict in addons/sale/i18n/th.po
Auto-merging addons/sale/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/sale/i18n/zh_CN.po
Auto-merging addons/sale_async_emails/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_async_emails/i18n/bg.po
Auto-merging addons/sale_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/fi.po
Auto-merging addons/sale_crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/id.po
Auto-merging addons/sale_management/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_management/i18n/id.po
Auto-merging addons/sale_pdf_quote_builder/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_pdf_quote_builder/i18n/id.po
Auto-merging addons/sale_project/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/fi.po
Auto-merging addons/sale_project/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/id.po
Auto-merging addons/sale_purchase/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_purchase/i18n/fi.po
Auto-merging addons/sale_stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/es.po
Auto-merging addons/sale_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/fi.po
Auto-merging addons/sale_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/bg.po
Auto-merging addons/sale_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/es_419.po
Auto-merging addons/sale_timesheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/fa.po
Auto-merging addons/sales_team/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/bg.po
Auto-merging addons/sales_team/i18n/id.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/id.po
Auto-merging addons/sales_team/i18n/my.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/my.po
Auto-merging addons/sms/i18n/bg.po
Auto-merging addons/sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fa.po
Auto-merging addons/sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fi.po
Auto-merging addons/sms/i18n/my.po
Auto-merging addons/snailmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/bg.po
Auto-merging addons/snailmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/fi.po
Auto-merging addons/snailmail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/ru.po
Auto-merging addons/snailmail_account/i18n/pl.po
CONFLICT (content): Merge conflict in addons/snailmail_account/i18n/pl.po
Auto-merging addons/social_media/i18n/bg.po
CONFLICT (content): Merge conflict in addons/social_media/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/ar.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/ar.po
Auto-merging addons/spreadsheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/es_419.po
Auto-merging addons/spreadsheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/fa.po
Auto-merging addons/spreadsheet/i18n/hi.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/hi.po
Auto-merging addons/spreadsheet/i18n/my.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/my.po
Auto-merging addons/spreadsheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/sv.po
Auto-merging addons/spreadsheet/i18n/tr.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/tr.po
Auto-merging addons/spreadsheet_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/bg.po
Auto-merging addons/spreadsheet_account/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/fa.po
Auto-merging addons/spreadsheet_dashboard/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/sv.po
Auto-merging addons/spreadsheet_dashboard_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_account/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_event_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_event_sale/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_sale/i18n/es_419.po
Auto-merging addons/stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es.po
Auto-merging addons/stock/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es_419.po
Auto-merging addons/stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock/i18n/fi.po
Auto-merging addons/stock/i18n/nl.po
CONFLICT (content): Merge conflict in addons/stock/i18n/nl.po
Auto-merging addons/stock/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock/i18n/sv.po
Auto-merging addons/stock_account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/fi.po
Auto-merging addons/stock_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/id.po
Auto-merging addons/stock_delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_delivery/i18n/fi.po
Auto-merging addons/stock_landed_costs/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/es.po
Auto-merging addons/stock_landed_costs/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/sv.po
Auto-merging addons/stock_picking_batch/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/es.po
Auto-merging addons/stock_picking_batch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/sv.po
Auto-merging addons/survey/i18n/bg.po
CONFLICT (content): Merge conflict in addons/survey/i18n/bg.po
Auto-merging addons/survey/i18n/es.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es.po
Auto-merging addons/survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es_419.po
Auto-merging addons/survey/i18n/fa.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fa.po
Auto-merging addons/survey/i18n/fi.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fi.po
Auto-merging addons/survey/i18n/lt.po
CONFLICT (content): Merge conflict in addons/survey/i18n/lt.po
Auto-merging addons/survey/i18n/my.po
CONFLICT (content): Merge conflict in addons/survey/i18n/my.po
Auto-merging addons/survey/i18n/sv.po
CONFLICT (content): Merge conflict in addons/survey/i18n/sv.po
Auto-merging addons/transifex/i18n/bg.po
CONFLICT (content): Merge conflict in addons/transifex/i18n/bg.po
Auto-merging addons/uom/i18n/ar.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ar.po
Auto-merging addons/uom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/uom/i18n/bg.po
Auto-merging addons/uom/i18n/es.po
CONFLICT (content): Merge conflict in addons/uom/i18n/es.po
Auto-merging addons/uom/i18n/fa.po
CONFLICT (content): Merge conflict in addons/uom/i18n/fa.po
Auto-merging addons/uom/i18n/hi.po
CONFLICT (content): Merge conflict in addons/uom/i18n/hi.po
Auto-merging addons/uom/i18n/id.po
CONFLICT (content): Merge conflict in addons/uom/i18n/id.po
Auto-merging addons/uom/i18n/ru.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ru.po
Auto-merging addons/uom/i18n/th.po
CONFLICT (content): Merge conflict in addons/uom/i18n/th.po
Auto-merging addons/uom/i18n/tr.po
CONFLICT (content): Merge conflict in addons/uom/i18n/tr.po
Auto-merging addons/uom/i18n/uk.po
CONFLICT (content): Merge conflict in addons/uom/i18n/uk.po
Auto-merging addons/utm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/utm/i18n/bg.po
Auto-merging addons/utm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/utm/i18n/fa.po
Auto-merging addons/utm/i18n/nl.po
CONFLICT (content): Merge conflict in addons/utm/i18n/nl.po
Auto-merging addons/web/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web/i18n/ar.po
Auto-merging addons/web/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web/i18n/bg.po
Auto-merging addons/web/i18n/ca.po
CONFLICT (content): Merge conflict in addons/web/i18n/ca.po
Auto-merging addons/web/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web/i18n/fa.po
Auto-merging addons/web/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web/i18n/fi.po
Auto-merging addons/web/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web/i18n/hi.po
Auto-merging addons/web/i18n/id.po
CONFLICT (content): Merge conflict in addons/web/i18n/id.po
Auto-merging addons/web/i18n/lt.po
CONFLICT (content): Merge conflict in addons/web/i18n/lt.po
Auto-merging addons/web/i18n/my.po
CONFLICT (content): Merge conflict in addons/web/i18n/my.po
Auto-merging addons/web/i18n/sv.po
CONFLICT (content): Merge conflict in addons/web/i18n/sv.po
Auto-merging addons/web/i18n/tr.po
CONFLICT (content): Merge conflict in addons/web/i18n/tr.po
Auto-merging addons/web_editor/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/ar.po
Auto-merging addons/web_editor/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/bg.po
Auto-merging addons/web_editor/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fa.po
Auto-merging addons/web_editor/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fi.po
Auto-merging addons/web_editor/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/hi.po
Auto-merging addons/web_editor/i18n/nl.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/nl.po
Auto-merging addons/web_editor/i18n/pt.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/pt.po
Auto-merging addons/web_hierarchy/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_hierarchy/i18n/bg.po
Auto-merging addons/web_tour/i18n/lo.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/lo.po
Auto-merging addons/web_tour/i18n/pl.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/pl.po
Auto-merging addons/web_unsplash/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_unsplash/i18n/bg.po
Auto-merging addons/website/i18n/ar.po
CONFLICT (content): Merge conflict in addons/website/i18n/ar.po
Auto-merging addons/website/i18n/de.po
CONFLICT (content): Merge conflict in addons/website/i18n/de.po
Auto-merging addons/website/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website/i18n/es_419.po
Auto-merging addons/website/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website/i18n/fa.po
Auto-merging addons/website/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website/i18n/fi.po
Auto-merging addons/website/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website/i18n/hi.po
Auto-merging addons/website/i18n/id.po
CONFLICT (content): Merge conflict in addons/website/i18n/id.po
Auto-merging addons/website/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website/i18n/lo.po
Auto-merging addons/website/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website/i18n/nl.po
Auto-merging addons/website/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website/i18n/pl.po
Auto-merging addons/website/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website/i18n/sv.po
Auto-merging addons/website/i18n/th.po
CONFLICT (content): Merge conflict in addons/website/i18n/th.po
Auto-merging addons/website/i18n/tr.po
CONFLICT (content): Merge conflict in addons/website/i18n/tr.po
Auto-merging addons/website_blog/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/bg.po
Auto-merging addons/website_blog/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/lt.po
Auto-merging addons/website_blog/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/my.po
Auto-merging addons/website_blog/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/nl.po
Auto-merging addons/website_blog/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/pl.po
Auto-merging addons/website_cf_turnstile/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/bg.po
Auto-merging addons/website_cf_turnstile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/pl.po
Auto-merging addons/website_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fa.po
Auto-merging addons/website_crm_iap_reveal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fi.po
Auto-merging addons/website_crm_iap_reveal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/sv.po
Auto-merging addons/website_crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_livechat/i18n/bg.po
Auto-merging addons/website_crm_partner_assign/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_partner_assign/i18n/fi.po
Auto-merging addons/website_event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event/i18n/sv.po
Auto-merging addons/website_event_exhibitor/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/es.po
Auto-merging addons/website_event_exhibitor/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/sv.po
Auto-merging addons/website_event_track/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es.po
Auto-merging addons/website_event_track/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es_419.po
Auto-merging addons/website_event_track/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/fi.po
Auto-merging addons/website_event_track/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/pl.po
Auto-merging addons/website_event_track/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/sv.po
Auto-merging addons/website_event_track_live_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_live_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/fa.po
Auto-merging addons/website_forum/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/bg.po
Auto-merging addons/website_forum/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/fi.po
Auto-merging addons/website_forum/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/hi.po
Auto-merging addons/website_forum/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/lt.po
Auto-merging addons/website_forum/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/my.po
Auto-merging addons/website_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/pl.po
Auto-merging addons/website_hr_recruitment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/bg.po
Auto-merging addons/website_hr_recruitment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/fa.po
Auto-merging addons/website_hr_recruitment/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/my.po
Auto-merging addons/website_hr_recruitment/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/nl.po
Auto-merging addons/website_jitsi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/bg.po
Auto-merging addons/website_jitsi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/fa.po
Auto-merging addons/website_links/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/bg.po
Auto-merging addons/website_links/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/lo.po
Auto-merging addons/website_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/bg.po
Auto-merging addons/website_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/my.po
Auto-merging addons/website_mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail/i18n/bg.po
Auto-merging addons/website_mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail_group/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/fa.po
Auto-merging addons/website_mass_mailing_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/bg.po
Auto-merging addons/website_mass_mailing_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/fa.po
Auto-merging addons/website_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/bg.po
Auto-merging addons/website_payment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/es_419.po
Auto-merging addons/website_payment/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/hi.po
Auto-merging addons/website_profile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/pl.po
Auto-merging addons/website_profile/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/sv.po
Auto-merging addons/website_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/fi.po
Auto-merging addons/website_sale/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/pl.po
Auto-merging addons/website_sale_comparison_wishlist/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_sale_comparison_wishlist/i18n/fa.po
Auto-merging addons/website_sale_loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_sale_loyalty/i18n/sv.po
Auto-merging addons/website_sale_mondialrelay/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale_mondialrelay/i18n/fi.po
Auto-merging addons/website_sale_stock/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale_stock/i18n/pl.po
Auto-merging addons/website_slides/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es.po
Auto-merging addons/website_slides/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es_419.po
Auto-merging addons/website_slides/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/fi.po
Auto-merging addons/website_slides/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/sv.po
Auto-merging addons/website_slides_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_forum/i18n/pl.po
Auto-merging addons/website_slides_survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/es_419.po
Auto-merging addons/website_slides_survey/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/pl.po
Auto-merging addons/website_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_sms/i18n/bg.po
Auto-merging addons/website_twitter/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_twitter/i18n/pl.po
Auto-merging odoo/addons/base/i18n/ca.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/ca.po
Auto-merging odoo/addons/base/i18n/es_419.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/es_419.po
Auto-merging odoo/addons/base/i18n/fi.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/fi.po
Auto-merging odoo/addons/base/i18n/id.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/id.po
Auto-merging odoo/addons/base/i18n/sv.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/sv.po
error: could not apply d1ff2894a302... [I18N] *: fetch latest Weblate translations
Could not apply d1ff2894a302... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

weblate:commit

Changes committed

Changes committed 08/26/2026

None

Repository rebase failed

Rebasing (1/28)
Auto-merging appointment/i18n/sv.po
CONFLICT (content): Merge conflict in appointment/i18n/sv.po
Auto-merging documents/i18n/sv.po
CONFLICT (content): Merge conflict in documents/i18n/sv.po
Auto-merging documents_spreadsheet_crm/i18n/bg.po
CONFLICT (content): Merge conflict in documents_spreadsheet_crm/i18n/bg.po
Auto-merging helpdesk/i18n/sv.po
CONFLICT (content): Merge conflict in helpdesk/i18n/sv.po
Auto-merging hr_appraisal/i18n/sv.po
CONFLICT (content): Merge conflict in hr_appraisal/i18n/sv.po
Auto-merging hr_payroll/i18n/es.po
CONFLICT (content): Merge conflict in hr_payroll/i18n/es.po
Auto-merging hr_referral/i18n/sv.po
CONFLICT (content): Merge conflict in hr_referral/i18n/sv.po
Auto-merging knowledge/i18n/sv.po
CONFLICT (content): Merge conflict in knowledge/i18n/sv.po
Auto-merging marketing_automation/i18n/sv.po
CONFLICT (content): Merge conflict in marketing_automation/i18n/sv.po
Auto-merging sale_subscription/i18n/es_419.po
CONFLICT (content): Merge conflict in sale_subscription/i18n/es_419.po
Auto-merging sign/i18n/sv.po
CONFLICT (content): Merge conflict in sign/i18n/sv.po
error: could not apply 6da7b034ac2... [I18N] *: fetch latest Weblate translations
Could not apply 6da7b034ac2... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/28)
Auto-merging appointment/i18n/sv.po
CONFLICT (content): Merge conflict in appointment/i18n/sv.po
Auto-merging documents/i18n/sv.po
CONFLICT (content): Merge conflict in documents/i18n/sv.po
Auto-merging documents_spreadsheet_crm/i18n/bg.po
CONFLICT (content): Merge conflict in documents_spreadsheet_crm/i18n/bg.po
Auto-merging helpdesk/i18n/sv.po
CONFLICT (content): Merge conflict in helpdesk/i18n/sv.po
Auto-merging hr_appraisal/i18n/sv.po
CONFLICT (content): Merge conflict in hr_appraisal/i18n/sv.po
Auto-merging hr_payroll/i18n/es.po
CONFLICT (content): Merge conflict in hr_payroll/i18n/es.po
Auto-merging hr_referral/i18n/sv.po
CONFLICT (content): Merge conflict in hr_referral/i18n/sv.po
Auto-merging knowledge/i18n/sv.po
CONFLICT (content): Merge conflict in knowledge/i18n/sv.po
Auto-merging marketing_automation/i18n/sv.po
CONFLICT (content): Merge conflict in marketing_automation/i18n/sv.po
Auto-merging sale_subscription/i18n/es_419.po
CONFLICT (content): Merge conflict in sale_subscription/i18n/es_419.po
Auto-merging sign/i18n/sv.po
CONFLICT (content): Merge conflict in sign/i18n/sv.po
error: could not apply 6da7b034ac2... [I18N] *: fetch latest Weblate translations
Could not apply 6da7b034ac2... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/536)
Auto-merging addons/account/i18n/es.po
CONFLICT (content): Merge conflict in addons/account/i18n/es.po
Auto-merging addons/account/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/account/i18n/es_419.po
Auto-merging addons/account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/account/i18n/fi.po
Auto-merging addons/account/i18n/id.po
CONFLICT (content): Merge conflict in addons/account/i18n/id.po
Auto-merging addons/account/i18n/ja.po
CONFLICT (content): Merge conflict in addons/account/i18n/ja.po
Auto-merging addons/account/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account/i18n/nl.po
Auto-merging addons/account/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account/i18n/sv.po
Auto-merging addons/account_add_gln/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_add_gln/i18n/bg.po
Auto-merging addons/account_audit_trail/i18n/id.po
CONFLICT (content): Merge conflict in addons/account_audit_trail/i18n/id.po
Auto-merging addons/account_check_printing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_check_printing/i18n/bg.po
Auto-merging addons/account_debit_note/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/bg.po
Auto-merging addons/account_debit_note_sequence/i18n/nl.po
CONFLICT (content): Merge conflict in addons/account_debit_note_sequence/i18n/nl.po
Auto-merging addons/account_edi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/bg.po
Auto-merging addons/account_edi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi/i18n/fa.po
Auto-merging addons/account_edi_proxy_client/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/bg.po
Auto-merging addons/account_edi_proxy_client/i18n/sv.po
CONFLICT (content): Merge conflict in addons/account_edi_proxy_client/i18n/sv.po
Auto-merging addons/account_edi_ubl_cii/i18n/ar.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/ar.po
Auto-merging addons/account_edi_ubl_cii/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii/i18n/fa.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/bg.po
Auto-merging addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_edi_ubl_cii_tax_extension/i18n/fa.po
Auto-merging addons/account_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment/i18n/bg.po
Auto-merging addons/account_payment_term/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_payment_term/i18n/bg.po
Auto-merging addons/account_peppol/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/bg.po
Auto-merging addons/account_peppol/i18n/de.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/de.po
Auto-merging addons/account_peppol/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/fa.po
Auto-merging addons/account_peppol/i18n/lo.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/lo.po
Auto-merging addons/account_peppol/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/account_peppol/i18n/zh_CN.po
Auto-merging addons/account_peppol_selfbilling/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/bg.po
Auto-merging addons/account_peppol_selfbilling/i18n/fa.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/fa.po
Auto-merging addons/account_peppol_selfbilling/i18n/zh_TW.po
CONFLICT (content): Merge conflict in addons/account_peppol_selfbilling/i18n/zh_TW.po
Auto-merging addons/account_qr_code_emv/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_emv/i18n/bg.po
Auto-merging addons/account_qr_code_sepa/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_qr_code_sepa/i18n/bg.po
Auto-merging addons/account_update_tax_tags/i18n/bg.po
CONFLICT (content): Merge conflict in addons/account_update_tax_tags/i18n/bg.po
Auto-merging addons/analytic/i18n/bg.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/bg.po
Auto-merging addons/analytic/i18n/fa.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/fa.po
Auto-merging addons/analytic/i18n/sv.po
CONFLICT (content): Merge conflict in addons/analytic/i18n/sv.po
Auto-merging addons/auth_ldap/i18n/bg.po
CONFLICT (content): Merge conflict in addons/auth_ldap/i18n/bg.po
Auto-merging addons/auth_signup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_signup/i18n/fi.po
Auto-merging addons/auth_totp_mail_enforce/i18n/fi.po
CONFLICT (content): Merge conflict in addons/auth_totp_mail_enforce/i18n/fi.po
Auto-merging addons/base_automation/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_automation/i18n/sv.po
Auto-merging addons/base_import_module/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/bg.po
Auto-merging addons/base_import_module/i18n/fa.po
CONFLICT (content): Merge conflict in addons/base_import_module/i18n/fa.po
Auto-merging addons/base_install_request/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_install_request/i18n/bg.po
Auto-merging addons/base_setup/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/bg.po
Auto-merging addons/base_setup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/fi.po
Auto-merging addons/base_setup/i18n/hi.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/hi.po
Auto-merging addons/base_setup/i18n/id.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/id.po
Auto-merging addons/base_setup/i18n/sv.po
CONFLICT (content): Merge conflict in addons/base_setup/i18n/sv.po
Auto-merging addons/base_sparse_field/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_sparse_field/i18n/bg.po
Auto-merging addons/base_vat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/bg.po
Auto-merging addons/base_vat/i18n/ru.po
CONFLICT (content): Merge conflict in addons/base_vat/i18n/ru.po
Auto-merging addons/board/i18n/bg.po
CONFLICT (content): Merge conflict in addons/board/i18n/bg.po
Auto-merging addons/bus/i18n/bg.po
CONFLICT (content): Merge conflict in addons/bus/i18n/bg.po
Auto-merging addons/bus/i18n/fa.po
CONFLICT (content): Merge conflict in addons/bus/i18n/fa.po
Auto-merging addons/calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/bg.po
Auto-merging addons/calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/fi.po
Auto-merging addons/calendar/i18n/id.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/id.po
Auto-merging addons/calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar/i18n/sv.po
Auto-merging addons/calendar_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/bg.po
Auto-merging addons/calendar_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/fi.po
Auto-merging addons/calendar_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/calendar_sms/i18n/sv.po
Auto-merging addons/contacts/i18n/sv.po
CONFLICT (content): Merge conflict in addons/contacts/i18n/sv.po
Auto-merging addons/crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm/i18n/bg.po
Auto-merging addons/crm/i18n/es.po
CONFLICT (content): Merge conflict in addons/crm/i18n/es.po
Auto-merging addons/crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fa.po
Auto-merging addons/crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm/i18n/fi.po
Auto-merging addons/crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm/i18n/id.po
Auto-merging addons/crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/crm/i18n/sv.po
Auto-merging addons/crm_iap_enrich/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/bg.po
Auto-merging addons/crm_iap_enrich/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_enrich/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/bg.po
Auto-merging addons/crm_iap_mine/i18n/fa.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fa.po
Auto-merging addons/crm_iap_mine/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/fi.po
Auto-merging addons/crm_iap_mine/i18n/id.po
CONFLICT (content): Merge conflict in addons/crm_iap_mine/i18n/id.po
Auto-merging addons/crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/bg.po
Auto-merging addons/crm_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_livechat/i18n/fi.po
Auto-merging addons/crm_mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/bg.po
Auto-merging addons/crm_mail_plugin/i18n/fi.po
CONFLICT (content): Merge conflict in addons/crm_mail_plugin/i18n/fi.po
Auto-merging addons/delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/fi.po
Auto-merging addons/delivery/i18n/sv.po
CONFLICT (content): Merge conflict in addons/delivery/i18n/sv.po
Auto-merging addons/event/i18n/es.po
CONFLICT (content): Merge conflict in addons/event/i18n/es.po
Auto-merging addons/event/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event/i18n/es_419.po
Auto-merging addons/event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event/i18n/sv.po
Auto-merging addons/event_booth/i18n/es.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/es.po
Auto-merging addons/event_booth/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_booth/i18n/sv.po
Auto-merging addons/event_booth_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_booth_sale/i18n/fi.po
Auto-merging addons/event_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/fi.po
Auto-merging addons/event_crm/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_crm/i18n/sv.po
Auto-merging addons/event_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/es_419.po
Auto-merging addons/event_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/event_sale/i18n/sv.po
Auto-merging addons/fleet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/fleet/i18n/sv.po
Auto-merging addons/gamification/i18n/sv.po
CONFLICT (content): Merge conflict in addons/gamification/i18n/sv.po
Auto-merging addons/google_calendar/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/bg.po
Auto-merging addons/google_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/fi.po
Auto-merging addons/google_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_calendar/i18n/sv.po
Auto-merging addons/google_gmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/bg.po
Auto-merging addons/google_gmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/fi.po
Auto-merging addons/google_gmail/i18n/hi.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/hi.po
Auto-merging addons/google_gmail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/google_gmail/i18n/sv.po
Auto-merging addons/google_recaptcha/i18n/bg.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/bg.po
Auto-merging addons/google_recaptcha/i18n/fa.po
CONFLICT (content): Merge conflict in addons/google_recaptcha/i18n/fa.po
Auto-merging addons/hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr/i18n/bg.po
Auto-merging addons/hr/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr/i18n/id.po
Auto-merging addons/hr/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr/i18n/my.po
Auto-merging addons/hr/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr/i18n/sv.po
Auto-merging addons/hr/i18n/th.po
CONFLICT (content): Merge conflict in addons/hr/i18n/th.po
Auto-merging addons/hr_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/bg.po
Auto-merging addons/hr_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/fa.po
Auto-merging addons/hr_attendance/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/my.po
Auto-merging addons/hr_attendance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_attendance/i18n/sv.po
Auto-merging addons/hr_contract/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/bg.po
Auto-merging addons/hr_contract/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/es.po
Auto-merging addons/hr_contract/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/hi.po
Auto-merging addons/hr_contract/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/id.po
Auto-merging addons/hr_contract/i18n/my.po
CONFLICT (content): Merge conflict in addons/hr_contract/i18n/my.po
Auto-merging addons/hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/bg.po
Auto-merging addons/hr_expense/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/es.po
Auto-merging addons/hr_expense/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/fa.po
Auto-merging addons/hr_expense/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/id.po
Auto-merging addons/hr_expense/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_expense/i18n/sv.po
Auto-merging addons/hr_fleet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_fleet/i18n/bg.po
Auto-merging addons/hr_gamification/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_gamification/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/bg.po
Auto-merging addons/hr_holidays/i18n/da.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/da.po
Auto-merging addons/hr_holidays/i18n/es.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/es.po
Auto-merging addons/hr_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fa.po
Auto-merging addons/hr_holidays/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/fi.po
Auto-merging addons/hr_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/hi.po
Auto-merging addons/hr_holidays/i18n/ru.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/ru.po
Auto-merging addons/hr_holidays/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sk.po
Auto-merging addons/hr_holidays/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_holidays/i18n/sv.po
Auto-merging addons/hr_holidays_attendance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/bg.po
Auto-merging addons/hr_holidays_attendance/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fa.po
Auto-merging addons/hr_holidays_attendance/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_holidays_attendance/i18n/fi.po
Auto-merging addons/hr_homeworking/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/bg.po
Auto-merging addons/hr_homeworking/i18n/fa.po
CONFLICT (content): Merge conflict in addons/hr_homeworking/i18n/fa.po
Auto-merging addons/hr_hourly_cost/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_hourly_cost/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/bg.po
Auto-merging addons/hr_maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/hr_maintenance/i18n/sk.po
Auto-merging addons/hr_recruitment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/es_419.po
Auto-merging addons/hr_recruitment/i18n/fi.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/fi.po
Auto-merging addons/hr_recruitment/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/id.po
Auto-merging addons/hr_recruitment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_recruitment/i18n/sv.po
Auto-merging addons/hr_skills/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/id.po
Auto-merging addons/hr_skills/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_skills/i18n/sv.po
Auto-merging addons/hr_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/es_419.po
Auto-merging addons/hr_timesheet/i18n/id.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/id.po
Auto-merging addons/hr_timesheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_timesheet/i18n/sv.po
Auto-merging addons/hr_work_entry/i18n/sv.po
CONFLICT (content): Merge conflict in addons/hr_work_entry/i18n/sv.po
Auto-merging addons/iap_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/bg.po
Auto-merging addons/iap_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/iap_crm/i18n/fa.po
Auto-merging addons/im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/bg.po
Auto-merging addons/im_livechat/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/es_419.po
Auto-merging addons/im_livechat/i18n/fi.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/fi.po
Auto-merging addons/im_livechat/i18n/id.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/id.po
Auto-merging addons/im_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/my.po
Auto-merging addons/im_livechat/i18n/sv.po
CONFLICT (content): Merge conflict in addons/im_livechat/i18n/sv.po
Auto-merging addons/im_livechat_mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/im_livechat_mail_bot/i18n/bg.po
Auto-merging addons/link_tracker/i18n/bg.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/bg.po
Auto-merging addons/link_tracker/i18n/fa.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fa.po
Auto-merging addons/link_tracker/i18n/fi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/fi.po
Auto-merging addons/link_tracker/i18n/hi.po
CONFLICT (content): Merge conflict in addons/link_tracker/i18n/hi.po
Auto-merging addons/loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/bg.po
Auto-merging addons/loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/fa.po
Auto-merging addons/loyalty/i18n/it.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/it.po
Auto-merging addons/loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/lv.po
Auto-merging addons/loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/loyalty/i18n/sv.po
Auto-merging addons/lunch/i18n/bg.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/bg.po
Auto-merging addons/lunch/i18n/es.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/es.po
Auto-merging addons/lunch/i18n/fa.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/fa.po
Auto-merging addons/lunch/i18n/my.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/my.po
Auto-merging addons/lunch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/lunch/i18n/sv.po
Auto-merging addons/mail/i18n/ar.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ar.po
Auto-merging addons/mail/i18n/az.po
CONFLICT (content): Merge conflict in addons/mail/i18n/az.po
Auto-merging addons/mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail/i18n/bg.po
Auto-merging addons/mail/i18n/da.po
CONFLICT (content): Merge conflict in addons/mail/i18n/da.po
Auto-merging addons/mail/i18n/de.po
CONFLICT (content): Merge conflict in addons/mail/i18n/de.po
Auto-merging addons/mail/i18n/es.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es.po
Auto-merging addons/mail/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mail/i18n/es_419.po
Auto-merging addons/mail/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fa.po
Auto-merging addons/mail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail/i18n/fi.po
Auto-merging addons/mail/i18n/id.po
CONFLICT (content): Merge conflict in addons/mail/i18n/id.po
Auto-merging addons/mail/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail/i18n/lo.po
Auto-merging addons/mail/i18n/nl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/nl.po
Auto-merging addons/mail/i18n/pl.po
CONFLICT (content): Merge conflict in addons/mail/i18n/pl.po
Auto-merging addons/mail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/mail/i18n/ru.po
Auto-merging addons/mail/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail/i18n/sv.po
Auto-merging addons/mail/i18n/tr.po
CONFLICT (content): Merge conflict in addons/mail/i18n/tr.po
Auto-merging addons/mail_bot/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_bot/i18n/bg.po
Auto-merging addons/mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/bg.po
Auto-merging addons/mail_group/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fa.po
Auto-merging addons/mail_group/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/fi.po
Auto-merging addons/mail_group/i18n/lo.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/lo.po
Auto-merging addons/mail_group/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_group/i18n/sv.po
Auto-merging addons/mail_plugin/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/bg.po
Auto-merging addons/mail_plugin/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mail_plugin/i18n/sv.po
Auto-merging addons/maintenance/i18n/bg.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/bg.po
Auto-merging addons/maintenance/i18n/es.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/es.po
Auto-merging addons/maintenance/i18n/sk.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sk.po
Auto-merging addons/maintenance/i18n/sv.po
CONFLICT (content): Merge conflict in addons/maintenance/i18n/sv.po
Auto-merging addons/mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/bg.po
Auto-merging addons/mass_mailing/i18n/es.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es.po
Auto-merging addons/mass_mailing/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/es_419.po
Auto-merging addons/mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fa.po
Auto-merging addons/mass_mailing/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/fi.po
Auto-merging addons/mass_mailing/i18n/pt.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/pt.po
Auto-merging addons/mass_mailing/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing/i18n/sv.po
Auto-merging addons/mass_mailing_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/bg.po
Auto-merging addons/mass_mailing_crm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm/i18n/fa.po
Auto-merging addons/mass_mailing_crm_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mass_mailing_crm_sms/i18n/fa.po
Auto-merging addons/mass_mailing_event/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mass_mailing_event/i18n/bg.po
Auto-merging addons/mass_mailing_sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/fi.po
Auto-merging addons/mass_mailing_sms/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mass_mailing_sms/i18n/sv.po
Auto-merging addons/mass_mailing_themes/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/mass_mailing_themes/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/es_419.po
Auto-merging addons/microsoft_calendar/i18n/fi.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/fi.po
Auto-merging addons/microsoft_calendar/i18n/sv.po
CONFLICT (content): Merge conflict in addons/microsoft_calendar/i18n/sv.po
Auto-merging addons/mrp/i18n/es.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/es.po
Auto-merging addons/mrp/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/fi.po
Auto-merging addons/mrp/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/id.po
Auto-merging addons/mrp/i18n/sv.po
CONFLICT (content): Merge conflict in addons/mrp/i18n/sv.po
Auto-merging addons/mrp_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/mrp_account/i18n/id.po
Auto-merging addons/mrp_subcontracting/i18n/fi.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/i18n/fi.po
Auto-merging addons/mrp_subcontracting_dropshipping/i18n/bg.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_dropshipping/i18n/bg.po
Auto-merging addons/mrp_subcontracting_purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/mrp_subcontracting_purchase/i18n/fa.po
Auto-merging addons/onboarding/i18n/bg.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/bg.po
Auto-merging addons/onboarding/i18n/id.po
CONFLICT (content): Merge conflict in addons/onboarding/i18n/id.po
Auto-merging addons/partner_autocomplete/i18n/bg.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/bg.po
Auto-merging addons/partner_autocomplete/i18n/fa.po
CONFLICT (content): Merge conflict in addons/partner_autocomplete/i18n/fa.po
Auto-merging addons/payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment/i18n/bg.po
Auto-merging addons/payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment/i18n/fa.po
Auto-merging addons/payment/i18n/lt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/lt.po
Auto-merging addons/payment/i18n/my.po
CONFLICT (content): Merge conflict in addons/payment/i18n/my.po
Auto-merging addons/payment/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment/i18n/pt.po
Auto-merging addons/payment/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment/i18n/sv.po
Auto-merging addons/payment_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_adyen/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/bg.po
Auto-merging addons/payment_alipay/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_alipay/i18n/pt.po
Auto-merging addons/payment_aps/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_aps/i18n/bg.po
Auto-merging addons/payment_asiapay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_asiapay/i18n/bg.po
Auto-merging addons/payment_authorize/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_authorize/i18n/bg.po
Auto-merging addons/payment_buckaroo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_buckaroo/i18n/bg.po
Auto-merging addons/payment_custom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/bg.po
Auto-merging addons/payment_custom/i18n/nl.po
CONFLICT (content): Merge conflict in addons/payment_custom/i18n/nl.po
Auto-merging addons/payment_demo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/bg.po
Auto-merging addons/payment_demo/i18n/ru.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/ru.po
Auto-merging addons/payment_demo/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_demo/i18n/sl.po
Auto-merging addons/payment_flutterwave/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/bg.po
Auto-merging addons/payment_flutterwave/i18n/fa.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/fa.po
Auto-merging addons/payment_flutterwave/i18n/sl.po
CONFLICT (content): Merge conflict in addons/payment_flutterwave/i18n/sl.po
Auto-merging addons/payment_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/bg.po
Auto-merging addons/payment_mercado_pago/i18n/sv.po
CONFLICT (content): Merge conflict in addons/payment_mercado_pago/i18n/sv.po
Auto-merging addons/payment_worldline/i18n/bg.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/bg.po
Auto-merging addons/payment_worldline/i18n/pt.po
CONFLICT (content): Merge conflict in addons/payment_worldline/i18n/pt.po
Auto-merging addons/point_of_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es.po
Auto-merging addons/point_of_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/es_419.po
Auto-merging addons/point_of_sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/id.po
Auto-merging addons/point_of_sale/i18n/ja.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/ja.po
Auto-merging addons/point_of_sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/point_of_sale/i18n/sv.po
Auto-merging addons/portal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/portal/i18n/fi.po
Auto-merging addons/portal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/portal/i18n/sv.po
Auto-merging addons/pos_epson_printer/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/bg.po
Auto-merging addons/pos_epson_printer/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_epson_printer/i18n/fa.po
Auto-merging addons/pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/bg.po
Auto-merging addons/pos_hr/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_hr/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/bg.po
Auto-merging addons/pos_loyalty/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fa.po
Auto-merging addons/pos_loyalty/i18n/fi.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/fi.po
Auto-merging addons/pos_loyalty/i18n/lv.po
CONFLICT (content): Merge conflict in addons/pos_loyalty/i18n/lv.po
Auto-merging addons/pos_mercado_pago/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercado_pago/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/bg.po
Auto-merging addons/pos_mercury/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/fa.po
Auto-merging addons/pos_mercury/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_mercury/i18n/hu.po
Auto-merging addons/pos_online_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/bg.po
Auto-merging addons/pos_online_payment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/fa.po
Auto-merging addons/pos_online_payment/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_online_payment/i18n/hu.po
Auto-merging addons/pos_online_payment_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_online_payment_self_order/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/bg.po
Auto-merging addons/pos_paytm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/fa.po
Auto-merging addons/pos_paytm/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_paytm/i18n/hu.po
Auto-merging addons/pos_razorpay/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/bg.po
Auto-merging addons/pos_razorpay/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_razorpay/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/bg.po
Auto-merging addons/pos_restaurant/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/fa.po
Auto-merging addons/pos_restaurant/i18n/hi.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hi.po
Auto-merging addons/pos_restaurant/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/hu.po
Auto-merging addons/pos_restaurant/i18n/ja.po
CONFLICT (content): Merge conflict in addons/pos_restaurant/i18n/ja.po
Auto-merging addons/pos_restaurant_adyen/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/bg.po
Auto-merging addons/pos_restaurant_adyen/i18n/hu.po
CONFLICT (content): Merge conflict in addons/pos_restaurant_adyen/i18n/hu.po
Auto-merging addons/pos_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/bg.po
Auto-merging addons/pos_sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/es.po
Auto-merging addons/pos_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale/i18n/fa.po
Auto-merging addons/pos_sale_product_configurator/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/bg.po
Auto-merging addons/pos_sale_product_configurator/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_sale_product_configurator/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/ar.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/ar.po
Auto-merging addons/pos_self_order/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/bg.po
Auto-merging addons/pos_self_order/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/fa.po
Auto-merging addons/pos_self_order/i18n/id.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/id.po
Auto-merging addons/pos_self_order/i18n/nl.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/nl.po
Auto-merging addons/pos_self_order/i18n/tr.po
CONFLICT (content): Merge conflict in addons/pos_self_order/i18n/tr.po
Auto-merging addons/pos_self_order_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/bg.po
Auto-merging addons/pos_self_order_sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/pos_self_order_sale/i18n/fa.po
Auto-merging addons/privacy_lookup/i18n/fi.po
CONFLICT (content): Merge conflict in addons/privacy_lookup/i18n/fi.po
Auto-merging addons/product/i18n/es.po
CONFLICT (content): Merge conflict in addons/product/i18n/es.po
Auto-merging addons/product/i18n/fi.po
CONFLICT (content): Merge conflict in addons/product/i18n/fi.po
Auto-merging addons/product/i18n/sv.po
CONFLICT (content): Merge conflict in addons/product/i18n/sv.po
Auto-merging addons/project/i18n/es.po
CONFLICT (content): Merge conflict in addons/project/i18n/es.po
Auto-merging addons/project/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/project/i18n/es_419.po
Auto-merging addons/project/i18n/id.po
CONFLICT (content): Merge conflict in addons/project/i18n/id.po
Auto-merging addons/project/i18n/sv.po
CONFLICT (content): Merge conflict in addons/project/i18n/sv.po
Auto-merging addons/project_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/bg.po
Auto-merging addons/project_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_sms/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/bg.po
Auto-merging addons/project_timesheet_holidays/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/fa.po
Auto-merging addons/project_timesheet_holidays/i18n/hi.po
CONFLICT (content): Merge conflict in addons/project_timesheet_holidays/i18n/hi.po
Auto-merging addons/project_todo/i18n/bg.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/bg.po
Auto-merging addons/project_todo/i18n/fa.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/fa.po
Auto-merging addons/project_todo/i18n/pt.po
CONFLICT (content): Merge conflict in addons/project_todo/i18n/pt.po
Auto-merging addons/purchase/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es.po
Auto-merging addons/purchase/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/es_419.po
Auto-merging addons/purchase/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/fa.po
Auto-merging addons/purchase/i18n/ja.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/ja.po
Auto-merging addons/purchase/i18n/lt.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/lt.po
Auto-merging addons/purchase/i18n/my.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/my.po
Auto-merging addons/purchase/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase/i18n/sv.po
Auto-merging addons/purchase_mrp/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/bg.po
Auto-merging addons/purchase_mrp/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_mrp/i18n/fa.po
Auto-merging addons/purchase_product_matrix/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/bg.po
Auto-merging addons/purchase_product_matrix/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_product_matrix/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/bg.po
Auto-merging addons/purchase_requisition/i18n/es.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/es.po
Auto-merging addons/purchase_requisition/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/fa.po
Auto-merging addons/purchase_requisition/i18n/sv.po
CONFLICT (content): Merge conflict in addons/purchase_requisition/i18n/sv.po
Auto-merging addons/purchase_requisition_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/bg.po
Auto-merging addons/purchase_requisition_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_requisition_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/bg.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/bg.po
Auto-merging addons/purchase_stock/i18n/fa.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fa.po
Auto-merging addons/purchase_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/purchase_stock/i18n/fi.po
Auto-merging addons/rating/i18n/bg.po
CONFLICT (content): Merge conflict in addons/rating/i18n/bg.po
Auto-merging addons/rating/i18n/fi.po
CONFLICT (content): Merge conflict in addons/rating/i18n/fi.po
Auto-merging addons/repair/i18n/bg.po
CONFLICT (content): Merge conflict in addons/repair/i18n/bg.po
Auto-merging addons/repair/i18n/es.po
CONFLICT (content): Merge conflict in addons/repair/i18n/es.po
Auto-merging addons/repair/i18n/fa.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fa.po
Auto-merging addons/repair/i18n/fi.po
CONFLICT (content): Merge conflict in addons/repair/i18n/fi.po
Auto-merging addons/repair/i18n/sk.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sk.po
Auto-merging addons/repair/i18n/sv.po
CONFLICT (content): Merge conflict in addons/repair/i18n/sv.po
Auto-merging addons/resource/i18n/bg.po
CONFLICT (content): Merge conflict in addons/resource/i18n/bg.po
Auto-merging addons/resource/i18n/hi.po
CONFLICT (content): Merge conflict in addons/resource/i18n/hi.po
Auto-merging addons/sale/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale/i18n/es.po
Auto-merging addons/sale/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fa.po
Auto-merging addons/sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale/i18n/fi.po
Auto-merging addons/sale/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale/i18n/id.po
Auto-merging addons/sale/i18n/sv.po
CONFLICT (content): Merge conflict in addons/sale/i18n/sv.po
Auto-merging addons/sale/i18n/th.po
CONFLICT (content): Merge conflict in addons/sale/i18n/th.po
Auto-merging addons/sale/i18n/zh_CN.po
CONFLICT (content): Merge conflict in addons/sale/i18n/zh_CN.po
Auto-merging addons/sale_async_emails/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_async_emails/i18n/bg.po
Auto-merging addons/sale_crm/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/fi.po
Auto-merging addons/sale_crm/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_crm/i18n/id.po
Auto-merging addons/sale_management/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_management/i18n/id.po
Auto-merging addons/sale_pdf_quote_builder/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_pdf_quote_builder/i18n/id.po
Auto-merging addons/sale_project/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/fi.po
Auto-merging addons/sale_project/i18n/id.po
CONFLICT (content): Merge conflict in addons/sale_project/i18n/id.po
Auto-merging addons/sale_purchase/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_purchase/i18n/fi.po
Auto-merging addons/sale_stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/es.po
Auto-merging addons/sale_stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sale_stock/i18n/fi.po
Auto-merging addons/sale_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/bg.po
Auto-merging addons/sale_timesheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/es_419.po
Auto-merging addons/sale_timesheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sale_timesheet/i18n/fa.po
Auto-merging addons/sales_team/i18n/bg.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/bg.po
Auto-merging addons/sales_team/i18n/id.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/id.po
Auto-merging addons/sales_team/i18n/my.po
CONFLICT (content): Merge conflict in addons/sales_team/i18n/my.po
Auto-merging addons/sms/i18n/bg.po
Auto-merging addons/sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fa.po
Auto-merging addons/sms/i18n/fi.po
CONFLICT (content): Merge conflict in addons/sms/i18n/fi.po
Auto-merging addons/sms/i18n/my.po
Auto-merging addons/snailmail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/bg.po
Auto-merging addons/snailmail/i18n/fi.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/fi.po
Auto-merging addons/snailmail/i18n/ru.po
CONFLICT (content): Merge conflict in addons/snailmail/i18n/ru.po
Auto-merging addons/snailmail_account/i18n/pl.po
CONFLICT (content): Merge conflict in addons/snailmail_account/i18n/pl.po
Auto-merging addons/social_media/i18n/bg.po
CONFLICT (content): Merge conflict in addons/social_media/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/ar.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/ar.po
Auto-merging addons/spreadsheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/bg.po
Auto-merging addons/spreadsheet/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/es_419.po
Auto-merging addons/spreadsheet/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/fa.po
Auto-merging addons/spreadsheet/i18n/hi.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/hi.po
Auto-merging addons/spreadsheet/i18n/my.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/my.po
Auto-merging addons/spreadsheet/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/sv.po
Auto-merging addons/spreadsheet/i18n/tr.po
CONFLICT (content): Merge conflict in addons/spreadsheet/i18n/tr.po
Auto-merging addons/spreadsheet_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/bg.po
Auto-merging addons/spreadsheet_account/i18n/fa.po
CONFLICT (content): Merge conflict in addons/spreadsheet_account/i18n/fa.po
Auto-merging addons/spreadsheet_dashboard/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard/i18n/sv.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard/i18n/sv.po
Auto-merging addons/spreadsheet_dashboard_account/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_account/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_event_sale/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_event_sale/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_expense/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_hr_timesheet/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_im_livechat/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_pos_hr/i18n/bg.po
Auto-merging addons/spreadsheet_dashboard_sale/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/spreadsheet_dashboard_sale/i18n/es_419.po
Auto-merging addons/stock/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es.po
Auto-merging addons/stock/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/stock/i18n/es_419.po
Auto-merging addons/stock/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock/i18n/fi.po
Auto-merging addons/stock/i18n/nl.po
CONFLICT (content): Merge conflict in addons/stock/i18n/nl.po
Auto-merging addons/stock/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock/i18n/sv.po
Auto-merging addons/stock_account/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/fi.po
Auto-merging addons/stock_account/i18n/id.po
CONFLICT (content): Merge conflict in addons/stock_account/i18n/id.po
Auto-merging addons/stock_delivery/i18n/fi.po
CONFLICT (content): Merge conflict in addons/stock_delivery/i18n/fi.po
Auto-merging addons/stock_landed_costs/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/es.po
Auto-merging addons/stock_landed_costs/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_landed_costs/i18n/sv.po
Auto-merging addons/stock_picking_batch/i18n/es.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/es.po
Auto-merging addons/stock_picking_batch/i18n/sv.po
CONFLICT (content): Merge conflict in addons/stock_picking_batch/i18n/sv.po
Auto-merging addons/survey/i18n/bg.po
CONFLICT (content): Merge conflict in addons/survey/i18n/bg.po
Auto-merging addons/survey/i18n/es.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es.po
Auto-merging addons/survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/survey/i18n/es_419.po
Auto-merging addons/survey/i18n/fa.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fa.po
Auto-merging addons/survey/i18n/fi.po
CONFLICT (content): Merge conflict in addons/survey/i18n/fi.po
Auto-merging addons/survey/i18n/lt.po
CONFLICT (content): Merge conflict in addons/survey/i18n/lt.po
Auto-merging addons/survey/i18n/my.po
CONFLICT (content): Merge conflict in addons/survey/i18n/my.po
Auto-merging addons/survey/i18n/sv.po
CONFLICT (content): Merge conflict in addons/survey/i18n/sv.po
Auto-merging addons/transifex/i18n/bg.po
CONFLICT (content): Merge conflict in addons/transifex/i18n/bg.po
Auto-merging addons/uom/i18n/ar.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ar.po
Auto-merging addons/uom/i18n/bg.po
CONFLICT (content): Merge conflict in addons/uom/i18n/bg.po
Auto-merging addons/uom/i18n/es.po
CONFLICT (content): Merge conflict in addons/uom/i18n/es.po
Auto-merging addons/uom/i18n/fa.po
CONFLICT (content): Merge conflict in addons/uom/i18n/fa.po
Auto-merging addons/uom/i18n/hi.po
CONFLICT (content): Merge conflict in addons/uom/i18n/hi.po
Auto-merging addons/uom/i18n/id.po
CONFLICT (content): Merge conflict in addons/uom/i18n/id.po
Auto-merging addons/uom/i18n/ru.po
CONFLICT (content): Merge conflict in addons/uom/i18n/ru.po
Auto-merging addons/uom/i18n/th.po
CONFLICT (content): Merge conflict in addons/uom/i18n/th.po
Auto-merging addons/uom/i18n/tr.po
CONFLICT (content): Merge conflict in addons/uom/i18n/tr.po
Auto-merging addons/uom/i18n/uk.po
CONFLICT (content): Merge conflict in addons/uom/i18n/uk.po
Auto-merging addons/utm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/utm/i18n/bg.po
Auto-merging addons/utm/i18n/fa.po
CONFLICT (content): Merge conflict in addons/utm/i18n/fa.po
Auto-merging addons/utm/i18n/nl.po
CONFLICT (content): Merge conflict in addons/utm/i18n/nl.po
Auto-merging addons/web/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web/i18n/ar.po
Auto-merging addons/web/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web/i18n/bg.po
Auto-merging addons/web/i18n/ca.po
CONFLICT (content): Merge conflict in addons/web/i18n/ca.po
Auto-merging addons/web/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web/i18n/fa.po
Auto-merging addons/web/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web/i18n/fi.po
Auto-merging addons/web/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web/i18n/hi.po
Auto-merging addons/web/i18n/id.po
CONFLICT (content): Merge conflict in addons/web/i18n/id.po
Auto-merging addons/web/i18n/lt.po
CONFLICT (content): Merge conflict in addons/web/i18n/lt.po
Auto-merging addons/web/i18n/my.po
CONFLICT (content): Merge conflict in addons/web/i18n/my.po
Auto-merging addons/web/i18n/sv.po
CONFLICT (content): Merge conflict in addons/web/i18n/sv.po
Auto-merging addons/web/i18n/tr.po
CONFLICT (content): Merge conflict in addons/web/i18n/tr.po
Auto-merging addons/web_editor/i18n/ar.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/ar.po
Auto-merging addons/web_editor/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/bg.po
Auto-merging addons/web_editor/i18n/fa.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fa.po
Auto-merging addons/web_editor/i18n/fi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/fi.po
Auto-merging addons/web_editor/i18n/hi.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/hi.po
Auto-merging addons/web_editor/i18n/nl.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/nl.po
Auto-merging addons/web_editor/i18n/pt.po
CONFLICT (content): Merge conflict in addons/web_editor/i18n/pt.po
Auto-merging addons/web_hierarchy/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_hierarchy/i18n/bg.po
Auto-merging addons/web_tour/i18n/lo.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/lo.po
Auto-merging addons/web_tour/i18n/pl.po
CONFLICT (content): Merge conflict in addons/web_tour/i18n/pl.po
Auto-merging addons/web_unsplash/i18n/bg.po
CONFLICT (content): Merge conflict in addons/web_unsplash/i18n/bg.po
Auto-merging addons/website/i18n/ar.po
CONFLICT (content): Merge conflict in addons/website/i18n/ar.po
Auto-merging addons/website/i18n/de.po
CONFLICT (content): Merge conflict in addons/website/i18n/de.po
Auto-merging addons/website/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website/i18n/es_419.po
Auto-merging addons/website/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website/i18n/fa.po
Auto-merging addons/website/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website/i18n/fi.po
Auto-merging addons/website/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website/i18n/hi.po
Auto-merging addons/website/i18n/id.po
CONFLICT (content): Merge conflict in addons/website/i18n/id.po
Auto-merging addons/website/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website/i18n/lo.po
Auto-merging addons/website/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website/i18n/nl.po
Auto-merging addons/website/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website/i18n/pl.po
Auto-merging addons/website/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website/i18n/sv.po
Auto-merging addons/website/i18n/th.po
CONFLICT (content): Merge conflict in addons/website/i18n/th.po
Auto-merging addons/website/i18n/tr.po
CONFLICT (content): Merge conflict in addons/website/i18n/tr.po
Auto-merging addons/website_blog/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/bg.po
Auto-merging addons/website_blog/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/lt.po
Auto-merging addons/website_blog/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/my.po
Auto-merging addons/website_blog/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/nl.po
Auto-merging addons/website_blog/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_blog/i18n/pl.po
Auto-merging addons/website_cf_turnstile/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/bg.po
Auto-merging addons/website_cf_turnstile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_cf_turnstile/i18n/pl.po
Auto-merging addons/website_crm/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/bg.po
Auto-merging addons/website_crm_iap_reveal/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fa.po
Auto-merging addons/website_crm_iap_reveal/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/fi.po
Auto-merging addons/website_crm_iap_reveal/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_crm_iap_reveal/i18n/sv.po
Auto-merging addons/website_crm_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_crm_livechat/i18n/bg.po
Auto-merging addons/website_crm_partner_assign/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_crm_partner_assign/i18n/fi.po
Auto-merging addons/website_event/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event/i18n/sv.po
Auto-merging addons/website_event_exhibitor/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/es.po
Auto-merging addons/website_event_exhibitor/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_exhibitor/i18n/sv.po
Auto-merging addons/website_event_track/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es.po
Auto-merging addons/website_event_track/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/es_419.po
Auto-merging addons/website_event_track/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/fi.po
Auto-merging addons/website_event_track/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/pl.po
Auto-merging addons/website_event_track/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_event_track/i18n/sv.po
Auto-merging addons/website_event_track_live_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_live_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/bg.po
Auto-merging addons/website_event_track_quiz/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_event_track_quiz/i18n/fa.po
Auto-merging addons/website_forum/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/bg.po
Auto-merging addons/website_forum/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/fi.po
Auto-merging addons/website_forum/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/hi.po
Auto-merging addons/website_forum/i18n/lt.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/lt.po
Auto-merging addons/website_forum/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/my.po
Auto-merging addons/website_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_forum/i18n/pl.po
Auto-merging addons/website_hr_recruitment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/bg.po
Auto-merging addons/website_hr_recruitment/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/fa.po
Auto-merging addons/website_hr_recruitment/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/my.po
Auto-merging addons/website_hr_recruitment/i18n/nl.po
CONFLICT (content): Merge conflict in addons/website_hr_recruitment/i18n/nl.po
Auto-merging addons/website_jitsi/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/bg.po
Auto-merging addons/website_jitsi/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_jitsi/i18n/fa.po
Auto-merging addons/website_links/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/bg.po
Auto-merging addons/website_links/i18n/lo.po
CONFLICT (content): Merge conflict in addons/website_links/i18n/lo.po
Auto-merging addons/website_livechat/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/bg.po
Auto-merging addons/website_livechat/i18n/my.po
CONFLICT (content): Merge conflict in addons/website_livechat/i18n/my.po
Auto-merging addons/website_mail/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail/i18n/bg.po
Auto-merging addons/website_mail_group/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mail_group/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/bg.po
Auto-merging addons/website_mass_mailing/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing/i18n/fa.po
Auto-merging addons/website_mass_mailing_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/bg.po
Auto-merging addons/website_mass_mailing_sms/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_mass_mailing_sms/i18n/fa.po
Auto-merging addons/website_payment/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/bg.po
Auto-merging addons/website_payment/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/es_419.po
Auto-merging addons/website_payment/i18n/hi.po
CONFLICT (content): Merge conflict in addons/website_payment/i18n/hi.po
Auto-merging addons/website_profile/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/pl.po
Auto-merging addons/website_profile/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_profile/i18n/sv.po
Auto-merging addons/website_sale/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/fi.po
Auto-merging addons/website_sale/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale/i18n/pl.po
Auto-merging addons/website_sale_comparison_wishlist/i18n/fa.po
CONFLICT (content): Merge conflict in addons/website_sale_comparison_wishlist/i18n/fa.po
Auto-merging addons/website_sale_loyalty/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_sale_loyalty/i18n/sv.po
Auto-merging addons/website_sale_mondialrelay/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_sale_mondialrelay/i18n/fi.po
Auto-merging addons/website_sale_stock/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_sale_stock/i18n/pl.po
Auto-merging addons/website_slides/i18n/es.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es.po
Auto-merging addons/website_slides/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/es_419.po
Auto-merging addons/website_slides/i18n/fi.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/fi.po
Auto-merging addons/website_slides/i18n/sv.po
CONFLICT (content): Merge conflict in addons/website_slides/i18n/sv.po
Auto-merging addons/website_slides_forum/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_forum/i18n/pl.po
Auto-merging addons/website_slides_survey/i18n/es_419.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/es_419.po
Auto-merging addons/website_slides_survey/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_slides_survey/i18n/pl.po
Auto-merging addons/website_sms/i18n/bg.po
CONFLICT (content): Merge conflict in addons/website_sms/i18n/bg.po
Auto-merging addons/website_twitter/i18n/pl.po
CONFLICT (content): Merge conflict in addons/website_twitter/i18n/pl.po
Auto-merging odoo/addons/base/i18n/ca.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/ca.po
Auto-merging odoo/addons/base/i18n/es_419.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/es_419.po
Auto-merging odoo/addons/base/i18n/fi.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/fi.po
Auto-merging odoo/addons/base/i18n/id.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/id.po
Auto-merging odoo/addons/base/i18n/sv.po
CONFLICT (content): Merge conflict in odoo/addons/base/i18n/sv.po
error: could not apply d1ff2894a302... [I18N] *: fetch latest Weblate translations
Could not apply d1ff2894a302... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/28)
Auto-merging appointment/i18n/sv.po
CONFLICT (content): Merge conflict in appointment/i18n/sv.po
Auto-merging documents/i18n/sv.po
CONFLICT (content): Merge conflict in documents/i18n/sv.po
Auto-merging documents_spreadsheet_crm/i18n/bg.po
CONFLICT (content): Merge conflict in documents_spreadsheet_crm/i18n/bg.po
Auto-merging helpdesk/i18n/sv.po
CONFLICT (content): Merge conflict in helpdesk/i18n/sv.po
Auto-merging hr_appraisal/i18n/sv.po
CONFLICT (content): Merge conflict in hr_appraisal/i18n/sv.po
Auto-merging hr_payroll/i18n/es.po
CONFLICT (content): Merge conflict in hr_payroll/i18n/es.po
Auto-merging hr_referral/i18n/sv.po
CONFLICT (content): Merge conflict in hr_referral/i18n/sv.po
Auto-merging knowledge/i18n/sv.po
CONFLICT (content): Merge conflict in knowledge/i18n/sv.po
Auto-merging marketing_automation/i18n/sv.po
CONFLICT (content): Merge conflict in marketing_automation/i18n/sv.po
Auto-merging sale_subscription/i18n/es_419.po
CONFLICT (content): Merge conflict in sale_subscription/i18n/es_419.po
Auto-merging sign/i18n/sv.po
CONFLICT (content): Merge conflict in sign/i18n/sv.po
error: could not apply 6da7b034ac2... [I18N] *: fetch latest Weblate translations
Could not apply 6da7b034ac2... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

None

Repository rebase failed

Rebasing (1/28)
Auto-merging appointment/i18n/sv.po
CONFLICT (content): Merge conflict in appointment/i18n/sv.po
Auto-merging documents/i18n/sv.po
CONFLICT (content): Merge conflict in documents/i18n/sv.po
Auto-merging documents_spreadsheet_crm/i18n/bg.po
CONFLICT (content): Merge conflict in documents_spreadsheet_crm/i18n/bg.po
Auto-merging helpdesk/i18n/sv.po
CONFLICT (content): Merge conflict in helpdesk/i18n/sv.po
Auto-merging hr_appraisal/i18n/sv.po
CONFLICT (content): Merge conflict in hr_appraisal/i18n/sv.po
Auto-merging hr_payroll/i18n/es.po
CONFLICT (content): Merge conflict in hr_payroll/i18n/es.po
Auto-merging hr_referral/i18n/sv.po
CONFLICT (content): Merge conflict in hr_referral/i18n/sv.po
Auto-merging knowledge/i18n/sv.po
CONFLICT (content): Merge conflict in knowledge/i18n/sv.po
Auto-merging marketing_automation/i18n/sv.po
CONFLICT (content): Merge conflict in marketing_automation/i18n/sv.po
Auto-merging sale_subscription/i18n/es_419.po
CONFLICT (content): Merge conflict in sale_subscription/i18n/es_419.po
Auto-merging sign/i18n/sv.po
CONFLICT (content): Merge conflict in sign/i18n/sv.po
error: could not apply 6da7b034ac2... [I18N] *: fetch latest Weblate translations
Could not apply 6da7b034ac2... # [I18N] *: fetch latest Weblate translations
(1)

08/26/2026

Browse all project changes

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>="1 month ago" AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with comments mentioning you	`comment:@anonymous`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>="1 month ago" AND state:<=needs-editing`	Add
Strings changed in the past two weeks	`changed:>="2 weeks ago"`	Add
Automatically translated strings	`is:automatically-translated`	Add
Translated strings in a certain language	`is:translated AND language: en`	Add

Shortcut	Action
`?`	Open available keyboard shortcuts.
`Alt` + `Home`	Navigate to the first translation in the current search.
`Alt` + `End`	Navigate to the last translation in the current search.
`Alt` + `PageUp` or `Ctrl` + `↑` or `Alt` + `↑` or `Cmd` + `↑` or	Navigate to the previous translation in the current search.
`Alt` + `PageDown` or `Ctrl` + `↓` or `Alt` + `↓` or `Cmd` + `↓` or	Navigate to the next translation in the current search.
`Ctrl` + `Enter` or `Cmd` + `Enter`	Submit current form; this works the same as pressing Save and continue while editing translation.
`Ctrl` + `Shift` + `Enter` or `Cmd` + `Shift` +`Enter`	Unmark translation as Needing edit and submit it.
`Alt` + `Enter` or `Option` + `Enter`	Submit the string as a suggestion; this works the same as pressing Suggest while editing translation.
`Ctrl` + `E` or `Cmd` + `E`	Focus on translation editor.
`Ctrl` + `U` or `Cmd` + `U`	Focus on comment editor.
`Ctrl` + `M` or `Cmd` + `M`	Shows Automatic suggestions tab.
`Ctrl` + `1` to `Ctrl` + `9` or `Cmd` + `1` to `Cmd` + `9`	Copies placeable of a given number from source string.
`Ctrl` + `M` followed by `1` to `9` or `Cmd` + `M` followed by `1` to `9`	Copy the machine translation of a given number to current translation.
`Ctrl` + `I` followed by `1` to `9` or `Cmd` + `I` followed by `1` to `9`	Ignore one item in the list of failing checks.
`Ctrl` + `J` or `Cmd` + `J`	Shows the Nearby strings tab.
`Ctrl` + `S` or `Cmd` + `S`	Focus on search field.
`Ctrl` + `O` or `Cmd` + `O`	Copy the source string.
`Ctrl` + `Y` or `Cmd` + `Y`	Toggle the Needs editing checkbox.
`→`	Browse the next translation string.
`←`	Browse the previous translation string.