Merge branch 'release/1.7.8' into develop

Conflicts:
	classes/context/Context.class.php
	config/config.inc.php
This commit is contained in:
bnu 2014-12-09 15:13:08 +09:00
commit 4506ea440e
50 changed files with 4086 additions and 126 deletions

View file

@ -850,6 +850,20 @@
<value xml:lang="tr"><![CDATA[Son Giriş Tarihi (basit)]]></value>
<value xml:lang="vi"><![CDATA[Đăng nhập ít nhất]]></value>
</item>
<item name="birthday">
<value xml:lang="ko"><![CDATA[생일]]></value>
<value xml:lang="en"><![CDATA[Birthday]]></value>
<value xml:lang="jp"><![CDATA[誕生日]]></value>
<value xml:lang="zh-CN"><![CDATA[生日]]></value>
<value xml:lang="zh-TW"><![CDATA[生日]]></value>
<value xml:lang="fr"><![CDATA[Anniversaire]]></value>
<value xml:lang="de"><![CDATA[Geburtstag]]></value>
<value xml:lang="ru"><![CDATA[Дата рождения]]></value>
<value xml:lang="es"><![CDATA[Fecha de Nacimiento]]></value>
<value xml:lang="tr"><![CDATA[Doğum günü]]></value>
<value xml:lang="vi"><![CDATA[Sinh nhật]]></value>
<value xml:lang="mn"><![CDATA[Төрсөн өдөр]]></value>
</item>
<item name="extra_vars">
<value xml:lang="ko"><![CDATA[사용자 정의]]></value>
<value xml:lang="en"><![CDATA[User Defined]]></value>