Merge lp:~odo-openerp/openobject-addons/5.0-i18n-fixes into lp:openobject-addons/5.0

Proposed by Olivier Dony (Odoo)
Status: Merged
Merged at revision: not available
Proposed branch: lp:~odo-openerp/openobject-addons/5.0-i18n-fixes
Merge into: lp:openobject-addons/5.0
Diff against target: 124 lines (+0/-0)
0 files modified
To merge this branch: bzr merge lp:~odo-openerp/openobject-addons/5.0-i18n-fixes
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+18893@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Olivier Dony (Odoo) (odo-openerp) wrote :

[RESUBMIT of wrong merge proposal, because LP messed up the target branch initially]

Hello Quality Team,

This branch fixes bug 495948, which is due to incorrect language codes used for Slovenian and Danish languages in the PO file names.

This is the second part of my fix, and should be merged along with the merge
 ~odo/openobject-server/5.0-i18n-fixes which I proposed separately.

See the proposal for ~odo/openobject-server/5.0-i18n-fixes for an explanation.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'account/i18n/da_DA.po' => 'account/i18n/da_DK.po'
2=== renamed file 'account/i18n/sl_SL.po' => 'account/i18n/sl_SI.po'
3=== renamed file 'account_analytic_analysis/i18n/sl_SL.po' => 'account_analytic_analysis/i18n/sl_SI.po'
4=== renamed file 'account_analytic_default/i18n/sl_SL.po' => 'account_analytic_default/i18n/sl_SI.po'
5=== renamed file 'account_analytic_plans/i18n/sl_SL.po' => 'account_analytic_plans/i18n/sl_SI.po'
6=== renamed file 'account_balance/i18n/sl_SL.po' => 'account_balance/i18n/sl_SI.po'
7=== renamed file 'account_budget/i18n/sl_SL.po' => 'account_budget/i18n/sl_SI.po'
8=== renamed file 'account_chart/i18n/da_DA.po' => 'account_chart/i18n/da_DK.po'
9=== renamed file 'account_chart/i18n/sl_SL.po' => 'account_chart/i18n/sl_SI.po'
10=== renamed file 'account_date_check/i18n/da_DA.po' => 'account_date_check/i18n/da_DK.po'
11=== renamed file 'account_date_check/i18n/sl_SL.po' => 'account_date_check/i18n/sl_SI.po'
12=== renamed file 'account_followup/i18n/sl_SL.po' => 'account_followup/i18n/sl_SI.po'
13=== renamed file 'account_invoice_layout/i18n/sl_SL.po' => 'account_invoice_layout/i18n/sl_SI.po'
14=== renamed file 'account_payment/i18n/sl_SL.po' => 'account_payment/i18n/sl_SI.po'
15=== renamed file 'account_report/i18n/sl_SL.po' => 'account_report/i18n/sl_SI.po'
16=== renamed file 'account_reporting/i18n/sl_SL.po' => 'account_reporting/i18n/sl_SI.po'
17=== renamed file 'account_tax_include/i18n/sl_SL.po' => 'account_tax_include/i18n/sl_SI.po'
18=== renamed file 'account_voucher/i18n/sl_SL.po' => 'account_voucher/i18n/sl_SI.po'
19=== renamed file 'analytic_journal_billing_rate/i18n/sl_SL.po' => 'analytic_journal_billing_rate/i18n/sl_SI.po'
20=== renamed file 'analytic_user_function/i18n/sl_SL.po' => 'analytic_user_function/i18n/sl_SI.po'
21=== renamed file 'auction/i18n/sl_SL.po' => 'auction/i18n/sl_SI.po'
22=== renamed file 'audittrail/i18n/sl_SL.po' => 'audittrail/i18n/sl_SI.po'
23=== renamed file 'base_contact/i18n/sl_SL.po' => 'base_contact/i18n/sl_SI.po'
24=== renamed file 'base_iban/i18n/sl_SL.po' => 'base_iban/i18n/sl_SI.po'
25=== renamed file 'base_module_merge/i18n/sl_SL.po' => 'base_module_merge/i18n/sl_SI.po'
26=== renamed file 'base_module_publish/i18n/sl_SL.po' => 'base_module_publish/i18n/sl_SI.po'
27=== renamed file 'base_module_quality/i18n/sl_SL.po' => 'base_module_quality/i18n/sl_SI.po'
28=== renamed file 'base_module_record/i18n/sl_SL.po' => 'base_module_record/i18n/sl_SI.po'
29=== renamed file 'base_report_creator/i18n/sl_SL.po' => 'base_report_creator/i18n/sl_SI.po'
30=== renamed file 'base_report_designer/i18n/sl_SL.po' => 'base_report_designer/i18n/sl_SI.po'
31=== renamed file 'base_setup/i18n/sl_SL.po' => 'base_setup/i18n/sl_SI.po'
32=== renamed file 'base_vat/i18n/da_DA.po' => 'base_vat/i18n/da_DK.po'
33=== renamed file 'base_vat/i18n/sl_SL.po' => 'base_vat/i18n/sl_SI.po'
34=== renamed file 'board/i18n/sl_SL.po' => 'board/i18n/sl_SI.po'
35=== renamed file 'board_account/i18n/sl_SL.po' => 'board_account/i18n/sl_SI.po'
36=== renamed file 'board_association/i18n/sl_SL.po' => 'board_association/i18n/sl_SI.po'
37=== renamed file 'board_auction/i18n/sl_SL.po' => 'board_auction/i18n/sl_SI.po'
38=== renamed file 'board_crm_configuration/i18n/sl_SL.po' => 'board_crm_configuration/i18n/sl_SI.po'
39=== renamed file 'board_document/i18n/sl_SL.po' => 'board_document/i18n/sl_SI.po'
40=== renamed file 'board_manufacturing/i18n/sl_SL.po' => 'board_manufacturing/i18n/sl_SI.po'
41=== renamed file 'board_project/i18n/sl_SL.po' => 'board_project/i18n/sl_SI.po'
42=== renamed file 'board_sale/i18n/sl_SL.po' => 'board_sale/i18n/sl_SI.po'
43=== renamed file 'crm/i18n/sl_SL.po' => 'crm/i18n/sl_SI.po'
44=== renamed file 'crm_configuration/i18n/sl_SL.po' => 'crm_configuration/i18n/sl_SI.po'
45=== renamed file 'crm_profiling/i18n/sl_SL.po' => 'crm_profiling/i18n/sl_SI.po'
46=== renamed file 'crm_vertical/i18n/da_DA.po' => 'crm_vertical/i18n/da_DK.po'
47=== renamed file 'crm_vertical/i18n/sl_SL.po' => 'crm_vertical/i18n/sl_SI.po'
48=== renamed file 'delivery/i18n/sl_SL.po' => 'delivery/i18n/sl_SI.po'
49=== renamed file 'document/i18n/sl_SL.po' => 'document/i18n/sl_SI.po'
50=== renamed file 'document_ics/i18n/sl_SL.po' => 'document_ics/i18n/sl_SI.po'
51=== renamed file 'event/i18n/sl_SL.po' => 'event/i18n/sl_SI.po'
52=== renamed file 'event_project/i18n/sl_SL.po' => 'event_project/i18n/sl_SI.po'
53=== renamed file 'google_map/i18n/da_DA.po' => 'google_map/i18n/da_DK.po'
54=== renamed file 'google_map/i18n/sl_SL.po' => 'google_map/i18n/sl_SI.po'
55=== renamed file 'hr/i18n/sl_SL.po' => 'hr/i18n/sl_SI.po'
56=== renamed file 'hr_attendance/i18n/sl_SL.po' => 'hr_attendance/i18n/sl_SI.po'
57=== renamed file 'hr_contract/i18n/sl_SL.po' => 'hr_contract/i18n/sl_SI.po'
58=== renamed file 'hr_expense/i18n/sl_SL.po' => 'hr_expense/i18n/sl_SI.po'
59=== renamed file 'hr_holidays/i18n/sl_SL.po' => 'hr_holidays/i18n/sl_SI.po'
60=== renamed file 'hr_timesheet/i18n/sl_SL.po' => 'hr_timesheet/i18n/sl_SI.po'
61=== renamed file 'hr_timesheet_invoice/i18n/sl_SL.po' => 'hr_timesheet_invoice/i18n/sl_SI.po'
62=== renamed file 'hr_timesheet_sheet/i18n/sl_SL.po' => 'hr_timesheet_sheet/i18n/sl_SI.po'
63=== renamed file 'idea/i18n/sl_SL.po' => 'idea/i18n/sl_SI.po'
64=== renamed file 'l10n_be/i18n/sl_SL.po' => 'l10n_be/i18n/sl_SI.po'
65=== renamed file 'l10n_ch/i18n/sl_SL.po' => 'l10n_ch/i18n/sl_SI.po'
66=== renamed file 'l10n_ch_chart_c2c_pcg/i18n/sl_SL.po' => 'l10n_ch_chart_c2c_pcg/i18n/sl_SI.po'
67=== renamed file 'l10n_chart_uk_minimal/i18n/sl_SL.po' => 'l10n_chart_uk_minimal/i18n/sl_SI.po'
68=== renamed file 'l10n_fr/i18n/sl_SL.po' => 'l10n_fr/i18n/sl_SI.po'
69=== renamed file 'l10n_lu/i18n/sl_SL.po' => 'l10n_lu/i18n/sl_SI.po'
70=== renamed file 'membership/i18n/sl_SL.po' => 'membership/i18n/sl_SI.po'
71=== renamed file 'mrp/i18n/sl_SL.po' => 'mrp/i18n/sl_SI.po'
72=== renamed file 'mrp_jit/i18n/da_DA.po' => 'mrp_jit/i18n/da_DK.po'
73=== renamed file 'mrp_jit/i18n/sl_SL.po' => 'mrp_jit/i18n/sl_SI.po'
74=== renamed file 'mrp_operations/i18n/sl_SL.po' => 'mrp_operations/i18n/sl_SI.po'
75=== renamed file 'mrp_repair/i18n/sl_SL.po' => 'mrp_repair/i18n/sl_SI.po'
76=== renamed file 'mrp_subproduct/i18n/sl_SL.po' => 'mrp_subproduct/i18n/sl_SI.po'
77=== renamed file 'point_of_sale/i18n/sl_SL.po' => 'point_of_sale/i18n/sl_SI.po'
78=== renamed file 'process/i18n/sl_SL.po' => 'process/i18n/sl_SI.po'
79=== renamed file 'product/i18n/sl_SL.po' => 'product/i18n/sl_SI.po'
80=== renamed file 'product_margin/i18n/sl_SL.po' => 'product_margin/i18n/sl_SI.po'
81=== renamed file 'profile_accounting/i18n/sl_SL.po' => 'profile_accounting/i18n/sl_SI.po'
82=== renamed file 'profile_association/i18n/sl_SL.po' => 'profile_association/i18n/sl_SI.po'
83=== renamed file 'profile_auction/i18n/sl_SL.po' => 'profile_auction/i18n/sl_SI.po'
84=== renamed file 'profile_crm/i18n/da_DA.po' => 'profile_crm/i18n/da_DK.po'
85=== renamed file 'profile_crm/i18n/sl_SL.po' => 'profile_crm/i18n/sl_SI.po'
86=== renamed file 'profile_manufacturing/i18n/sl_SL.po' => 'profile_manufacturing/i18n/sl_SI.po'
87=== renamed file 'profile_service/i18n/sl_SL.po' => 'profile_service/i18n/sl_SI.po'
88=== renamed file 'project/i18n/sl_SL.po' => 'project/i18n/sl_SI.po'
89=== renamed file 'project_gtd/i18n/sl_SL.po' => 'project_gtd/i18n/sl_SI.po'
90=== renamed file 'project_mrp/i18n/sl_SL.po' => 'project_mrp/i18n/sl_SI.po'
91=== renamed file 'project_retro_planning/i18n/sl_SL.po' => 'project_retro_planning/i18n/sl_SI.po'
92=== renamed file 'project_timesheet/i18n/sl_SL.po' => 'project_timesheet/i18n/sl_SI.po'
93=== renamed file 'purchase/i18n/sl_SL.po' => 'purchase/i18n/sl_SI.po'
94=== renamed file 'purchase_analytic_plans/i18n/sl_SL.po' => 'purchase_analytic_plans/i18n/sl_SI.po'
95=== renamed file 'report_account/i18n/sl_SL.po' => 'report_account/i18n/sl_SI.po'
96=== renamed file 'report_analytic/i18n/sl_SL.po' => 'report_analytic/i18n/sl_SI.po'
97=== renamed file 'report_analytic_line/i18n/sl_SL.po' => 'report_analytic_line/i18n/sl_SI.po'
98=== renamed file 'report_analytic_planning/i18n/sl_SL.po' => 'report_analytic_planning/i18n/sl_SI.po'
99=== renamed file 'report_crm/i18n/sl_SL.po' => 'report_crm/i18n/sl_SI.po'
100=== renamed file 'report_document/i18n/sl_SL.po' => 'report_document/i18n/sl_SI.po'
101=== renamed file 'report_intrastat/i18n/sl_SL.po' => 'report_intrastat/i18n/sl_SI.po'
102=== renamed file 'report_mrp/i18n/sl_SL.po' => 'report_mrp/i18n/sl_SI.po'
103=== renamed file 'report_project/i18n/sl_SL.po' => 'report_project/i18n/sl_SI.po'
104=== renamed file 'report_purchase/i18n/sl_SL.po' => 'report_purchase/i18n/sl_SI.po'
105=== renamed file 'report_sale/i18n/sl_SL.po' => 'report_sale/i18n/sl_SI.po'
106=== renamed file 'report_task/i18n/sl_SL.po' => 'report_task/i18n/sl_SI.po'
107=== renamed file 'report_timesheet/i18n/sl_SL.po' => 'report_timesheet/i18n/sl_SI.po'
108=== renamed file 'sale/i18n/sl_SL.po' => 'sale/i18n/sl_SI.po'
109=== renamed file 'sale_analytic_plans/i18n/da_DA.po' => 'sale_analytic_plans/i18n/da_DK.po'
110=== renamed file 'sale_analytic_plans/i18n/sl_SL.po' => 'sale_analytic_plans/i18n/sl_SI.po'
111=== renamed file 'sale_crm/i18n/sl_SL.po' => 'sale_crm/i18n/sl_SI.po'
112=== renamed file 'sale_delivery_report/i18n/da_DA.po' => 'sale_delivery_report/i18n/da_DK.po'
113=== renamed file 'sale_delivery_report/i18n/sl_SL.po' => 'sale_delivery_report/i18n/sl_SI.po'
114=== renamed file 'sale_journal/i18n/sl_SL.po' => 'sale_journal/i18n/sl_SI.po'
115=== renamed file 'scrum/i18n/sl_SL.po' => 'scrum/i18n/sl_SI.po'
116=== renamed file 'stock/i18n/sl_SL.po' => 'stock/i18n/sl_SI.po'
117=== renamed file 'stock_invoice_directly/i18n/da_DA.po' => 'stock_invoice_directly/i18n/da_DK.po'
118=== renamed file 'stock_invoice_directly/i18n/sl_SL.po' => 'stock_invoice_directly/i18n/sl_SI.po'
119=== renamed file 'stock_location/i18n/sl_SL.po' => 'stock_location/i18n/sl_SI.po'
120=== renamed file 'stock_no_autopicking/i18n/da_DA.po' => 'stock_no_autopicking/i18n/da_DK.po'
121=== renamed file 'stock_no_autopicking/i18n/sl_SL.po' => 'stock_no_autopicking/i18n/sl_SI.po'
122=== renamed file 'subscription/i18n/sl_SL.po' => 'subscription/i18n/sl_SI.po'
123=== renamed file 'warning/i18n/sl_SL.po' => 'warning/i18n/sl_SI.po'
124=== renamed file 'wiki/i18n/sl_SL.po' => 'wiki/i18n/sl_SI.po'