Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
b4c299f5
Commit
b4c299f5
authored
Jun 21, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
43242対応
parent
615b3f79
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
0 deletions
+6
-0
ABVJE_Res_Default_Android/res/values-ja/strings.xml
+1
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+2
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
+2
-0
No files found.
ABVJE_Res_Default_Android/res/values-ja/strings.xml
View file @
b4c299f5
...
@@ -1487,6 +1487,7 @@
...
@@ -1487,6 +1487,7 @@
<string
name=
"msg_rejected_by_host"
>
ホストの変更依頼は拒否されました。
</string>
<string
name=
"msg_rejected_by_host"
>
ホストの変更依頼は拒否されました。
</string>
<string
name=
"msg_invalid_parameters"
>
通信に失敗しました。チャットルームに戻ります。
</string>
<string
name=
"msg_invalid_parameters"
>
通信に失敗しました。チャットルームに戻ります。
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
進行中の協業が存在します。既存協業を終了し、新しい協業を開始してもよろしいですか
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
進行中の協業が存在します。既存協業を終了し、新しい協業を開始してもよろしいですか
</string>
<string
name=
"not_found_camera"
>
利用可能なカメラを見つかりませんでした。
</string>
<!-- 連続作業 -->
<!-- 連続作業 -->
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
<string
name=
"msg_error_all_process_delete"
>
全削除の送信に失敗しました。
</string>
...
...
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
b4c299f5
...
@@ -1494,5 +1494,6 @@
...
@@ -1494,5 +1494,6 @@
<string
name=
"msg_wait_for_host"
>
호스트가 문서를 선택중입니다.
</string>
<string
name=
"msg_wait_for_host"
>
호스트가 문서를 선택중입니다.
</string>
<string
name=
"msg_rejected_by_host"
>
호스트가 요청을 거절하셨습니다.
</string>
<string
name=
"msg_rejected_by_host"
>
호스트가 요청을 거절하셨습니다.
</string>
<string
name=
"msg_invalid_parameters"
>
통신에 실패했습니다. 채팅룸으로 돌아갑니다.
</string>
<string
name=
"msg_invalid_parameters"
>
통신에 실패했습니다. 채팅룸으로 돌아갑니다.
</string>
<string
name=
"not_found_camera"
>
사용 가능한 카메라 기기를 찾을수 없습니다.
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
진행중인 협업이 존재합니다. 기존 협업을 종료하고 새로운 협업을 시작 하시겠습니까?
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
진행중인 협업이 존재합니다. 기존 협업을 종료하고 새로운 협업을 시작 하시겠습니까?
</string>
</resources>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
b4c299f5
...
@@ -1491,5 +1491,6 @@
...
@@ -1491,5 +1491,6 @@
<string
name=
"msg_wait_for_host"
>
Please wait for selecting document by host
</string>
<string
name=
"msg_wait_for_host"
>
Please wait for selecting document by host
</string>
<string
name=
"msg_rejected_by_host"
>
Rejected host request.
</string>
<string
name=
"msg_rejected_by_host"
>
Rejected host request.
</string>
<string
name=
"msg_invalid_parameters"
>
Communication failed. Return to the chat room.
</string>
<string
name=
"msg_invalid_parameters"
>
Communication failed. Return to the chat room.
</string>
<string
name=
"not_found_camera"
>
Not found camera device.
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
Ongoing collaboration exist. Do you want to terminate exist collaboration and start new?
</string>
<string
name=
"msg_destroy_exist_collaboration"
>
Ongoing collaboration exist. Do you want to terminate exist collaboration and start new?
</string>
</resources>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebViewActivity.java
View file @
b4c299f5
...
@@ -400,6 +400,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
...
@@ -400,6 +400,8 @@ public class ChatWebViewActivity extends CommunicationWebViewActivity {
message
=
getString
(
R
.
string
.
msg_rejected_by_host
);
message
=
getString
(
R
.
string
.
msg_rejected_by_host
);
}
else
if
(
message
.
contains
(
"Invalid Parameters"
))
{
}
else
if
(
message
.
contains
(
"Invalid Parameters"
))
{
message
=
getString
(
R
.
string
.
msg_invalid_parameters
);
message
=
getString
(
R
.
string
.
msg_invalid_parameters
);
}
else
if
(
message
.
contains
(
"사용 가능한 카메라 기기를 찾을수 없습니다"
))
{
message
=
getString
(
R
.
string
.
not_found_camera
);
}
}
final
String
tempMessage
=
message
;
final
String
tempMessage
=
message
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment