Sergio Benitez aa9c36514f Merged conflicts.		2015-09-04 20:49:07 -07:00
..
locale_bg-BG.ini
locale_de-DE.ini
locale_en-US.ini	Added LDAP simple auth support.	2015-09-04 20:48:34 -07:00
locale_es-ES.ini
locale_fr-FR.ini
locale_it-IT.ini
locale_ja-JP.ini
locale_lv-LV.ini	finish initial version of pull request	2015-09-02 16:18:09 -04:00
locale_nl-NL.ini
locale_pl-PL.ini
locale_pt-BR.ini	finish initial version of pull request	2015-09-02 16:18:09 -04:00
locale_ru-RU.ini	finish initial version of pull request	2015-09-02 16:18:09 -04:00
locale_zh-CN.ini	finish initial version of pull request	2015-09-02 16:18:09 -04:00
locale_zh-HK.ini	finish initial version of pull request	2015-09-02 16:18:09 -04:00
TRANSLATORS	#1579 change e-mail max length to 254	2015-09-04 10:59:34 -04:00