From 400c269330e15921de3f01fb69f36e036ae92d51 Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Thu, 16 May 2024 08:37:04 -0700
Subject: [PATCH] =?UTF-8?q?[=F0=9F=90=B4]=20Copy=20tweaks=20(#4042)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* `notifications` -> `conversation`

* `users` -> `people`

* `other participants` -> `the other participant`

* rename
---
 src/components/dms/ConvoMenu.tsx            | 8 ++++----
 src/components/dms/MessageMenu.tsx          | 2 +-
 src/screens/Messages/Conversation/index.tsx | 2 +-
 src/screens/Messages/Settings.tsx           | 2 +-
 src/view/com/util/UserAvatar.tsx            | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx
index 16e8d98c..cf1dbc17 100644
--- a/src/components/dms/ConvoMenu.tsx
+++ b/src/components/dms/ConvoMenu.tsx
@@ -171,13 +171,13 @@ let ConvoMenu = ({
               <Menu.ItemIcon icon={Person} />
             </Menu.Item>
             <Menu.Item
-              label={_(msg`Mute notifications`)}
+              label={_(msg`Mute conversation`)}
               onPress={() => muteConvo({mute: !convo?.muted})}>
               <Menu.ItemText>
                 {convo?.muted ? (
-                  <Trans>Unmute notifications</Trans>
+                  <Trans>Unmute conversation</Trans>
                 ) : (
-                  <Trans>Mute notifications</Trans>
+                  <Trans>Mute conversation</Trans>
                 )}
               </Menu.ItemText>
               <Menu.ItemIcon icon={convo?.muted ? Unmute : Mute} />
@@ -222,7 +222,7 @@ let ConvoMenu = ({
         control={leaveConvoControl}
         title={_(msg`Leave conversation`)}
         description={_(
-          msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for other participants.`,
+          msg`Are you sure you want to leave this conversation? Your messages will be deleted for you, but not for the other participant.`,
         )}
         confirmButtonCta={_(msg`Leave`)}
         confirmButtonColor="negative"
diff --git a/src/components/dms/MessageMenu.tsx b/src/components/dms/MessageMenu.tsx
index f4645f28..553e1be5 100644
--- a/src/components/dms/MessageMenu.tsx
+++ b/src/components/dms/MessageMenu.tsx
@@ -119,7 +119,7 @@ export let MessageMenu = ({
         control={deleteControl}
         title={_(msg`Delete message`)}
         description={_(
-          msg`Are you sure you want to delete this message? The message will be deleted for you, but not for other participants.`,
+          msg`Are you sure you want to delete this message? The message will be deleted for you, but not for the other participant.`,
         )}
         confirmButtonCta={_(msg`Delete`)}
         confirmButtonColor="negative"
diff --git a/src/screens/Messages/Conversation/index.tsx b/src/screens/Messages/Conversation/index.tsx
index 29019eff..4a7c4ce9 100644
--- a/src/screens/Messages/Conversation/index.tsx
+++ b/src/screens/Messages/Conversation/index.tsx
@@ -277,7 +277,7 @@ function HeaderReady({
             size={32}
             profile={profile}
             moderation={moderation.ui('avatar')}
-            disable={moderation.blocked}
+            disableHoverCard={moderation.blocked}
           />
           <Text
             style={[a.text_lg, a.font_bold, a.pt_sm, a.pb_2xs]}
diff --git a/src/screens/Messages/Settings.tsx b/src/screens/Messages/Settings.tsx
index 7ad21b40..84b804b4 100644
--- a/src/screens/Messages/Settings.tsx
+++ b/src/screens/Messages/Settings.tsx
@@ -62,7 +62,7 @@ export function MessagesSettingsScreen({}: Props) {
           }
           items={[
             {label: _(msg`Everyone`), value: 'all'},
-            {label: _(msg`People I Follow`), value: 'following'},
+            {label: _(msg`Users I follow`), value: 'following'},
             {label: _(msg`No one`), value: 'none'},
           ]}
           onSelect={onSelectItem}
diff --git a/src/view/com/util/UserAvatar.tsx b/src/view/com/util/UserAvatar.tsx
index 19e2cf88..f23f4f7a 100644
--- a/src/view/com/util/UserAvatar.tsx
+++ b/src/view/com/util/UserAvatar.tsx
@@ -51,7 +51,7 @@ interface EditableUserAvatarProps extends BaseUserAvatarProps {
 interface PreviewableUserAvatarProps extends BaseUserAvatarProps {
   moderation?: ModerationUI
   profile: AppBskyActorDefs.ProfileViewBasic
-  disable?: boolean
+  disableHoverCard?: boolean
   onBeforePress?: () => void
 }
 
@@ -384,7 +384,7 @@ export {EditableUserAvatar}
 let PreviewableUserAvatar = ({
   moderation,
   profile,
-  disable,
+  disableHoverCard,
   onBeforePress,
   ...rest
 }: PreviewableUserAvatarProps): React.ReactNode => {
@@ -397,7 +397,7 @@ let PreviewableUserAvatar = ({
   }, [profile, queryClient, onBeforePress])
 
   return (
-    <ProfileHoverCard did={profile.did} disable={disable}>
+    <ProfileHoverCard did={profile.did} disable={disableHoverCard}>
       <Link
         label={_(msg`See profile`)}
         to={makeProfileLink({