Merge branch 'master' into gpg-key-multiple-addresses

This commit is contained in:
Carles Escrig Royo 2016-04-19 12:26:57 +02:00
commit d3413551f4
24 changed files with 7398 additions and 344 deletions

View file

@ -168,6 +168,7 @@
Globals.oHtmlEditorLangsMap = {
'bg_bg': 'bg',
'de_de': 'de',
'el_gr': 'el',
'es_es': 'es',
'fr_fr': 'fr',
'hu_hu': 'hu',
@ -185,6 +186,7 @@
'ro_ro': 'ro',
'ru_ru': 'ru',
'sk_sk': 'sk',
'sl_si': 'sl',
'sv_se': 'sv',
'tr_tr': 'tr',
'uk_ua': 'ru',