Merge branch 'master' into dev_random_pk

# Conflicts:
#	live/src/main/res/values/strings.xml

common/src/main/res/values/strings.xml

@@ -70,6 +70,7 @@
     <string name="edit_profile_sex">性別</string>
     <string name="apply_for_lianmai">申请連麥</string>
     <string name="cancel_application">取消申請</string>
+    <string name="close_mic">關閉連麥</string>
     <string name="quit_mic">退出連麥</string>
     <string name="edit_profile_city">所在地</string>
     <string name="edit_one_1">編輯個人資料</string>
@@ -617,6 +618,7 @@
     <string name="glamour_list">魅力榜</string>
     <string name="magnificent_list">豪氣榜</string>
     <string name="no_more_mic">當前沒有人在語音連麥中</string>
+    <string name="live_anchor_open_mic">語音連麥未開啟</string>
     <string name="load_failure">網絡請求失敗</string>
     <string name="load_failure_2">請檢查網絡連接後重試~</string>
     <string name="loading">加載中</string>
@@ -963,4 +965,5 @@
     <string name="image_quality_selection" translatable="false">畫質選擇</string>
     <string name="more_settings" translatable="false">更多設置</string>
     <string name="moer">查看更多</string>
+    <string name="gift_way">礼物正在获取中...</string>
 </resources>