Skip to content

A
abook_check
Commit 0888ef48 by Kim Jinsung
Options

Merge branch 'hotfix/1.0.4' into contract/sato/1.0.0 

# Conflicts:
#	ABVJE_Res_Default_Android/res/values-ko/strings.xml
parents 4d7278ac 137e7770
Showing with 26 additions and 10 deletions
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -345,6 +345,7 @@ ...@@ -345,6 +345,7 @@
<string name="save_all">一括保存</string> <string name="save_all">一括保存</string>
<string name="content_update">更新</string> <string name="content_update">更新</string>
<string name="remote_support">遠隔支援</string> <string name="remote_support">遠隔支援</string>
<string name="remote_support_list">遠隔支援一覧</string>
<string name="new_make">新規作成</string> <string name="new_make">新規作成</string>
<string name="msg_no_data">現在登録はありません</string> <string name="msg_no_data">現在登録はありません</string>
<string name="msg_confirm_exit_meeting_room">参加者全員の接続が切れますが、ルームから退室しますか？</string> <string name="msg_confirm_exit_meeting_room">参加者全員の接続が切れますが、ルームから退室しますか？</string>
...@@ -514,7 +515,8 @@ ...@@ -514,7 +515,8 @@
<string name="msg_help_pdf_pin">このボタンを押すと、すでに登録されている報告をピンで表示します。</string> <string name="msg_help_pdf_pin">このボタンを押すと、すでに登録されている報告をピンで表示します。</string>
<string name="msg_help_pdf_pin_hide">このボタンを押している間はピンを隠します。</string> <string name="msg_help_pdf_pin_hide">このボタンを押している間はピンを隠します。</string>
<string name="msg_help_list_report_add">新たに報告を追加することができます。</string> <string name="msg_help_list_report_add">新たに報告を追加することができます。</string>
<string name="msg_help_pdf_move_360">このボタンを押すと作業コードラベルを移動させることができるようになります。</string> <string name="msg_help_360_move">このボタンを押すと作業コードラベルを移動させることができるようになります。</string>
<string name="msg_help_360_touch">このボタンを押すと作業コードボタンのタップが可能になり、報告できるようになります。</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
<string name="meetingroom_setting_1">会議室設定(1)</string> <string name="meetingroom_setting_1">会議室設定(1)</string>
...@@ -545,6 +547,7 @@ ...@@ -545,6 +547,7 @@
<string name="save_all_1">一括保存(1)</string> <string name="save_all_1">一括保存(1)</string>
<string name="content_update_1">更新(1)</string> <string name="content_update_1">更新(1)</string>
<string name="remote_support_1">遠隔支援(1)</string> <string name="remote_support_1">遠隔支援(1)</string>
<string name="remote_support_list_1">遠隔支援一覧(1)</string>
<string name="new_make_1">新規作成(1)</string> <string name="new_make_1">新規作成(1)</string>
<string name="msg_no_data_1">現在登録はありません(1)</string> <string name="msg_no_data_1">現在登録はありません(1)</string>
<string name="msg_confirm_exit_meeting_room_1">参加者全員の接続が切れますが、ルームから退室しますか？(1)</string> <string name="msg_confirm_exit_meeting_room_1">参加者全員の接続が切れますが、ルームから退室しますか？(1)</string>
...@@ -720,6 +723,7 @@ ...@@ -720,6 +723,7 @@
<string name="save_all_2">一括保存(2)</string> <string name="save_all_2">一括保存(2)</string>
<string name="content_update_2">更新(2)</string> <string name="content_update_2">更新(2)</string>
<string name="remote_support_2">遠隔支援(2)</string> <string name="remote_support_2">遠隔支援(2)</string>
<string name="remote_support_list_2">遠隔支援一覧(2)</string>
<string name="new_make_2">新規作成(2)</string> <string name="new_make_2">新規作成(2)</string>
<string name="msg_no_data_2">現在登録はありません(2)</string> <string name="msg_no_data_2">現在登録はありません(2)</string>
<string name="msg_confirm_exit_meeting_room_2">参加者全員の接続が切れますが、ルームから退室しますか？(2)</string> <string name="msg_confirm_exit_meeting_room_2">参加者全員の接続が切れますが、ルームから退室しますか？(2)</string>
...@@ -895,6 +899,7 @@ ...@@ -895,6 +899,7 @@
<string name="save_all_3">一括保存(3)</string> <string name="save_all_3">一括保存(3)</string>
<string name="content_update_3">更新(3)</string> <string name="content_update_3">更新(3)</string>
<string name="remote_support_3">遠隔支援(3)</string> <string name="remote_support_3">遠隔支援(3)</string>
<string name="remote_support_list_3">遠隔支援一覧(3)</string>
<string name="new_make_3">新規作成(3)</string> <string name="new_make_3">新規作成(3)</string>
<string name="msg_no_data_3">現在登録はありません(3)</string> <string name="msg_no_data_3">現在登録はありません(3)</string>
<string name="msg_confirm_exit_meeting_room_3">参加者全員の接続が切れますが、ルームから退室しますか？(3)</string> <string name="msg_confirm_exit_meeting_room_3">参加者全員の接続が切れますが、ルームから退室しますか？(3)</string>
...@@ -1070,6 +1075,7 @@ ...@@ -1070,6 +1075,7 @@
<string name="save_all_4">一括保存(4)</string> <string name="save_all_4">一括保存(4)</string>
<string name="content_update_4">更新(4)</string> <string name="content_update_4">更新(4)</string>
<string name="remote_support_4">遠隔支援(4)</string> <string name="remote_support_4">遠隔支援(4)</string>
<string name="remote_support_list_4">遠隔支援一覧(4)</string>
<string name="new_make_4">新規作成(4)</string> <string name="new_make_4">新規作成(4)</string>
<string name="msg_no_data_4">現在登録はありません(4)</string> <string name="msg_no_data_4">現在登録はありません(4)</string>
<string name="msg_confirm_exit_meeting_room_4">参加者全員の接続が切れますが、ルームから退室しますか？(4)</string> <string name="msg_confirm_exit_meeting_room_4">参加者全員の接続が切れますが、ルームから退室しますか？(4)</string>
...@@ -1245,6 +1251,7 @@ ...@@ -1245,6 +1251,7 @@
<string name="save_all_5">一括保存(5)</string> <string name="save_all_5">一括保存(5)</string>
<string name="content_update_5">更新(5)</string> <string name="content_update_5">更新(5)</string>
<string name="remote_support_5">遠隔支援(5)</string> <string name="remote_support_5">遠隔支援(5)</string>
<string name="remote_support_list_5">遠隔支援一覧(5)</string>
<string name="new_make_5">新規作成(5)</string> <string name="new_make_5">新規作成(5)</string>
<string name="msg_no_data_5">現在登録はありません(5)</string> <string name="msg_no_data_5">現在登録はありません(5)</string>
<string name="msg_confirm_exit_meeting_room_5">参加者全員の接続が切れますが、ルームから退室しますか？(5)</string> <string name="msg_confirm_exit_meeting_room_5">参加者全員の接続が切れますが、ルームから退室しますか？(5)</string>
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
This source diff could not be displayed because it is too large. You can view the blob instead.
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -351,6 +351,7 @@ ...@@ -351,6 +351,7 @@
<string name="save_all">Save All</string> <string name="save_all">Save All</string>
<string name="content_update">update</string> <string name="content_update">update</string>
<string name="remote_support">Remote Support</string> <string name="remote_support">Remote Support</string>
<string name="remote_support_list">Remote Support List</string>
<string name="new_make">New Make</string> <string name="new_make">New Make</string>
<string name="msg_no_data">There are not registered data.</string> <string name="msg_no_data">There are not registered data.</string>
<string name="msg_confirm_exit_meeting_room">All the participants will be disconnected, will you leave the room?</string> <string name="msg_confirm_exit_meeting_room">All the participants will be disconnected, will you leave the room?</string>
...@@ -520,7 +521,8 @@ ...@@ -520,7 +521,8 @@
<string name="msg_help_pdf_pin">When this button is pressed, already registered reports are displayed with pins.</string> <string name="msg_help_pdf_pin">When this button is pressed, already registered reports are displayed with pins.</string>
<string name="msg_help_pdf_pin_hide">Hides the pin while pressing this button.</string> <string name="msg_help_pdf_pin_hide">Hides the pin while pressing this button.</string>
<string name="msg_help_list_report_add">You can add new reports.</string> <string name="msg_help_list_report_add">You can add new reports.</string>
<string name="msg_help_pdf_move_360">Press this button to move the work code label.</string> <string name="msg_help_360_move">Press this button to move the work code label.</string>
<string name="msg_help_360_touch">If you press this button, you will be able to touch the work code button, so you can report the work.</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
<string name="meetingroom_setting_1">Meeting room setting(1)</string> <string name="meetingroom_setting_1">Meeting room setting(1)</string>
...@@ -551,6 +553,7 @@ ...@@ -551,6 +553,7 @@
<string name="save_all_1">Save All(1)</string> <string name="save_all_1">Save All(1)</string>
<string name="content_update_1">update(1)</string> <string name="content_update_1">update(1)</string>
<string name="remote_support_1">Remote Support(1)</string> <string name="remote_support_1">Remote Support(1)</string>
<string name="remote_support_list_1">Remote Support List</string>
<string name="new_make_1">New Make(1)</string> <string name="new_make_1">New Make(1)</string>
<string name="msg_no_data_1">There are not registered data.(1)</string> <string name="msg_no_data_1">There are not registered data.(1)</string>
<string name="msg_confirm_exit_meeting_room_1">All the participants will be disconnected, will you leave the room?(1)</string> <string name="msg_confirm_exit_meeting_room_1">All the participants will be disconnected, will you leave the room?(1)</string>
...@@ -726,6 +729,7 @@ ...@@ -726,6 +729,7 @@
<string name="save_all_2">Save All(2)</string> <string name="save_all_2">Save All(2)</string>
<string name="content_update_2">update(2)</string> <string name="content_update_2">update(2)</string>
<string name="remote_support_2">Remote Support(2)</string> <string name="remote_support_2">Remote Support(2)</string>
<string name="remote_support_list_2">Remote Support List(2)</string>
<string name="new_make_2">New Make(2)</string> <string name="new_make_2">New Make(2)</string>
<string name="msg_no_data_2">There are not registered data.(2)</string> <string name="msg_no_data_2">There are not registered data.(2)</string>
<string name="msg_confirm_exit_meeting_room_2">All the participants will be disconnected, will you leave the room?(2)</string> <string name="msg_confirm_exit_meeting_room_2">All the participants will be disconnected, will you leave the room?(2)</string>
...@@ -901,6 +905,7 @@ ...@@ -901,6 +905,7 @@
<string name="save_all_3">Save All(3)</string> <string name="save_all_3">Save All(3)</string>
<string name="content_update_3">update(3)</string> <string name="content_update_3">update(3)</string>
<string name="remote_support_3">Remote Support(3)</string> <string name="remote_support_3">Remote Support(3)</string>
<string name="remote_support_list_3">Remote Support List(3)</string>
<string name="new_make_3">New Make(3)</string> <string name="new_make_3">New Make(3)</string>
<string name="msg_no_data_3">There are not registered data.(3)</string> <string name="msg_no_data_3">There are not registered data.(3)</string>
<string name="msg_confirm_exit_meeting_room_3">All the participants will be disconnected, will you leave the room?(3)</string> <string name="msg_confirm_exit_meeting_room_3">All the participants will be disconnected, will you leave the room?(3)</string>
...@@ -1076,6 +1081,7 @@ ...@@ -1076,6 +1081,7 @@
<string name="save_all_4">Save All(4)</string> <string name="save_all_4">Save All(4)</string>
<string name="content_update_4">update(4)</string> <string name="content_update_4">update(4)</string>
<string name="remote_support_4">Remote Support(4)</string> <string name="remote_support_4">Remote Support(4)</string>
<string name="remote_support_list_4">Remote Support List(4)</string>
<string name="new_make_4">New Make(4)</string> <string name="new_make_4">New Make(4)</string>
<string name="msg_no_data_4">There are not registered data.(4)</string> <string name="msg_no_data_4">There are not registered data.(4)</string>
<string name="msg_confirm_exit_meeting_room_4">All the participants will be disconnected, will you leave the room?(4)</string> <string name="msg_confirm_exit_meeting_room_4">All the participants will be disconnected, will you leave the room?(4)</string>
...@@ -1251,6 +1257,7 @@ ...@@ -1251,6 +1257,7 @@
<string name="save_all_5">Save All(5)</string> <string name="save_all_5">Save All(5)</string>
<string name="content_update_5">update(5)</string> <string name="content_update_5">update(5)</string>
<string name="remote_support_5">Remote Support(5)</string> <string name="remote_support_5">Remote Support(5)</string>
<string name="remote_support_list_5">Remote Support List(5)</string>
<string name="new_make_5">New Make(5)</string> <string name="new_make_5">New Make(5)</string>
<string name="msg_no_data_5">There are not registered data.(5)</string> <string name="msg_no_data_5">There are not registered data.(5)</string>
<string name="msg_confirm_exit_meeting_room_5">All the participants will be disconnected, will you leave the room?(5)</string> <string name="msg_confirm_exit_meeting_room_5">All the participants will be disconnected, will you leave the room?(5)</string>
......
ABVJE_UI_Android/res/layout/push_message_send_dialog.xml
...@@ -105,7 +105,9 @@ ...@@ -105,7 +105,9 @@
android:id="@+id/send_target_group" android:id="@+id/send_target_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="5dp" android:layout_marginBottom="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/HelpActivity.java
...@@ -169,10 +169,10 @@ public class HelpActivity extends ABVUIActivity { ...@@ -169,10 +169,10 @@ public class HelpActivity extends ABVUIActivity {
R.string.msg_help_task_director_list, R.string.msg_help_task_director_list,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pano_direct_list)); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pano_direct_list));
mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(), mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
R.string.msg_help_pdf_move_360, R.string.msg_help_360_move,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pdf_move)); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pdf_move));
mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(), mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
R.string.msg_help_pdf_touch, R.string.msg_help_360_touch,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pdf_touch)); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_pdf_touch));
mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(), mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
R.string.msg_help_task_code_hide, R.string.msg_help_task_code_hide,
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationMeetingListActivity.java
...@@ -234,7 +234,7 @@ public class OperationMeetingListActivity extends ABVUIActivity { ...@@ -234,7 +234,7 @@ public class OperationMeetingListActivity extends ABVUIActivity {
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(), titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(),
R.string.remote_support, R.string.remote_support_list,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0))); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
mAddBtn.setVisibility(View.VISIBLE); mAddBtn.setVisibility(View.VISIBLE);
mLeaveBtn.setVisibility(View.GONE); mLeaveBtn.setVisibility(View.GONE);
...@@ -305,7 +305,7 @@ public class OperationMeetingListActivity extends ABVUIActivity { ...@@ -305,7 +305,7 @@ public class OperationMeetingListActivity extends ABVUIActivity {
if (mAddBtn.getVisibility() == View.VISIBLE) { if (mAddBtn.getVisibility() == View.VISIBLE) {
// リソースパターンの適用 // リソースパターンの適用
titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(), titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(),
R.string.remote_support, R.string.remote_support_list,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0))); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
// リソースパターンの適用 // リソースパターンの適用
} else { } else {
...@@ -763,7 +763,7 @@ public class OperationMeetingListActivity extends ABVUIActivity { ...@@ -763,7 +763,7 @@ public class OperationMeetingListActivity extends ABVUIActivity {
else { else {
// リソースパターンの適用 // リソースパターンの適用
titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(), titleTxt.setText(PatternStringUtil.patternToString(getApplicationContext(),
R.string.remote_support, R.string.remote_support_list,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0))); getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
mAddBtn.setVisibility(View.VISIBLE); mAddBtn.setVisibility(View.VISIBLE);
mMeetingEnteredInfoLayout.setVisibility(View.GONE); mMeetingEnteredInfoLayout.setVisibility(View.GONE);
......
gradle.properties
...@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true ...@@ -86,8 +86,8 @@ is_check_invalid_passward_limit=true
repeat_default=true repeat_default=true
#Setting Info(設定画面のABookについての設定情報) #Setting Info(設定画面のABookについての設定情報)
version_name=1.0.3 version_name=1.0.4
release_date=2019/05/07 release_date=2019/05/15
copy_right=2016 AGENTEC Co.,Ltd. All rights reserved. copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
hope_page=http://www.agentec.jp hope_page=http://www.agentec.jp
contact_email=abook-appsupport@agentec.jp contact_email=abook-appsupport@agentec.jp
......
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