Merge remote-tracking branch 'origin/master'

common/src/main/res/layout/dialog_live_new_function.xml

@@ -263,7 +263,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="23dp"
                 android:gravity="center"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone">
 
                 <ImageView
                     android:layout_width="40dp"

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

@@ -282,9 +282,9 @@
     <string name="gxzb">Personalized Dress Up</string>
     <string name="live_camera">Flip</string>
     <string name="live_camera_s">Mirroring</string>
-    <string name="live_zg">Tricky</string>
+    <string name="live_zg">Trickster</string>
     <string name="live_dr">MultiplayerPK</string>
-    <string name="live_mic">LianmaiVoice</string>
+    <string name="live_mic">Voice Link</string>
     <string name="live_wks">Start</string>
     <string name="live_zslk">LeaveTemporarily</string>
     <string name="live_zslk1">ResumeLive</string>
@@ -647,7 +647,7 @@
     <string name="near">nearby</string>
     <string name="num_wan">ten thousand</string>
     <string name="please_wait">One moment please</string>
-    <string name="pri_msg">Private letter</string>
+    <string name="pri_msg">News</string>
     <string name="report">Report</string>
     <string name="reload">retry</string>
     <string name="refuse">refuse</string>
@@ -874,7 +874,10 @@ Limited ride And limited avatar frame</string>
     <string name="bonus_message">has sent you a reward, come and get it!</string>
     <string name="live_class_tip_title">Pay attention to the channel that suits you.</string>
     <string name="live_anchor_send">What do you say to everyone</string>
-    <string name="live_config">LiveConfig</string>
+    <string name="live_config">Settings</string>
     <string name="can_not_go">No access to the mystery man\'s personal home page。</string>
     <string name="mystery_man">The Mystery Man</string>
+    <string name="system_notice">Notice</string>
+    <string name="online_service">Online Service</string>
+    <string name="popular_tickets">Hot Ticket</string>
 </resources>

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

@@ -712,9 +712,9 @@
     <string name="live_send_buy_liang_name_1">購買了靚號</string>
     <string name="live_send_buy_vip_1">VIP</string>
     <string name="live_wishlist">心願單</string>
-    <string name="live_zg">整蠱</string>
+    <string name="live_zg">娛樂整蠱</string>
     <string name="live_dr">多人PK</string>
-    <string name="live_mic">連麥語音</string>
+    <string name="live_mic">語音連麥</string>
     <string name="live_wks">周星榜</string>
     <string name="live_zslk">暫時離開</string>
     <string name="live_zslk1">恢復直播</string>