From e47304e4e2bf4411d4e7f0cccd69f2daa2fda599 Mon Sep 17 00:00:00 2001
From: harperhpliu <harperhpliu@tencent.com>
Date: Fri, 10 Dec 2021 18:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=20TUIKit=20=E5=8F=91=E5=B8=835.8.1696=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TUIChat/tuichat/src/main/res/layout/forward_msg_holder.xml  | 2 +-
 .../TUIChat/tuichat/src/main/res/values-zh-rCN/strings.xml      | 1 +
 Android/TUIKit/TUIChat/tuichat/src/main/res/values/strings.xml  | 1 +
 .../tuicontact/src/main/res/layout/contact_add_activity.xml     | 2 +-
 .../tuicontact/src/main/res/values-zh-rCN/strings.xml           | 1 +
 .../TUIContact/tuicontact/src/main/res/values/strings.xml       | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Android/TUIKit/TUIChat/tuichat/src/main/res/layout/forward_msg_holder.xml b/Android/TUIKit/TUIChat/tuichat/src/main/res/layout/forward_msg_holder.xml
index f53116900..11d8fd658 100644
--- a/Android/TUIKit/TUIChat/tuichat/src/main/res/layout/forward_msg_holder.xml
+++ b/Android/TUIKit/TUIChat/tuichat/src/main/res/layout/forward_msg_holder.xml
@@ -42,7 +42,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/chat_record"
+        android:text="@string/forward_chat_record"
         android:layout_marginTop="8dp"
         android:textColor="#888888"
         android:textSize="8.6sp" />
diff --git a/Android/TUIKit/TUIChat/tuichat/src/main/res/values-zh-rCN/strings.xml b/Android/TUIKit/TUIChat/tuichat/src/main/res/values-zh-rCN/strings.xml
index 697fcf0c0..e68693e7e 100644
--- a/Android/TUIKit/TUIChat/tuichat/src/main/res/values-zh-rCN/strings.xml
+++ b/Android/TUIKit/TUIChat/tuichat/src/main/res/values-zh-rCN/strings.xml
@@ -31,6 +31,7 @@
     <string name="forward_compatible_text">不支持合并转发消息，请升级到新版本。</string>
 
     <string name="forward_failed_tip">发送失败消息不支持转发！</string>
+    <string name="forward_chat_record">聊天记录</string>
     <string name="forward_oneByOne_limit_number_tip">转发消息过多，暂不支持逐条转发</string>
 
     <string name="and_and">已和</string>
diff --git a/Android/TUIKit/TUIChat/tuichat/src/main/res/values/strings.xml b/Android/TUIKit/TUIChat/tuichat/src/main/res/values/strings.xml
index 3f655d80d..f92e7f9f7 100644
--- a/Android/TUIKit/TUIChat/tuichat/src/main/res/values/strings.xml
+++ b/Android/TUIKit/TUIChat/tuichat/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="and_text">and</string>
     <string name="forward_chats_c2c">Chat History</string>
     <string name="forward_compatible_text">Does not support merging and forwarding messages，please upgrade to the new version.</string>
+    <string name="forward_chat_record">Chat Record</string>
 
     <string name="forward_failed_tip">No Support for send failed message.</string>
     <string name="forward_oneByOne_limit_number_tip">Too many forwarded messages, one by one forwarding is not currently supported</string>
diff --git a/Android/TUIKit/TUIContact/tuicontact/src/main/res/layout/contact_add_activity.xml b/Android/TUIKit/TUIContact/tuicontact/src/main/res/layout/contact_add_activity.xml
index efe282360..eec7f0c7a 100644
--- a/Android/TUIKit/TUIContact/tuicontact/src/main/res/layout/contact_add_activity.xml
+++ b/Android/TUIKit/TUIContact/tuicontact/src/main/res/layout/contact_add_activity.xml
@@ -25,7 +25,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="10dp"
-            android:text="@string/search"
+            android:text="@string/contact_search"
             android:textSize="15.36sp" />
 
         <LinearLayout
diff --git a/Android/TUIKit/TUIContact/tuicontact/src/main/res/values-zh-rCN/strings.xml b/Android/TUIKit/TUIContact/tuicontact/src/main/res/values-zh-rCN/strings.xml
index 798930a13..2de51b57f 100644
--- a/Android/TUIKit/TUIContact/tuicontact/src/main/res/values-zh-rCN/strings.xml
+++ b/Android/TUIKit/TUIContact/tuicontact/src/main/res/values-zh-rCN/strings.xml
@@ -21,6 +21,7 @@
     <string name="set_in_blacklist">您已被被对方设置为黑名单</string>
     <string name="wait_agree_friend">等待好友审核同意</string>
     <string name="send_request">加群请求已发送</string>
+    <string name="contact_search">搜索</string>
 
     <string name="add_group_permission_deny">禁止加群</string>
     <string name="add_group_allready_member">已经是群成员</string>
diff --git a/Android/TUIKit/TUIContact/tuicontact/src/main/res/values/strings.xml b/Android/TUIKit/TUIContact/tuicontact/src/main/res/values/strings.xml
index 265cd6fb2..760409897 100644
--- a/Android/TUIKit/TUIContact/tuicontact/src/main/res/values/strings.xml
+++ b/Android/TUIKit/TUIContact/tuicontact/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
     <string name="add_group_allready_member">The user is a group member</string>
     <string name="add_group_not_found">The group does not exist</string>
     <string name="add_group_full_member">The number of group members has reached the limit</string>
+    <string name="contact_search">Search</string>
 
     // 新朋友
     <string name="request_agree">Accept</string>