中英文图片问题

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

@@ -812,6 +812,7 @@ Limited ride And limited avatar frame</string>
 
     <string name="random_pk_dialog_apply">accept</string>
     <string name="random_pk_dialog_refuse">refuse</string>
+    <string name="random_pk_dialog_refuse_again">Persist in refusing</string>
     <string name="random_pk_dialog_title">Random PK hint</string>
 
     <string name="speech_robot_setup">Automatic speech robot setup</string>

live/src/main/res/layout/dialog_live_data.xml

@@ -46,12 +46,13 @@
                     android:id="@+id/live_data_img"
                     android:layout_width="13dp"
                     android:layout_height="13dp"
-                    android:layout_marginEnd="10dp"
+                    android:layout_marginEnd="5dp"
                     tools:srcCompat="@mipmap/icon_free_pk_waring" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:textSize="8dp"
                     android:text="@string/live_data_msg2"
                     android:textColor="#595959" />
             </LinearLayout>

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

@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_more_day_rank">No one is on the list at the moment</string>
-    <string name="no_more_guard">anchor are waiting at your guard!</string>
-    <string name="no_rank_data">Not on the list</string>
-    <string name="hour_rank">No.%s</string>
-    <string name="hour_rank_not">Not listed</string>
-    <string name="day_rank">Day</string>
-    <string name="week_rank">Weekly</string>
-    <string name="views_rank">Viewers</string>
-    <string name="gurad_rank">Guard</string>
-    <string name="fans">Fans</string>
-    <string name="room_msg">News</string>
-    <string name="live_room_title">Select room type</string>
-    <string name="live_room_public">Public Rooms</string>
-    <string name="live_room_private">Password Rooms</string>
-    <string name="live_room_public_des">Available for all</string>
-    <string name="live_room_private_des">Only those who have the room code can watch</string>
-    <string name="live_room_type_submit">Submit</string>
-    <string name="live_mic_max">The number of voices has reached 3, and no more can be added.</string>
-    <string name="live_task_no1">Consecutive broadcast duration of the day (minutes)</string>
-    <string name="live_task_no2">PK count on the day (unlimited mode)</string>
-    <string name="live_task_fans_no1">Accumulated new followers on that day</string>
-    <string name="live_task_fans_no2">Cumulative new fan group members on that day</string>
-    <string name="live_task_tab1">Live interaction</string>
-    <string name="live_task_tab2">Fan growth</string>
-    <string name="live_task_info_title">Special instructions for anchor tasks</string>
-    <string name="live_task_info_msg1">After the broadcast, all anchors can get a series of tasks of the day. After completing the tasks according to the corresponding requirements, anchors can get the task reward of the previous day after the broadcast of the next day.</string>
-    <string name="live_task_info_msg2">● All task values will be calculated by the system in real time. If data errors occur due to personal, mobile, computer equipment problems, network problems or no normal downcasting, relevant anchors can contact relevant platform staff or online customer service for feedback. After confirmation by relevant part, compensation will be processed.\n● The normal settlement period of all mission data will be settled at 6:00 am every day. If the broadcast time is longer than 6:00 AM, the reward cannot be settled normally, please be noted.\n● When the anchor standard score is lower than 90, the anchor task center can only get 50% of all rewards. When the anchor standard score is lower than 80, the anchor task reward cannot be obtained.</string>
-    <string name="live_task_item_complete_true">success</string>
-    <string name="live_task_item_complete_false">incomplete</string>
-    <string name="live_task_item_hot">hot</string>
-    <string name="live_task_item_xp">exp</string>
-    <string name="live_data_msg1">This live data statistics</string>
-    <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
-    <string name="live_data_tip">* Non-real-time calculation of data</string>
-
-    <string name="buy_guard_info" >Guardian, always be there for your anchor~ </string>
-    <string name="buy_guard_back_coin" >return</string>
-    <string name="praise">Like</string>
-    <string name="live_gift_buy_gold" >Open aristocracy</string>
-    <string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
-    <string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
-    <string name="fingers_slide" >Swipe up to cancel send</string>
-    <string name="release_cancel_send" >Release cancel send</string>
-    <string name="more_than" >No recording has been recognized in over 10 seconds</string>
-    <string name="live_role_title" >Identity privilege</string>
-    <string name="noble_seat" >VIP seats</string>
-    <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
-    <string name="live_mic_user_down" >The wheat has been kicked off</string>
-    <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
-    <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
-    <string name="random_pk_info_view_title" >Random PK</string>
-    <string name="random_pk_info_title" >PK main rules:</string>
-    <string name="random_pk_info_time_desc" >Random PK qualifying time</string>
-    <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
-    <string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
-    <string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
-    <string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
-    <string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
-    <string name="random_pk_info_switch" >Random PK switch:</string>
-    <string name="random_pk_info_btn_start" >Start matching</string>
-    <string name="random_pk_info_btn_ing" >Match %s</string>
-    <string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
-    <string name="random_pk_info_btn_end" >Exiting match %s</string>
-    <string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
-    <string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
-    <string name="free_pk_user_pking" >The other team is engaged in a PK</string>
-    <string name="free_pk_num_null" >The PK number is used up</string>
-    <string name="live_user_mailbox_top_text">Letter from %s</string>
-    <string name="live_user_mailbox_tip_text">「%s」have more to say to you</string>
-    <string name="live_user_mailbox_more_text">View details</string>
-    <string name="live_user_mailbox_web_title">Letter from[%s]</string>
-    <string name="live_anchor_edit_call_me_title">Editors Contact</string>
-    <string name="live_anchor_edit_call_me_switch">Contact switch</string>
-    <string name="live_anchor_edit_call_me_select_gift">Choose a gift</string>
-    <string name="live_anchor_edit_call_me_not_filled">Not filled</string>
-    <string name="live_anchor_edit_call_me_not_filled_toash">Please fill in your contact details before enabling</string>
-    <string name="live_anchor_edit_call_me_not_gift_toash">No gift selected</string>
-    <string name="live_anchor_edit_call_me_letter_title">Letter Content</string>
-    <string name="live_anchor_edit_call_me_letter_content">The most romantic thing I can think of is to grow old with you, to collect all the laughs along the way, and to talk about them later in a rocking chair.</string>
-    <string name="live_ready_anchor_call_me">Contact</string>
-    <string name="live_anchor_say_title">Editors Goddess says</string>
-    <string name="live_anchor_say_edit_hint">Please enter the words the goddess wants to say, limited to 16 words.</string>
-    <string name="live_anchor_say_select_style">Select Style</string>
-    <string name="live_anchor_say_switch">The Goddess Says Switch</string>
-    <string name="live_user_letter_dialog_title">Delete Mail</string>
-    <string name="live_user_letter_dialog_content">Do you confirm the deletion of this email?</string>
-    <string name="live_user_letter_dialog_yes">Delete</string>
-    <string name="live_user_letter_dialog_no">Think again</string>
-    <string name="dialog_live_mailbox_title">Letter</string>
-    <string name="live_anchor_edit_call_me_not_call_info_toash">Please turn on at least one contact information</string>
-    <string name="minute">Minute</string>
-    <string name="live_setting_silence_title">Please select</string>
-    <string name="live_ban_tip">You have been banned</string>
-    <string name="live_details_send_gift_btn">Confirm</string>
-    <string name="live_details_sned_gift_text1">Give</string>
-    <string name="live_details_sned_gift_text2">obtain the</string>
-    <string name="live_details_sned_gift_text3">\'s letter and contact information</string>
-    <string name="me_edit_avatar_title">Select Avatar</string>
-    <string name="me_edit_avatar_submit">Confirm</string>
-    <string name="live_fans_group_info_text1">1 The fan exclusive gift pack is an exclusive benefit for fan group users, which can quickly increase their companionship with the host after purchase</string>
-    <string name="live_fans_group_info_text2">2 After the gift pack is successfully purchased, the gift will be sent to [Fan Exclusive Gift Pack - Gift Pack], you can view and use it in [Gift Pack]; the avatar frame will be sent to [My - Personalized Dressing], you can use it in [Personalized Dressing] View and use in</string>
-    <string name="live_fans_group_info_text3">3 The exclusive gift package is bound to the anchor in a one-on-one relationship, and purchasing gift resources in the exclusive gift package can only be given to the anchor</string>
-    <string name="live_fans_group_info_text4">4 The gift resources in the gift package are valid for 30 days and can be given normally during the validity period; Gift resources become invalid and cannot be given after expiration</string>
-    <string name="live_fans_group_info2_text1">1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase</string>
-    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to PD Live</string>
-    <string name="live_fans_group_info_title">Introduction</string>
-    <string name="live_fans_group_info2_title">Rules</string>
-    <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>
-    <string name="live_fans_group_send_sub">Gift</string>
-    <string name="live_fans_group_send_title">Currently Available To Send</string>
-    <string name="live_fans_group_buy_title">The %s</string>
-    <string name="live_fans_group_buy_info">Purchase a %s Diamond Specific Gift And Receive ALimited Resource</string>
-    <string name="live_fans_group_buy_buy">%s Diamond</string>
-    <string name="live_fans_group_enter_room">Welcome,Fan Club Members</string>
-    <string name="live_fans_group_send_gift_tips">Fan group level Of Lv%s Can send this gift</string>
-    <string name="live_rad_pack_join_fans_group_tip">Join the fan group can be opened [Join]</string>
-    <string name="live_rad_pack_join_fans_group_click_tip">Join the fan group to open</string>
-    <string name="message_chat_msg_all">Chat All</string>
-    <string name="message_chat_msg_all_an_a">Chat All</string>
-    <string name="message_chat_msg_recommend">Suggest chat</string>
-    <string name="message_chat_msg_system">System matching</string>
-    <string name="message_chat_msg_user">User initiated</string>
-    <string name="message_chat_msg_look_live">看直播%dmin</string>
-    <string name="message_chat_msg_read_tip">[Read]</string>
-    <string name="message_chat_msg_unread_tip">[Unread]</string>
-    <string name="message_interactive_chat">Initiate a chat</string>
-
-    <string name="prank_progress">Progress</string>
-    <string name="turntable_prank">To do</string>
-    <string name="details">Details></string>
-    <string name="combo_vote">Combo</string>
-    <string name="combo_vote_more">Most first</string>
-    <string name="live_prank_dialog_save">Save</string>
-    <string name="live_prank_dialog_clear">Clear</string>
-    <string name="live_prank_dialog_gift_type_number">highest combo</string>
-    <string name="live_prank_gift_add_title">Add gift</string>
-    <string name="live_prank_gift_add_gift">Gift</string>
-    <string name="live_prank_gift_add_gift_select">Choose a gift</string>
-    <string name="live_prank_gift_add_gift_number">Quantity</string>
-    <string name="live_prank_gift_add_gift_number_select">Fill in the number</string>
-    <string name="live_prank_gift_add_gift_content">Content</string>
-    <string name="live_prank_gift_add_gift_contnet_select">Please enter prank content, such as a dance.</string>
-    <string name="alive_prank_gift_add_gift_content_sub">confirm</string>
-    <string name="alive_prank_gift_dialog_number_title">Quantity</string>
-    <string name="live_prank_gift_dialog_number_btn">+ Set other quantity (up to 9999)</string>
-    <string name="alive_prank_gift_dialog_explain">Trick instructions</string>
-    <string name="prank_open_live_msg">Entertainment Tricky has been newly upgraded. Go and set up Tricky content to add more fun to the live broadcast room!</string>
-    <string name="prank_im_immediately_go">Go now</string>
-
-    <string name="live_prank_dialog_gift_type_todo">Switch to</string>
-    <string name="live_prank_switch">gift trick switch</string>
-    <string name="live_prank_switch_info">After closing, the user cannot see the gift trick</string>
-    <string name="live_prank_add_gift">+ Add gift trick</string>
-    <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
-
-    <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
-    <string name="live_room_sud_hint_join">Join</string>
-    <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
-</resources>

live/src/main/res/values-zh/strings.xml

@@ -145,4 +145,15 @@
     <string name="prank_im_immediately_go">立即前往</string>
     <string name="live_room_sud_hint_join">加入</string>
     <string name="live_dialog_top_guardian_tasks">守護任務</string>
+
+    <string name="message_chat_msg_all">全部聊天</string>
+    <string name="message_chat_msg_all_an_a">全部聊天</string>
+    <string name="message_chat_msg_recommend">推荐聊天</string>
+    <string name="message_chat_msg_system">系統匹配</string>
+    <string name="message_chat_msg_user">對方主動</string>
+    <string name="message_chat_msg_look_live">看直播%dmin</string>
+    <string name="message_chat_msg_read_tip">[已讀]</string>
+    <string name="message_chat_msg_unread_tip">[未讀]</string>
+    <string name="message_interactive_chat">發起聊天</string>
+
 </resources>