From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_Android/Resources/values/strings.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Resources/values/strings.xml b/HDL-ON_Android/Resources/values/strings.xml
index 00d8ad7..6f41ee5 100644
--- a/HDL-ON_Android/Resources/values/strings.xml
+++ b/HDL-ON_Android/Resources/values/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
- <string name="action_settings">Setting</string>
+ <string name="action_settings">Setting</string>
<string name="video_screenshot">Screenshot</string>
<string name="video_unlock">Unlock</string>
<string name="video_answer">Answer</string>
@@ -17,5 +17,8 @@
<string name="on_the_phone">On the phone</string>
<string name="unlock_success">Unlock successfully</string>
<string name="screenshot_success">Screenshot successfully</string>
-
+ <string name="talk_open_success">Intercom Begin</string>
+ <string name="talk_open_failed">Intercom failed to open</string>
+ <string name="unlock_fail">Fail to unlock</string>
+ <string name="screenshot_fail">Fail to screenshot</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0