Merge branch 'jamesdeanexpensify-patch-2-1' of github.com:Expensify/A…

…pp into jamesdeanexpensify-patch-2

src/languages/en.ts

@@ -1154,9 +1154,9 @@ export default {
         deleteAccount: 'Delete account',
         deleteConfirmation: 'Are you sure you want to delete this account?',
         error: {
-            notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
+            notOwnerOfBankAccount: 'An error occurred while setting this bank account as your default payment method.',
             invalidBankAccount: 'This bank account is temporarily suspended.',
-            notOwnerOfFund: 'There was an error setting this card as your default payment method.',
+            notOwnerOfFund: 'An error occurred while setting this card as your default payment method.',
             setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.',
         },
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
@@ -1620,7 +1620,7 @@ export default {
             phrase4: 'verify your account here',
         },
         hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
-        hasBeenThrottledError: 'There was an error adding your bank account. Please wait a few minutes and try again.',
+        hasBeenThrottledError: 'An error occurred while adding your bank account. Please wait a few minutes and try again.',
         hasCurrencyError: 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please set it to USD and try again.',
         error: {
             youNeedToSelectAnOption: 'You need to select an option to proceed.',
@@ -1686,7 +1686,7 @@ export default {
         verifyIdentity: 'Verify identity',
         letsVerifyIdentity: "Let's verify your identity.",
         butFirst: `But first, the boring stuff. Read up on the legalese in the next step and click "Accept" when you're ready.`,
-        genericError: 'There was an error while processing this step. Please try again.',
+        genericError: 'An error occurred while processing this step. Please try again.',
         cameraPermissionsNotGranted: 'Enable camera access',
         cameraRequestMessage: 'We need access to your camera to complete bank account verification. Please enable via Settings > New Expensify.',
         microphonePermissionsNotGranted: 'Enable microphone access',
@@ -3175,7 +3175,7 @@ export default {
             member: 'Invite member',
             members: 'Invite members',
             invitePeople: 'Invite new members',
-            genericFailureMessage: 'An error occurred inviting the member to the workspace. Please try again.',
+            genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
             pleaseEnterValidLogin: `Please ensure the email or phone number is valid (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
             user: 'user',
             users: 'users',
@@ -3189,7 +3189,7 @@ export default {
             inviteMessageTitle: 'Add message',
             inviteMessagePrompt: 'Make your invitation extra special by adding a message below',
             personalMessagePrompt: 'Message',
-            genericFailureMessage: 'An error occurred inviting the member to the workspace. Please try again.',
+            genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
             inviteNoMembersError: 'Please select at least one member to invite.',
         },
         distanceRates: {
@@ -3223,7 +3223,7 @@ export default {
             currencyInputHelpText: 'All expenses on this workspace will be converted to this currency.',
             currencyInputDisabledText: "The default currency can't be changed because this workspace is linked to a USD bank account.",
             save: 'Save',
-            genericFailureMessage: 'An error occurred updating the workspace. Please try again.',
+            genericFailureMessage: 'An error occurred while updating the workspace. Please try again.',
             avatarUploadFailureMessage: 'An error occurred uploading the avatar. Please try again.',
             addressContext: 'A Workspace Address is required to enable Expensify Travel. Please enter an address associated with your business.',
         },
@@ -3418,7 +3418,7 @@ export default {
         },
         markAsComplete: 'Mark as complete',
         markAsIncomplete: 'Mark as incomplete',
-        assigneeError: 'There was an error assigning this task. Please try another assignee.',
+        assigneeError: 'An error occurred while assigning this task. Please try another assignee.',
         genericCreateTaskFailureMessage: 'There was an error creating this task. Please try again later.',
         deleteTask: 'Delete task',
         deleteConfirmation: 'Are you sure you want to delete this task?',
@@ -3910,7 +3910,7 @@ export default {
             "You appear to be offline. Unfortunately, Expensify Classic doesn't work offline, but New Expensify does. If you prefer to use Expensify Classic, try again when you have an internet connection.",
     },
     listBoundary: {
-        errorMessage: 'There was an error loading more messages.',
+        errorMessage: 'An error occurred while loading more messages.',
         tryAgain: 'Try again',
     },
     systemMessage: {