fix(app): copy QA from August 17

app/src/App/__tests__/OnDeviceDisplayAppFallback.test.tsx

@@ -44,7 +44,7 @@ describe('OnDeviceDisplayAppFallback', () => {
     const [{ getByText }] = render(props)
     getByText('An unknown error has occurred')
     getByText(
-      'You need to restart your robot. Then download the robot logs from the Opentrons App and send them to [email protected] for assistance.'
+      'You need to restart the touchscreen. Then download the robot logs from the Opentrons App and send them to [email protected] for assistance.'
     )
     getByText('Restart touchscreen')
   })

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

@@ -33,8 +33,8 @@
   "discovery_timeout": "Discovery timed out.",
   "download_update": "Download app update",
   "enable_dev_tools_description": "Enabling this setting opens Developer Tools on app launch, enables additional logging and gives access to feature flags.",
-  "enable_dev_tools": "Enable Developer Tools",
-  "error_boundary_description": "You need to restart your robot. Then download the robot logs from the Opentrons App and send them to [email protected] for assistance.",
+  "enable_dev_tools": "Developer Tools",
+  "error_boundary_description": "You need to restart the touchscreen. Then download the robot logs from the Opentrons App and send them to [email protected] for assistance.",
   "error_boundary_title": "An unknown error has occurred",
   "feature_flags": "Feature Flags",
   "general": "General",

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

@@ -8,7 +8,7 @@
   "alternative_security_types_description": "The Opentrons App supports connecting Flex to various enterprise access points. Connect via USB and finish setup in the app.",
   "alternative_security_types": "Alternative security types",
   "app_change_in": "App Changes in {{version}}",
-  "apply_historic_offsets": "Apply labware offsets",
+  "apply_historic_offsets": "Apply Labware Offsets",
   "are_you_sure_you_want_to_disconnect": "Are you sure you want to disconnect from {{ssid}}?",
   "attach_a_pipette_before_calibrating": "Attach a pipette in order to perform calibration",
   "boot_scripts": "Boot scripts",
@@ -71,7 +71,7 @@
   "deck_calibration_modal_title": "Are you sure you want to calibrate?",
   "deck_calibration_recommended": "Deck calibration recommended",
   "deck_calibration_title": "Deck Calibration",
-  "dev_tools_description": "Enable additional logging and allow access to feature flags.",
+  "dev_tools_description": "Access additional logging and feature flags.",
   "device_reset_description": "Reset labware calibration, boot scripts, and/or robot calibration to factory settings.",
   "device_reset_slideout_description": "Select individual settings to only clear specific data types.",
   "device_reset": "Device Reset",
@@ -154,7 +154,7 @@
   "name_rule_error_exist": "Oops! Name is already in use. Choose a different name.",
   "name_rule_error_name_length": "Oops! Robot name must follow the character count and limitations",
   "name_rule_error_too_short": "Oops! Too short. Robot name must be at least 1 character.",
-  "name_your_robot_description": "Don’t worry, you can change this later in your settings.",
+  "name_your_robot_description": "Don’t worry, you can always change this in your settings.",
   "name_your_robot": "Name your robot",
   "need_another_security_type": "Need another security type?",
   "network_name": "Network Name",
@@ -171,7 +171,7 @@
   "none_description": "Not recommended",
   "not_calibrated_short": "Not calibrated",
   "not_calibrated": "Not calibrated yet",
-  "not_connected_via_ethernet": "Not connected via ethernet",
+  "not_connected_via_ethernet": "Not connected via Ethernet",
   "not_connected_via_usb": "Not connected via USB",
   "not_connected_via_wifi": "Not connected via Wi-Fi",
   "not_connected_via_wired_usb": "Not connected via wired USB",
@@ -191,7 +191,7 @@
   "pipette_offset_calibrations_history": "See all Pipette Offset Calibration history",
   "pipette_offset_calibrations_title": "Pipette Offset Calibrations",
   "privacy": "Privacy",
-  "proceed_without_updating": "Proceed without updating",
+  "proceed_without_updating": "Proceed without update",
   "protocol_run_history": "Protocol run History",
   "recalibrate_deck": "Recalibrate deck",
   "recalibrate_gripper": "Recalibrate gripper",

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

@@ -1,44 +1,44 @@
 {
   "are_you_sure_exit": "Are you sure you want to exit before completing {{flow}}?",
   "attach_gripper": "Attach Gripper",
-  "attached_gripper_and_screw_in": "Attach the gripper to the robot by aligning the connector and ensuring a secure connection. Hold the gripper in place and use the hex screwdriver to tighten the gripper screws. Then test that the gripper is securely attached by gently pulling it side to side.",
+  "attached_gripper_and_screw_in": "Attach the gripper to the robot by aligning the connector and pressing to ensure a secure connection. Hold the gripper in place. Tighten the top gripper screw first, and the bottom screw second. Then test that the gripper is securely attached by gently pulling it side to side.",
   "before_you_begin": "Before you begin",
   "begin_calibration": "Begin calibration",
-  "calibrate_gripper": "Calibrate gripper",
+  "calibrate_gripper": "Calibrate Gripper",
   "calibration_pin": "Calibration Pin",
   "complete_calibration": "Complete calibration",
-  "connect_and_screw_in_gripper": "Connect and Screw In Gripper",
+  "connect_and_screw_in_gripper": "Connect and secure gripper",
   "continue": "Continue",
+  "continue_calibration": "Continue calibration",
   "detach_gripper": "Detach Gripper",
   "firmware_updating": "A firmware update is required, instrument is updating...",
   "get_started": "Get started",
   "gripper_calibration": "Gripper Calibration",
   "gripper_recalibration": "Gripper Recalibration",
-  "gripper_still_attached": "Flex Gripper Still Attached",
-  "gripper_successfully_attached_and_calibrated": "Flex Gripper Successfully Attached and Calibrated",
-  "gripper_successfully_attached": "Flex Gripper Successfully Attached",
-  "gripper_successfully_calibrated": "Flex Gripper Successfully Calibrated",
-  "gripper_successfully_detached": "Flex Gripper Successfully Detached",
+  "gripper_still_attached": "Flex Gripper still attached",
+  "gripper_successfully_attached_and_calibrated": "Flex Gripper successfully attached and calibrated",
+  "gripper_successfully_attached": "Gripper successfully attached",
+  "gripper_successfully_calibrated": "Flex Gripper successfully calibrated",
+  "gripper_successfully_detached": "Flex Gripper successfully detached",
   "gripper": "Gripper",
   "hex_screwdriver": "2.5 mm Hex Screwdriver",
-  "hold_gripper_and_loosen_screws": "Hold the gripper in place and loosen the screws. (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 into Front Jaw",
-  "insert_pin_into_rear_jaw": "Insert Calibration Pin into Rear Jaw",
-  "loosen_screws_and_detach": "Loosen Screws and Detach",
+  "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",
   "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 similar location on the rear jaw",
+  "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.",
-  "please_retry_gripper_detach": "Please retry the detachment process to successfully detach the Gripper.",
   "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 rest of the deck and clean up the work area to make attachment and calibration easier. Also gather the needed equipment shown on the right hand side</block><block>The calibration pin is included with the gripper and should be stored on the exposed panel of the gripper.</block>",
-  "remove_labware_to_get_started_detaching": "To get started, remove labware from the rest of the deck and clean up the work area to make attachment and calibration easier. Also gather the needed equipment shown on the right hand side",
-  "remove_labware_to_get_started_recalibrating": "<block>To get started, remove labware from the rest of the deck and clean up the work area to make attachment and calibration easier. Also gather the needed equipment shown on the right hand side</block><block>The calibration pin is included with the gripper and should be stored on the exposed panel of the gripper.</block>",
-  "remove_probe": "Unlatch the calibration probe, remove it from the pipette nozzle, and return it to its storage location.",
+  "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_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, Flex Gripper is Calibrating",
+  "stand_back_gripper_is_calibrating": "Stand back, gripper is calibrating",
   "try_again": "Try again",
   "unable_to_detect_gripper": "Unable to detect Gripper"
 }

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

@@ -17,8 +17,8 @@
   "confirm_position_and_move": "Confirm position, move to slot {{next_slot}}",
   "confirm_position_and_pick_up_tip": "Confirm position, pick up tip",
   "confirm_position_and_return_tip": "Confirm position, return tip to Slot {{next_slot}} and home",
-  "ensure_nozzle_is_above_tip": "Ensure that the pipette nozzle furthest from you is centered above and level with the top of the tip in the A1 position. If it isn't, use the controls below or your keyboard to jog the pipette until it is properly aligned.",
-  "ensure_tip_is_above_well": "Ensure that the pipette tip furthest from you is centered above and level with well A1 on the labware. If it isn't, use the controls below or your keyboard to jog the pipette until it is properly aligned.",
+  "ensure_nozzle_is_above_tip": "Ensure that the pipette nozzle furthest from you is centered above and level with the top of the tip in the A1 position.",
+  "ensure_tip_is_above_well": "Ensure that the pipette tip furthest from you is centered above and level with well A1 on the labware.",
   "error_modal_header": "Something went wrong",
   "error_modal_problem_in_app": "There was an error performing Labware Position Check. Please restart the app. If the problem persists, please contact Opentrons Support",
   "error_modal_problem_on_robot": "There was an error processing your request on the robot",
@@ -27,6 +27,8 @@
   "exit_screen_subtitle": "If you exit now, all labware offsets will be discarded. This cannot be undone.",
   "exit_screen_title": "Exit before completing Labware Position Check?",
   "get_labware_offset_data": "Get Labware Offset Data",
+  "if_not_aligned_tap_to_jog": "If it isn't, tap <bold>Move pipette</bold> and then jog the pipette until it is properly aligned.",
+  "if_not_aligned_click_to_jog": "If it isn't, use the controls below or your keyboard to jog the pipette until it is properly aligned.",
   "jog_controls_adjustment": "Need to make an adjustment?",
   "jupyter_notebook": "Jupyter Notebook",
   "labware_display_location_text": "Deck Slot {{slot}}",

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

@@ -15,7 +15,7 @@
   "cal_pipette": "Calibrate pipette",
   "calibrate_96_channel": "Calibrate 96-Channel Pipette",
   "calibrate_pipette": "calibrate {{mount}} pipette",
-  "calibration_probe_touching": "The calibration probe will touch the sides of the calibration square in slot {{slotNumber}} to determine its exact position",
+  "calibration_probe_touching": "The calibration probe will touch the sides of the calibration square in slot {{slotNumber}} to determine its exact position.",
   "cancel_attachment": "cancel attachment",
   "choose_pipette": "Choose a pipette to attach",
   "complete_cal": "Complete calibration",
@@ -69,7 +69,7 @@
   "remove_cal_probe": "remove calibration probe",
   "remove_labware_to_get_started": "<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 probe is included with the robot and should be stored on the front pillar of the robot.</block>",
   "remove_labware": "<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 probe is included with the robot and should be stored on the front pillar of the robot.</block>",
-  "remove_probe": "unlatch the calibration probe, remove it from the nozzle, and return it to its storage location.",
+  "remove_probe": "unlock the calibration probe, remove it from the nozzle, and return it to its storage location.",
   "replace_pipette": "replace {{mount}} pipette",
   "return_probe_error": "<bold>Return the calibration probe to its storage location before exiting.</bold> <block>{{error}}</block>",
   "single_mount_attached_error": "Single mount pipette is selected when this is the 96 channel flow",

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

@@ -77,7 +77,7 @@
   "run_again": "Run again",
   "run_protocol": "Run protocol",
   "run_timestamp_title": "Run timestamp",
-  "send_a_protocol_to_store": "Send a protocol from the Opentrons app to get started.",
+  "send_a_protocol_to_store": "Send a protocol from the Opentrons App to get started.",
   "simulation_in_progress": "Simulation in Progress",
   "timestamp": "+{{index}}",
   "too_many_pins_body": "Remove a protocol in order to add more protocols to your pinned list.",

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

@@ -53,8 +53,8 @@
   "initial_liquids_num_plural": "{{count}} initial liquids",
   "initial_liquids_num": "{{count}} initial liquid",
   "initial_location": "Initial Location",
-  "instruments_connected_plural": "{{count}} instruments connected",
-  "instruments_connected": "{{count}} instrument connected",
+  "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.",
@@ -79,7 +79,7 @@
   "learn_more": "Learn more",
   "liquid_setup_step_description": "View liquid starting locations and volumes",
   "liquid_setup_step_title": "Initial Liquid Setup",
-  "liquids_not_in_setup": "Liquids not in setup",
+  "liquids_not_in_setup": "No liquids used in this protocol",
   "liquids_not_in_the_protocol": "no liquids are specified for this protocol.",
   "liquids": "Liquids",
   "list_view": "List View",
@@ -106,8 +106,8 @@
   "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_slot_location": "Slot {{slotName}}, {{moduleName}}",
-  "modules_connected_plural": "{{count}} modules connected",
-  "modules_connected": "{{count}} module connected",
+  "modules_connected_plural": "{{count}} modules attached",
+  "modules_connected": "{{count}} module attached",
   "modules_setup_step_title": "Module Setup",
   "modules": "Modules",
   "mount_title": "{{mount}} MOUNT:",
@@ -117,7 +117,7 @@
   "multiple_modules_help_link_title": "See How To Set Up Modules of the Same Type",
   "multiple_modules_learn_more": "Learn more about using multiple modules of the same type",
   "multiple_modules_missing": "Multiple modules missing",
-  "multiple_modules_modal": "Setting up modules of the same type",
+  "multiple_modules_modal": "Setting up multiple modules of the same type",
   "multiple_modules": "Multiple modules of the same type",
   "multiple_of_most_modules": "You can use multiples of most module types within a single Python protocol by connecting and loading the modules in a specific order. The robot will initialize the matching module attached to the lowest numbered port first, regardless of what deck slot it occupies.",
   "must_have_labware_and_pip": "Protocol must load labware and a pipette",

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

@@ -62,7 +62,7 @@
   "robot_was_seen_but_is_unreachable": "This robot has been seen recently, but is currently not reachable at IP address {{hostname}}",
   "something_went_wrong": "something went wrong",
   "sort_by": "Sort by",
-  "stand_back_robot_is_in_motion": "Stand Back, Robot is in Motion",
+  "stand_back_robot_is_in_motion": "Stand back, robot is in motion",
   "start": "start",
   "starting": "starting",
   "step": "Step {{current}} / {{max}}",

app/src/organisms/Devices/ProtocolRun/SetupModules/__tests__/MultipleModuleModal.test.tsx

@@ -25,7 +25,9 @@ describe('MultipleModulesModal', () => {
 
   it('should render the correct header', () => {
     const { getByRole } = render(props)
-    getByRole('heading', { name: 'Setting up modules of the same type' })
+    getByRole('heading', {
+      name: 'Setting up multiple modules of the same type',
+    })
   })
   it('should render the correct body', () => {
     const { getByText, getByAltText } = render(props)

app/src/organisms/GripperWizardFlows/MovePin.tsx

@@ -163,7 +163,7 @@ export const MovePin = (props: MovePinProps): JSX.Element | null => {
       ),
       header: t('insert_pin_into_rear_jaw'),
       body: t('move_pin_from_front_to_rear_jaw'),
-      buttonText: t('continue'),
+      buttonText: t('continue_calibration'),
       prepImage: (
         <video
           css={css`

app/src/organisms/GripperWizardFlows/UnmountGripper.tsx

@@ -98,7 +98,6 @@ export const UnmountGripper = (
     <SimpleWizardBody
       iconColor={COLORS.errorEnabled}
       header={t('gripper_still_attached')}
-      subHeader={t('please_retry_gripper_detach')}
       isSuccess={false}
     >
       <Flex