fix(app): copy changes from September 11–14 QA (#13572)

* big batch of copy QA

* fix most tests

* fix remaining tests

* couple H-S and protocol setup strings

app/src/assets/localization/en/device_details.json

@@ -31,7 +31,7 @@
   "detach_gripper": "Detach gripper",
   "detach_pipette": "Detach pipette",
   "disengaged": "Disengaged",
-  "download_run_log": "Download run log",
+  "download_run_log": "Download protocol run log",
   "empty": "Empty",
   "error_details": "error details",
   "estop_disconnected": "E-stop disconnected. Robot movement is halted.",

app/src/assets/localization/en/device_settings.json

@@ -96,7 +96,7 @@
   "do_not_turn_off": "Do not turn off the robot while updating",
   "done": "Done",
   "download": "Download",
-  "download_calibration_data": "Download calibration data",
+  "download_calibration_data": "Download calibration logs",
   "download_error": "Download error",
   "download_logs": "Download logs",
   "downloading_logs": "Downloading logs...",
@@ -193,7 +193,7 @@
   "password_error_message": "Must be at least 8 characters",
   "pause_protocol": "Pause protocol when robot door opens",
   "pause_protocol_description": "When enabled, opening the robot door during a run will pause the robot after it has completed its current motion.",
-  "pipette_calibrations_description": "Pipette calibration uses a metal probe to determine the pipette's exact position relative to precision-cut divots on deck slots.",
+  "pipette_calibrations_description": "Pipette calibration uses a metal probe to determine the pipette's exact position relative to precision-cut squares on deck slots.",
   "pipette_calibrations_title": "Pipette Calibrations",
   "pipette_offset_calibration": "pipette offset calibration",
   "pipette_offset_calibration_missing": "Pipette Offset calibration missing",

app/src/assets/localization/en/gripper_wizard_flows.json

@@ -7,7 +7,7 @@
   "calibrate_gripper": "Calibrate Gripper",
   "calibration_pin": "Calibration Pin",
   "complete_calibration": "Complete calibration",
-  "connect_and_screw_in_gripper": "Connect and secure gripper",
+  "connect_and_screw_in_gripper": "Connect and secure Flex Gripper",
   "continue": "Continue",
   "continue_calibration": "Continue calibration",
   "detach_gripper": "Detach Gripper",
@@ -25,17 +25,17 @@
   "hold_gripper_and_loosen_screws": "Hold the gripper in place and loosen the bottom gripper screw first. After that move onto the bottom screw. (The screws are captive and will not come apart from the gripper.) Then carefully remove the gripper.",
   "insert_pin_into_front_jaw": "Insert calibration pin in front jaw",
   "insert_pin_into_rear_jaw": "Insert calibration pin in rear jaw",
-  "loosen_screws_and_detach": "Loosen screws and detach gripper",
+  "loosen_screws_and_detach": "Loosen screws and detach Flex Gripper",
   "move_gantry_to_front": "Move gantry to front",
   "move_pin_from_front_to_rear_jaw": "Remove the calibration pin from the front jaw and attach it to the rear jaw.",
   "move_pin_from_rear_jaw_to_storage": "Take the calibration pin from the rear gripper jaw and return it to its storage location.",
   "move_pin_from_storage_to_front_jaw": "Take the calibration pin from its storage location. Magnetically attach the pin to the hole on the underside of the front gripper jaw.",
   "progress_will_be_lost": "{{flow}} progress will be lost",
   "provided_with_robot_use_right_size": "Provided with robot. Using another size can strip the instrument’s screws.",
   "remove_calibration_pin": "Remove calibration pin",
-  "remove_labware_to_get_started_attaching": "<block>To get started, remove labware from the deck and clean up the working area to make detachment easier. Also gather the needed equipment shown to the right.</block><block>The calibration pin is included with the gripper and should be stored on its right side above the jaws.</block>",
-  "remove_labware_to_get_started_detaching": "To get started, remove labware from the deck and clean up the working area to make detachment easier. Also gather the needed equipment shown to the right.",
-  "remove_labware_to_get_started_recalibrating": "<block>To get started, remove labware from the deck and clean up the working area to make detachment easier. Also gather the needed equipment shown to the right.</block><block>The calibration pin is included with the gripper and should be stored on its right side above the jaws.</block>",
+  "remove_labware_to_get_started_attaching": "<block>To get started, remove labware from the deck and clean up the working area to make attachment and calibration easier. Also gather the needed equipment shown to the right.</block><block>The calibration pin is included with the gripper and should be stored on its right side above the jaws.</block>",
+  "remove_labware_to_get_started_detaching": "<block>To get started, remove labware from the deck and clean up the working area to make detachment easier. Also gather the needed equipment shown to the right.</block>",
+  "remove_labware_to_get_started_recalibrating": "<block>To get started, remove labware from the deck and clean up the working area to make calibration easier. Also gather the needed equipment shown to the right.</block><block>The calibration pin is included with the gripper and should be stored on its right side above the jaws.</block>",
   "remove_probe": "Unlock the calibration probe, remove it from the pipette nozzle, and return it to its storage location.",
   "return_pin_error": "<bold>Return the calibration pin to its storage location before exiting.</bold> <block>{{error}}</block>",
   "stand_back_gripper_is_calibrating": "Stand back, gripper is calibrating",

app/src/assets/localization/en/heater_shaker.json

@@ -2,7 +2,7 @@
   "back": "Back",
   "cannot_open_latch": "Cannot open labware latch while module is shaking.",
   "cannot_shake": "Cannot shake when labware latch is open",
-  "close_labware_latch": "Close Labware Latch",
+  "close_labware_latch": "Close labware latch",
   "close_latch": "Close latch",
   "closed_and_locked": "Closed and Locked",
   "closed": "Closed",
@@ -23,7 +23,7 @@
   "module_anchors_extended": "Before the run begins, module should have both anchors fully extended for a firm attachment to the deck.",
   "module_in_slot": "{{moduleName}} in Slot {{slotName}}",
   "module_should_have_anchors": "Module should have both anchors fully extended for a firm attachment to the deck.",
-  "open_labware_latch": "Open Labware Latch",
+  "open_labware_latch": "Open labware latch",
   "open_latch": "Open latch",
   "open": "Open",
   "opening": "Opening...",
@@ -39,7 +39,7 @@
   "test_shake_banner_labware_information": "If you want to add the <strong>{{labware}}</strong> to the module before doing a test shake, you can use the labware latch controls.",
   "test_shake_slideout_banner_info": "If you want to add labware to the module before doing a test shake, you can use the labware latch controls to hold the latches open.",
   "test_shake_troubleshooting_slideout_description": "Revisit instructions for attaching the module to the deck as well as attaching the thermal adapter.",
-  "test_shake": "Test Shake",
+  "test_shake": "Test shake",
   "thermal_adapter_attached_to_module": "The thermal adapter should be attached to the module.",
   "troubleshoot_step_1": "Return to Step 1 to see instructions for securing the module to the deck.",
   "troubleshoot_step_3": "Return to Step 3 to see instructions for securing the thermal adapter to the module.",

app/src/assets/localization/en/labware_position_check.json

@@ -4,7 +4,7 @@
   "adapter_in_tc": "{{adapter}} in {{module}}",
   "all_modules_and_labware_from_protocol": "All modules and labware used in the protocol",
   "applied_offset_data": "Applied Labware Offset data",
-  "apply_offset_data": "Apply Labware Offset data",
+  "apply_offset_data": "Apply labware offset data",
   "apply_offsets": "apply offsets",
   "check_item_in_location": "Check {{item}} in {{location}}",
   "check_labware_in_slot_title": "Check Labware {{labware_display_name}} in slot {{slot}}",
@@ -97,7 +97,7 @@
   "slot_name": "slot {{slotName}}",
   "slot": "Slot {{slotName}}",
   "start_position_check": "begin labware position check, move to Slot {{initial_labware_slot}}",
-  "stored_offset_data": "Stored Labware Offset data",
+  "stored_offset_data": "Apply Stored Labware Offset Data?",
   "stored_offsets_for_this_protocol": "Stored Labware Offset data that applies to this protocol",
   "table_view": "Table View",
   "tip_rack": "tip rack",

app/src/assets/localization/en/protocol_details.json

@@ -14,7 +14,7 @@
   "go_to_labware_definition": "Go to labware definition",
   "hardware": "hardware",
   "labware": "labware",
-  "labware_name": "Labware Name",
+  "labware_name": "Labware name",
   "last_analyzed": "last analyzed",
   "last_updated": "last updated",
   "left_and_right_mounts": "Left+Right Mounts",

app/src/assets/localization/en/protocol_setup.json

@@ -62,20 +62,19 @@
   "instruments_connected_plural": "{{count}} instruments attached",
   "instruments_connected": "{{count}} instrument attached",
   "instruments": "Instruments",
-  "labware_help_example": "<block>Alice is using a labware in Slot 6. During labware position check, she adjust the pipette position while checking the A1 of the labware to 0.2mm in X, and 1.2mm in Z. Later, Bob is preparing to run the same protocol on that robot. The labware offset that Alice created in Slot 6 will be applied for Bob’s protocol unless he changes or clears it.</block>",
   "labware_latch_instructions": "Use latch control for easy placement of labware.",
   "labware_latch": "Labware Latch",
   "labware_location": "Labware Location",
-  "labware_name": "Labware Name",
+  "labware_name": "Labware name",
   "labware_position_check_not_available_analyzing_on_robot": "Labware Position Check is not available while protocol is analyzing on robot",
   "labware_position_check_not_available_empty_protocol": "Labware Position Check requires that the protocol loads labware and pipettes",
   "labware_position_check_not_available": "Labware Position Check is not available after run has started",
   "labware_position_check_step_description": "Recommended workflow that helps you verify the position of each labware on the deck.",
   "labware_position_check_step_title": "Labware Position Check",
   "labware_position_check_text": "Labware Position Check is a recommended workflow that helps you verify the position of each labware on the deck. During this check, you can create Labware Offsets that adjust how the robot moves to each labware in the X, Y and Z directions.",
   "labware_position_check": "Labware Position Check",
-  "labware_setup_step_description": "Position full tip racks and labware in the deck slots as shown in the deck map.",
-  "labware_setup_step_title": "Labware Setup",
+  "labware_setup_step_description": "Gather the following labware and full tip racks. To run your protocol without Labware Position Check, place and secure labware in their initial locations.",
+  "labware_setup_step_title": "Labware",
   "labware": "Labware",
   "last_calibrated": "Last calibrated: {{date}}",
   "learn_how_it_works": "Learn how it works",
@@ -84,7 +83,7 @@
   "learn_more_about_robot_cal_offset": "Learn more about Robot Calibration",
   "learn_more": "Learn more",
   "liquid_setup_step_description": "View liquid starting locations and volumes",
-  "liquid_setup_step_title": "Initial Liquid Setup",
+  "liquid_setup_step_title": "Liquids",
   "liquids_not_in_setup": "No liquids used in this protocol",
   "liquids_not_in_the_protocol": "no liquids are specified for this protocol.",
   "liquids": "Liquids",
@@ -111,9 +110,9 @@
   "module_mismatch_body": "Check that the modules connected to this robot are of the right type and generation",
   "module_name": "Module Name",
   "module_not_connected": "Not connected",
-  "module_setup_step_description_plural": "Plug in and turn on the required modules via the robot's USB Ports. Place the modules as shown in the deck map.",
-  "module_setup_step_description": "Plug in and turn on the required module via the robot's USB Port. Place the module as shown in the deck map.",
-  "module_setup_step_title": "Module Setup",
+  "module_setup_step_description_plural": "Install the required modules and power them on.",
+  "module_setup_step_description": "Install the required modules and power them on.",
+  "module_setup_step_title": "Modules",
   "module_slot_location": "Slot {{slotName}}, {{moduleName}}",
   "modules_connected_plural": "{{count}} modules attached",
   "modules_connected": "{{count}} module attached",
@@ -162,9 +161,9 @@
   "plug_in_required_module": "Plug in and power up the required module to continue",
   "prepare_to_run": "Prepare to run",
   "proceed_to_labware_position_check": "Proceed to labware position check",
-  "proceed_to_labware_setup_step": "Proceed to labware setup",
-  "proceed_to_liquid_setup_step": "Proceed to liquid setup",
-  "proceed_to_module_setup_step": "Proceed to module setup",
+  "proceed_to_labware_setup_step": "Proceed to labware",
+  "proceed_to_liquid_setup_step": "Proceed to liquids",
+  "proceed_to_module_setup_step": "Proceed to modules",
   "proceed_to_run": "Proceed to run",
   "protocol_analysis_failed": "Protocol analysis failed",
   "protocol_can_be_closed": "This protocol can now be closed.",
@@ -182,9 +181,9 @@
   "required_tip_racks_title": "Required Tip Length Calibrations",
   "robot_cal_description": "Robot calibration establishes how the robot knows where it is in relation to the deck. Accurate Robot calibration is essential to run protocols successfully. Robot calibration has 3 parts: Deck calibration, Tip Length calibration and Pipette Offset calibration.",
   "robot_cal_help_title": "How Robot Calibration Works",
-  "robot_calibration_step_description_pipettes_only": "Review required pipettes for this protocol.",
+  "robot_calibration_step_description_pipettes_only": "Review required instruments and calibrations for this protocol.",
   "robot_calibration_step_description": "Review required pipettes and tip length calibrations for this protocol.",
-  "robot_calibration_step_title": "Robot Calibration",
+  "robot_calibration_step_title": "Instruments",
   "run_disabled_calibration_not_complete": "Make sure robot calibration is complete before proceeding to run",
   "run_disabled_modules_and_calibration_not_complete": "Make sure robot calibration is complete and all modules are connected before proceeding to run",
   "run_disabled_modules_not_connected": "Make sure all modules are connected before proceeding to run",

app/src/organisms/ApplyHistoricOffsets/__tests__/ApplyHistoricOffsets.test.tsx

@@ -96,13 +96,13 @@ describe('ApplyHistoricOffsets', () => {
 
   it('renders correct copy when shouldApplyOffsets is true', () => {
     const [{ getByText }] = render()
-    getByText('Apply Labware Offset data')
+    getByText('Apply labware offset data')
     getByText('View data')
   })
 
   it('renders correct copy when shouldApplyOffsets is false', () => {
     const [{ getByText }] = render({ shouldApplyOffsets: false })
-    getByText('Apply Labware Offset data')
+    getByText('Apply labware offset data')
     getByText('View data')
   })
 
@@ -114,7 +114,7 @@ describe('ApplyHistoricOffsets', () => {
     const [{ getByText, getByRole, queryByText, getByTestId }] = render()
     getByText('View data').click()
 
-    getByRole('heading', { name: 'Stored Labware Offset data' })
+    getByRole('heading', { name: 'Apply Stored Labware Offset Data?' })
     getByText(
       'This robot has offsets for labware used in this protocol. If you apply these offsets, you can still adjust them with Labware Position Check.'
     )
@@ -133,8 +133,10 @@ describe('ApplyHistoricOffsets', () => {
     getByText('Opentrons 96 PCR Adapter in Heater-Shaker Module GEN1 in Slot 3')
     // third candidate on module table row
     getByText('Heater-Shaker Module GEN1 in Slot 3')
-    getByTestId('ModalHeader_icon_close_Stored Labware Offset data').click()
-    expect(queryByText('Stored Labware Offset data')).toBeNull()
+    getByTestId(
+      'ModalHeader_icon_close_Apply Stored Labware Offset Data?'
+    ).click()
+    expect(queryByText('Apply Stored Labware Offset Data?')).toBeNull()
   })
 
   it('renders view data modal when link clicked, with correct empty state if no candidates', () => {

app/src/organisms/Devices/ProtocolRun/SetupLabware/__tests__/SetupLabwareList.test.tsx

@@ -182,7 +182,7 @@ describe('SetupLabwareList', () => {
     })
 
     getAllByText('mock labware list item')
-    getByText('Labware Name')
+    getByText('Labware name')
     getByText('Location')
     getByText('Placement')
   })

app/src/organisms/Devices/ProtocolRun/SetupLiquids/__tests__/LiquidsLabwareDetailsModal.test.tsx

@@ -142,7 +142,7 @@ describe('LiquidsLabwareDetailsModal', () => {
     const [{ getByText, getAllByText, getByRole }] = render(props)
     getByRole('heading', { name: 'Slot Number' })
     getByText('5')
-    getByRole('heading', { name: 'Labware Name' })
+    getByRole('heading', { name: 'Labware name' })
     getAllByText('mock labware name')
   })
   it('should render LiquidDetailCard when correct props are passed', () => {

app/src/organisms/Devices/ProtocolRun/SetupLiquids/__tests__/SetupLiquidsList.test.tsx

@@ -127,7 +127,7 @@ describe('SetupLiquidsList', () => {
       properties: {},
     })
     getByText('Location')
-    getByText('Labware Name')
+    getByText('Labware name')
     getByText('Volume')
     getAllByText(nestedTextMatcher('200 µL'))
     getByText('4')