diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-11-05 19:34:18 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-11-05 19:34:18 +0100 |
| commit | d36eee98fb9f650989aa35472e0c0593d6df554e (patch) | |
| tree | 347f130395f1b23758d9d76df13ed69bfb98a3e4 | |
| parent | 48ffbb68fb5aa87e90b5407091127cf308416aa6 (diff) | |
| parent | 65d92dadf47a833dca731f7d0cf5b0690a503777 (diff) | |
[MERGE] forward port of branch 7.0 up to 65d92da
| -rw-r--r-- | openerp/tools/misc.py | 2 | ||||
| -rw-r--r-- | openerp/tools/translate.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 00fc02be0c0..0fc3b416f5c 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -426,7 +426,7 @@ ALL_LANGUAGES = { 'am_ET': u'Amharic / አምሃርኛ', 'ar_SY': u'Arabic / الْعَرَبيّة', 'bg_BG': u'Bulgarian / български език', - 'bs_BS': u'Bosnian / bosanski jezik', + 'bs_BA': u'Bosnian / bosanski jezik', 'ca_ES': u'Catalan / Català', 'cs_CZ': u'Czech / Čeština', 'da_DK': u'Danish / Dansk', diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index b99dff9aa2b..df4efb6654d 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -56,7 +56,7 @@ _LOCALE2WIN32 = { 'ar_SA': 'Arabic_Saudi Arabia', 'eu_ES': 'Basque_Spain', 'be_BY': 'Belarusian_Belarus', - 'bs_BA': 'Serbian (Latin)', + 'bs_BA': 'Bosnian_Bosnia and Herzegovina', 'bg_BG': 'Bulgarian_Bulgaria', 'ca_ES': 'Catalan_Spain', 'hr_HR': 'Croatian_Croatia', |