Commit 93ebd851 by nakamura akane

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
...@@ -1425,4 +1425,7 @@ ...@@ -1425,4 +1425,7 @@
<string name="msg_confirm_close_edit_page">편집을 종료하시겠습니까?\n(저장되지 않은 변경 사항은 삭제됩니다.)</string> <string name="msg_confirm_close_edit_page">편집을 종료하시겠습니까?\n(저장되지 않은 변경 사항은 삭제됩니다.)</string>
<string name="msg_error_edit_page_save">파일 저장 중에 예기치 않은 오류가 발생했습니다.\n편집창을 종료합니다.</string> <string name="msg_error_edit_page_save">파일 저장 중에 예기치 않은 오류가 발생했습니다.\n편집창을 종료합니다.</string>
<string name="msg_error_edit_page_open">편집창을 여는데 실패했습니다.</string> <string name="msg_error_edit_page_open">편집창을 여는데 실패했습니다.</string>
<!--稼働時間登録可否チェック-->
<string name="msg_error_check_running_info">실행 상태를 확인하지 못했습니다.</string>
</resources> </resources>
\ No newline at end of file
...@@ -1424,4 +1424,6 @@ ...@@ -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_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_edit_page_open">Failed to open the edit tool.</string>
<!--稼働時間登録可否チェック-->
<string name="msg_error_check_running_info">Failed to check running status.</string>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment