Merge branch '2.9-release'

This commit is contained in:
maskara 2018-11-27 22:38:20 +05:30
commit 4a2cdb70b9
21 changed files with 552 additions and 172 deletions

View file

@ -179,6 +179,7 @@
<string name="title_activity_nearby">附近地点</string>
<string name="no_nearby">找不到附近地点</string>
<string name="warning">警告</string>
<string name="upload_image_problem_duplicate">此文件在共享资源已存在。您确定要继续么?</string>
<string name="yes"></string>
<string name="no"></string>
<string name="media_detail_title">标题</string>