From fee31f2672f7461ee0a1ce75c0f699de778486c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=99=A8?= <zhangchen@96966.com>
Date: Wed, 25 Sep 2024 14:35:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B8=B8=E6=88=8F=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E7=AC=AC=E4=BA=94=E6=9C=9F=EF=BC=89?=
 =?UTF-8?q?-0925=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98-=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=20https://jira.shanqu.cc/browse/GHZSCY-6736?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                             | 3 +--
 app/src/main/res/values-zh-rTW/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4e2ec836d..97c7af21ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,6 @@ android_build:
   only:
     - dev
     - release
-    - feat/GHZSCY-5915
 
 # 代码检查
 sonarqube_analysis:
@@ -157,4 +156,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
\ No newline at end of file
+        - release
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 672279679c..b850747991 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -616,7 +616,7 @@
     <string name="verify_code_send_with_phone_number">已經發送至%1$s</string>
     <string name="change_the_wechat_binding">更換綁定微信</string>
     <string name="binding_failed">綁定失敗</string>
-    <string name="binding_failed_description">該微訊號（微信暱稱）已經綁定在另一個衝突號碼上，衝突號碼可能是你先前登入的</string>
+    <string name="binding_failed_description">該微訊號已經綁定在另一個衝突號碼上，衝突號碼可能是你先前登入的</string>
     <string name="current_number">目前號</string>
     <string name="conflict_number">衝突號</string>
     <string name="change_binding_tips_with_conflict">遇到衝突如何換綁？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e31c4f440a..234b8fd030 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -616,7 +616,7 @@
     <string name="verify_code_send_with_phone_number">已经发送至%1$s</string>
     <string name="change_the_wechat_binding">更换绑定微信</string>
     <string name="binding_failed">绑定失败</string>
-    <string name="binding_failed_description">该微信号（微信昵称）已经绑定在另外一个冲突号上，冲突号可能是你之前登录的</string>
+    <string name="binding_failed_description">该微信号已经绑定在另外一个冲突号上，冲突号可能是你之前登录的</string>
     <string name="current_number">当前号</string>
     <string name="conflict_number">冲突号</string>
     <string name="change_binding_tips_with_conflict">遇到冲突如何换绑？</string>