reverse merge from 1.6.0 (r10668, r10667, r10600, r10596, r10595, r10594, r10578, r10572)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10717 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:27:55 +00:00
parent a4b3a914a5
commit f7330acf02
13 changed files with 137 additions and 144 deletions

View file

@ -7,6 +7,6 @@ fr,Français
de,Deutsch
ru,Русский
es,Español
tr,Turkçe
tr,Türkçe
vi,Tiếng Việt
mn,Mongolian

View file

@ -3002,6 +3002,10 @@ Xin vui lòng kiểm tra lại thông tin Database.]]></value>
<value xml:lang="zh-TW"><![CDATA[註冊失敗。]]></value>
<value xml:lang="de"><![CDATA[Misserfolg der Registrierung]]></value>
</item>
<item name="fail_to_update">
<value xml:lang="ko"><![CDATA[수정하지 못했습니다.]]></value>
<value xml:lang="en"><![CDATA[Fail to update.]]></value>
</item>
<item name="fail_to_delete">
<value xml:lang="ko"><![CDATA[삭제 실패했습니다.]]></value>
<value xml:lang="en"><![CDATA[Failed to delete.]]></value>