Merge branch 'feature/contract/sato/1.0.300_51419_help2' into 'contract/sato/1.0.300'

ヘルプの文言が間違っていたり、凡例が２つ表示されていたりしたのを修正。

See merge request !296

ABVJE_Res_Default_Android/res/values-ja/strings.xml

@@ -417,10 +417,14 @@
     <string name="msg_help_routineTask_list_main">開始日になると自動的に対象の点検が作成されます。報告に進む場合は対象報告の枠内をタップしてください。</string>
     <string name="msg_help_routineTask_list_refresh">最新情報に更新します。</string>
 
-    <string name="msg_help_routine_task_unfinished_status">未実施の報告です。</string>
-    <string name="msg_help_routine_task_working_status">作業中の報告です。</string>
-    <string name="msg_help_routine_task_completed_status">作業完了した報告です。</string>
-    
+    <string name="msg_help_routine_task_unfinished_status">未実施の点検です。</string>
+    <string name="msg_help_routine_task_working_status">作業中の点検です。</string>
+    <string name="msg_help_routine_task_completed_status">作業完了した点検です。</string>
+
+    <string name="msg_help_report_task_unfinished_status">未実施の報告です。</string>
+    <string name="msg_help_report_task_working_status">作業中の報告です。</string>
+    <string name="msg_help_report_task_completed_status">作業完了した報告です。</string>
+
     <string name="msg_help_drawing_zoom">図面を拡大・縮小します。\n＋は拡大、－は縮小することができます。</string>
     <string name="msg_help_report_task_show_director">指示内容を表示します。</string>
     <string name="msg_help_report_task_show_report">作業報告へ進みます。</string>

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -427,6 +427,10 @@
     <string name="msg_help_routine_task_working_status">Work in progress report.</string>
     <string name="msg_help_routine_task_completed_status">Completed report.</string>
 
+    <string name="msg_help_report_task_unfinished_status">Unfinished report.</string>
+    <string name="msg_help_report_task_working_status">Work in progress report.</string>
+    <string name="msg_help_report_task_completed_status">Completed report.</string>
+
     <string name="msg_help_drawing_zoom">Scale the drawing. \n + can be enlarged, - can be shrunk.</string>
     <string name="msg_help_report_task_show_director">Display the contents of the instruction.</string>
     <string name="msg_help_report_task_show_report">Proceed to the work report.</string>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/HelpActivity.java

@@ -228,21 +228,17 @@ public class HelpActivity extends ABVUIActivity {
                         R.string.msg_help_director_report_search,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_help_direct_list_search));
                 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
-                        R.string.msg_help_routine_task_unfinished_status,
+                        R.string.msg_help_report_task_unfinished_status,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_red));
                 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
-                        R.string.msg_help_routine_task_working_status,
+                        R.string.msg_help_report_task_working_status,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_blue));
                 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
-                        R.string.msg_help_routine_task_completed_status,
+                        R.string.msg_help_report_task_completed_status,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_report_status_green));
                 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
                         R.string.msg_help_report_locked,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
-
-                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
-                        R.string.msg_help_report_locked,
-                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
                 mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
                         R.string.msg_help_report_send_back,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_sendback));