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
93ebd851
Commit
93ebd851
authored
Apr 21, 2020
by
nakamura akane
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'features/1.2.0_ogawa-y' into 'contract/kagome/1.2.1'
Features/1.2.0 ogawa y See merge request
!67
parents
7ec64cce
4ad50c54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
ABVJE_Res_Default_Android/res/values-ko/strings.xml
+4
-0
ABVJE_Res_Default_Android/res/values/strings.xml
+3
-0
No files found.
ABVJE_Res_Default_Android/res/values-ko/strings.xml
View file @
93ebd851
...
...
@@ -1425,4 +1425,7 @@
<string
name=
"msg_confirm_close_edit_page"
>
편집을 종료하시겠습니까?\n(저장되지 않은 변경 사항은 삭제됩니다.)
</string>
<string
name=
"msg_error_edit_page_save"
>
파일 저장 중에 예기치 않은 오류가 발생했습니다.\n편집창을 종료합니다.
</string>
<string
name=
"msg_error_edit_page_open"
>
편집창을 여는데 실패했습니다.
</string>
<!--稼働時間登録可否チェック-->
<string
name=
"msg_error_check_running_info"
>
실행 상태를 확인하지 못했습니다.
</string>
</resources>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values/strings.xml
View file @
93ebd851
...
...
@@ -1424,4 +1424,6 @@
<string
name=
"msg_error_edit_page_save"
>
An unexpected error has occurred while saving the image.\nClosing the editing Page.
</string>
<string
name=
"msg_error_edit_page_open"
>
Failed to open the edit tool.
</string>
<!--稼働時間登録可否チェック-->
<string
name=
"msg_error_check_running_info"
>
Failed to check running status.
</string>
</resources>
\ No newline at end of file
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