diff --git a/damus/Components/Reposted.swift b/damus/Components/Reposted.swift
index 1475527c..4808e870 100644
--- a/damus/Components/Reposted.swift
+++ b/damus/Components/Reposted.swift
@@ -18,7 +18,7 @@ struct Reposted: View {
.foregroundColor(Color.gray)
ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_nip5_domain: false)
.foregroundColor(Color.gray)
- Text("Reposted", comment: "Text indicating that the post was reposted (i.e. re-shared).")
+ Text("Reposted", comment: "Text indicating that the note was reposted (i.e. re-shared).")
.foregroundColor(Color.gray)
}
}
diff --git a/damus/ContentView.swift b/damus/ContentView.swift
index 48f0af9f..7e4f3520 100644
--- a/damus/ContentView.swift
+++ b/damus/ContentView.swift
@@ -115,8 +115,8 @@ struct ContentView: View {
.safeAreaInset(edge: .top, spacing: 0) {
VStack(spacing: 0) {
CustomPicker(selection: $filter_state, content: {
- Text("Posts", comment: "Label for filter for seeing only posts (instead of posts and replies).").tag(FilterState.posts)
- Text("Posts & Replies", comment: "Label for filter for seeing posts and replies (instead of only posts).").tag(FilterState.posts_and_replies)
+ Text("Notes", comment: "Label for filter for seeing only notes (instead of notes and replies).").tag(FilterState.posts)
+ Text("Notes & Replies", comment: "Label for filter for seeing notes and replies (instead of only notes).").tag(FilterState.posts_and_replies)
})
Divider()
.frame(height: 1)
@@ -850,11 +850,11 @@ func timeline_name(_ timeline: Timeline?) -> String {
}
switch timeline {
case .home:
- return NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.")
+ return NSLocalizedString("Home", comment: "Navigation bar title for Home view where notes and replies appear from those who the user is following.")
case .notifications:
return NSLocalizedString("Notifications", comment: "Toolbar label for Notifications view.")
case .search:
- return NSLocalizedString("Universe 🛸", comment: "Toolbar label for the universal view where posts from all connected relay servers appear.")
+ return NSLocalizedString("Universe 🛸", comment: "Toolbar label for the universal view where notes from all connected relay servers appear.")
case .dms:
return NSLocalizedString("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
}
diff --git a/damus/Views/ActionBar/EventActionBar.swift b/damus/Views/ActionBar/EventActionBar.swift
index df8789bc..8d643cc0 100644
--- a/damus/Views/ActionBar/EventActionBar.swift
+++ b/damus/Views/ActionBar/EventActionBar.swift
@@ -95,7 +95,7 @@ struct EventActionBar: View {
EventActionButton(img: "upload", col: Color.gray) {
show_share_action = true
}
- .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
+ .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a note"))
}
.onAppear {
self.bar.update(damus: damus_state, evid: self.event.id)
diff --git a/damus/Views/CarouselView.swift b/damus/Views/CarouselView.swift
index 2bf10c3b..3c95c452 100644
--- a/damus/Views/CarouselView.swift
+++ b/damus/Views/CarouselView.swift
@@ -21,7 +21,7 @@ let carousel_items = [
CarouselItem(image: Image("undercover"),
text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")),
CarouselItem(image: Image("bitcoin-p2p"),
- text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string."))
+ text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string."))
]
struct CarouselView: View {
diff --git a/damus/Views/Events/MutedEventView.swift b/damus/Views/Events/MutedEventView.swift
index 74784640..54cdc26a 100644
--- a/damus/Views/Events/MutedEventView.swift
+++ b/damus/Views/Events/MutedEventView.swift
@@ -31,9 +31,9 @@ struct MutedEventView: View {
.foregroundColor(DamusColors.adaptableGrey)
HStack {
- Text("Post from a user you've muted", comment: "Text to indicate that what is being shown is a post from a user who has been muted.")
+ Text("Note from a user you've muted", comment: "Text to indicate that what is being shown is a note from a user who has been muted.")
Spacer()
- Button(shown ? NSLocalizedString("Hide", comment: "Button to hide a post from a user who has been muted.") : NSLocalizedString("Show", comment: "Button to show a post from a user who has been muted.")) {
+ Button(shown ? NSLocalizedString("Hide", comment: "Button to hide a note from a user who has been muted.") : NSLocalizedString("Show", comment: "Button to show a note from a user who has been muted.")) {
shown.toggle()
}
}
diff --git a/damus/Views/LoginView.swift b/damus/Views/LoginView.swift
index 02d7791b..8187e214 100644
--- a/damus/Views/LoginView.swift
+++ b/damus/Views/LoginView.swift
@@ -80,7 +80,7 @@ struct LoginView: View {
}
if parsed?.is_pub ?? false {
- Text("This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.", comment: "Warning that the inputted account key is a public key and the result of what happens because of it.")
+ Text("This is a public key, you will not be able to make notes or interact in any way. This is used for viewing accounts from their perspective.", comment: "Warning that the inputted account key is a public key and the result of what happens because of it.")
.foregroundColor(Color.orange)
.bold()
.fixedSize(horizontal: false, vertical: true)
diff --git a/damus/Views/Notifications/EventGroupView.swift b/damus/Views/Notifications/EventGroupView.swift
index 360a7117..0801a6f6 100644
--- a/damus/Views/Notifications/EventGroupView.swift
+++ b/damus/Views/Notifications/EventGroupView.swift
@@ -42,7 +42,7 @@ enum EventGroupType {
}
enum ReactingTo {
- case your_post
+ case your_note
case tagged_in
case your_profile
}
@@ -53,7 +53,7 @@ func determine_reacting_to(our_pubkey: String, ev: NostrEvent?) -> ReactingTo {
}
if ev.pubkey == our_pubkey {
- return .your_post
+ return .your_note
}
return .tagged_in
@@ -89,9 +89,9 @@ func event_group_author_name(profiles: Profiles, ind: Int, group: EventGroupType
"reacted_tagged_in_1" - returned when 1 reaction occurred to a post that the current user was tagged in
"reacted_tagged_in_2" - returned when 2 reactions occurred to a post that the current user was tagged in
"reacted_tagged_in_3" - returned when 3 or more reactions occurred to a post that the current user was tagged in
- "reacted_your_post_1" - returned when 1 reaction occurred to the current user's post
- "reacted_your_post_2" - returned when 2 reactions occurred to the current user's post
- "reacted_your_post_3" - returned when 3 or more reactions occurred to the current user's post
+ "reacted_your_note_1" - returned when 1 reaction occurred to the current user's post
+ "reacted_your_note_2" - returned when 2 reactions occurred to the current user's post
+ "reacted_your_note_3" - returned when 3 or more reactions occurred to the current user's post
"reacted_your_profile_1" - returned when 1 reaction occurred to the current user's profile
"reacted_your_profile_2" - returned when 2 reactions occurred to the current user's profile
"reacted_your_profile_3" - returned when 3 or more reactions occurred to the current user's profile
@@ -99,9 +99,9 @@ func event_group_author_name(profiles: Profiles, ind: Int, group: EventGroupType
"reposted_tagged_in_1" - returned when 1 repost occurred to a post that the current user was tagged in
"reposted_tagged_in_2" - returned when 2 reposts occurred to a post that the current user was tagged in
"reposted_tagged_in_3" - returned when 3 or more reposts occurred to a post that the current user was tagged in
- "reposted_your_post_1" - returned when 1 repost occurred to the current user's post
- "reposted_your_post_2" - returned when 2 reposts occurred to the current user's post
- "reposted_your_post_3" - returned when 3 or more reposts occurred to the current user's post
+ "reposted_your_note_1" - returned when 1 repost occurred to the current user's post
+ "reposted_your_note_2" - returned when 2 reposts occurred to the current user's post
+ "reposted_your_note_3" - returned when 3 or more reposts occurred to the current user's post
"reposted_your_profile_1" - returned when 1 repost occurred to the current user's profile
"reposted_your_profile_2" - returned when 2 reposts occurred to the current user's profile
"reposted_your_profile_3" - returned when 3 or more reposts occurred to the current user's profile
@@ -109,9 +109,9 @@ func event_group_author_name(profiles: Profiles, ind: Int, group: EventGroupType
"zapped_tagged_in_1" - returned when 1 zap occurred to a post that the current user was tagged in
"zapped_tagged_in_2" - returned when 2 zaps occurred to a post that the current user was tagged in
"zapped_tagged_in_3" - returned when 3 or more zaps occurred to a post that the current user was tagged in
- "zapped_your_post_1" - returned when 1 zap occurred to the current user's post
- "zapped_your_post_2" - returned when 2 zaps occurred to the current user's post
- "zapped_your_post_3" - returned when 3 or more zaps occurred to the current user's post
+ "zapped_your_note_1" - returned when 1 zap occurred to the current user's post
+ "zapped_your_note_2" - returned when 2 zaps occurred to the current user's post
+ "zapped_your_note_3" - returned when 3 or more zaps occurred to the current user's post
"zapped_your_profile_1" - returned when 1 zap occurred to the current user's profile
"zapped_your_profile_2" - returned when 2 zaps occurred to the current user's profile
"zapped_your_profile_3" - returned when 3 or more zaps occurred to the current user's profile
diff --git a/damus/Views/PostView.swift b/damus/Views/PostView.swift
index fcff1334..79506895 100644
--- a/damus/Views/PostView.swift
+++ b/damus/Views/PostView.swift
@@ -13,7 +13,7 @@ enum NostrPostResult {
case cancel
}
-let POST_PLACEHOLDER = NSLocalizedString("Type your post here...", comment: "Text box prompt to ask user to type their post.")
+let POST_PLACEHOLDER = NSLocalizedString("Type your note here...", comment: "Text box prompt to ask user to type their note.")
class TagModel: ObservableObject {
var diff = 0
diff --git a/damus/Views/Profile/ProfileView.swift b/damus/Views/Profile/ProfileView.swift
index 7b7ebe6f..07a1ca5e 100644
--- a/damus/Views/Profile/ProfileView.swift
+++ b/damus/Views/Profile/ProfileView.swift
@@ -491,8 +491,8 @@ struct ProfileView: View {
VStack(spacing: 0) {
CustomPicker(selection: $filter_state, content: {
- Text("Posts", comment: "Label for filter for seeing only your posts (instead of posts and replies).").tag(FilterState.posts)
- Text("Posts & Replies", comment: "Label for filter for seeing your posts and replies (instead of only your posts).").tag(FilterState.posts_and_replies)
+ Text("Notes", comment: "Label for filter for seeing only your notes (instead of notes and replies).").tag(FilterState.posts)
+ Text("Notes & Replies", comment: "Label for filter for seeing your notes and replies (instead of only your notes).").tag(FilterState.posts_and_replies)
})
Divider()
.frame(height: 1)
diff --git a/damus/Views/Relays/RelayDetailView.swift b/damus/Views/Relays/RelayDetailView.swift
index 6a7b6c91..c53bc123 100644
--- a/damus/Views/Relays/RelayDetailView.swift
+++ b/damus/Views/Relays/RelayDetailView.swift
@@ -88,7 +88,7 @@ struct RelayDetailView: View {
}, header: {
Text("Paid Relay", comment: "Section header that indicates the relay server requires payment.")
}, footer: {
- Text("This is a paid relay, you must pay for posts to be accepted.", comment: "Footer description that explains that the relay server requires payment to post.")
+ Text("This is a paid relay, you must pay for notes to be accepted.", comment: "Footer description that explains that the relay server requires payment to post.")
})
}
diff --git a/damus/en-US.lproj/Localizable.strings b/damus/en-US.lproj/Localizable.strings
index 17fd6e3e..77efcf85 100644
Binary files a/damus/en-US.lproj/Localizable.strings and b/damus/en-US.lproj/Localizable.strings differ
diff --git a/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.lproj/Localizable.stringsdict
index a0481b4b..4cdad71c 100644
--- a/damus/en-US.lproj/Localizable.stringsdict
+++ b/damus/en-US.lproj/Localizable.stringsdict
@@ -61,12 +61,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reacted to a post you were tagged in
+ %2$@ and %1$d other reacted to a note you were tagged inother
- %2$@ and %1$d others reacted to a post you were tagged in
+ %2$@ and %1$d others reacted to a note you were tagged in
- reacted_your_post_3
+ reacted_your_note_3NSStringLocalizedFormatKey%#@REACTED@
@@ -77,9 +77,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reacted to your post
+ %2$@ and %1$d other reacted to your noteother
- %2$@ and %1$d others reacted to your post
+ %2$@ and %1$d others reacted to your notereacted_your_profile_3
@@ -157,12 +157,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reposted a post you were tagged in
+ %2$@ and %1$d other reposted a note you were tagged inother
- %2$@ and %1$d others reposted a post you were tagged in
+ %2$@ and %1$d others reposted a note you were tagged in
- reposted_your_post_3
+ reposted_your_note_3NSStringLocalizedFormatKey%#@REPOSTED@
@@ -173,9 +173,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reposted your post
+ %2$@ and %1$d other reposted your noteother
- %2$@ and %1$d others reposted your post
+ %2$@ and %1$d others reposted your notereposted_your_profile_3
@@ -269,9 +269,9 @@
NSStringFormatValueTypeKey@one
- You received %2$@ sat from %3$@: "%4$@"
+ You received %2$@ sat from %3$@: "%4$@"other
- You received %2$@ sats from %3$@: "%4$@"
+ You received %2$@ sats from %3$@: "%4$@"zapped_tagged_in_3
@@ -285,12 +285,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other zapped a post you were tagged in
+ %2$@ and %1$d other zapped a note you were tagged inother
- %2$@ and %1$d others zapped a post you were tagged in
+ %2$@ and %1$d others zapped a note you were tagged in
- zapped_your_post_3
+ zapped_your_note_3NSStringLocalizedFormatKey%#@ZAPPED@
@@ -301,9 +301,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other zapped your post
+ %2$@ and %1$d other zapped your noteother
- %2$@ and %1$d others zapped your post
+ %2$@ and %1$d others zapped your notezapped_your_profile_3
diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff
index 70741434..3e9d3b6d 100644
--- a/damus/en-US.xcloc/Localized Contents/en-US.xliff
+++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff
@@ -73,9 +73,9 @@ Sentence composed of 2 variables to describe how many people are following a use
%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMsExplanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string.
-
-
- %@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet.
+
+
+ %@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.
@@ -576,11 +576,6 @@ Sentence composed of 2 variables to describe how many people are following a use
Follow me on nostrText on QR code view to prompt viewer looking at screen to follow the user.
-
-
- Follow them on nostr
- Text on QR code view to prompt viewer looking at screen to follow the user (someone else).
- Followers
@@ -624,7 +619,7 @@ Sentence composed of 2 variables to describe how many people are following a use
Hide
- Button to hide a post from a user who has been muted.
+ Button to hide a note from a user who has been muted.
@@ -634,7 +629,7 @@ Sentence composed of 2 variables to describe how many people are following a use
Home
- Navigation bar title for Home view where posts and replies appear from those who the user is following.
+ Navigation bar title for Home view where notes and replies appear from those who the user is following.
@@ -875,6 +870,23 @@ Sentence composed of 2 variables to describe how many people are following a use
Note contains "nsec1" private key. Are you sure?Alert user that they might be attempting to paste a private key and ask them to confirm.
+
+
+ Note from a user you've muted
+ Text to indicate that what is being shown is a note from a user who has been muted.
+
+
+
+ Notes
+ Label for filter for seeing only notes (instead of notes and replies).
+Label for filter for seeing only your notes (instead of notes and replies).
+
+
+
+ Notes & Replies
+ Label for filter for seeing notes and replies (instead of only notes).
+Label for filter for seeing your notes and replies (instead of only your notes).
+ Nothing to see here. Check back later!
@@ -967,23 +979,6 @@ Sentence composed of 2 variables to describe how many people are following a use
PostButton to post a note.
-
-
- Post from a user you've muted
- Text to indicate that what is being shown is a post from a user who has been muted.
-
-
-
- Posts
- Label for filter for seeing only posts (instead of posts and replies).
-Label for filter for seeing only your posts (instead of posts and replies).
-
-
-
- Posts & Replies
- Label for filter for seeing posts and replies (instead of only posts).
-Label for filter for seeing your posts and replies (instead of only your posts).
- Private
@@ -1141,7 +1136,7 @@ Button text to indicate that the zap type is a private zap.
Reposted
- Text indicating that the post was reposted (i.e. re-shared).
+ Text indicating that the note was reposted (i.e. re-shared).
@@ -1179,6 +1174,16 @@ Button text to indicate that the zap type is a private zap.
Save ImageContext menu option to save an image.
+
+
+ Scan Code
+ Button to switch to scan QR Code page.
+
+
+
+ Scan a user's pubkey
+ No comment provided by engineer.
+ Scan the code
@@ -1244,7 +1249,7 @@ Button text to indicate that the zap type is a private zap.
Share
- Button to share a post
+ Button to share a note
Button to share an image.
Button to share the link to a profile.
@@ -1261,7 +1266,7 @@ Button text to indicate that the zap type is a private zap.
Show
- Button to show a post from a user who has been muted.
+ Button to show a note from a user who has been muted.
Toggle to show or hide user's secret account login key.
@@ -1269,10 +1274,16 @@ Button text to indicate that the zap type is a private zap.
Show +Button that, when tapped, will show + buttons next to a user's relays.
+
+
+ Show less
+ Button to show less of a long profile description.
+ Show more
- Button to show entire note.
+ Button to show entire note.
+ Button to show more of a long profile description.
@@ -1359,14 +1370,14 @@ Button text to indicate that the zap type is a private zap.
They are impersonating someoneButton for user to report that the account is impersonating someone.
-
-
- This is a paid relay, you must pay for posts to be accepted.
+
+
+ This is a paid relay, you must pay for notes to be accepted.Footer description that explains that the relay server requires payment to post.
-
-
- This is a public key, you will not be able to make posts or interact in any way. This is used for viewing accounts from their perspective.
+
+
+ This is a public key, you will not be able to make notes or interact in any way. This is used for viewing accounts from their perspective.Warning that the inputted account key is a public key and the result of what happens because of it.
@@ -1425,10 +1436,10 @@ Button text to indicate that the zap type is a private zap.
Type %@ to deleteText field prompt asking user to type DELETE in all caps to confirm that they want to proceed with deleting their account.
-
-
- Type your post here...
- Text box prompt to ask user to type their post.
+
+
+ Type your note here...
+ Text box prompt to ask user to type their note.
@@ -1448,7 +1459,7 @@ Button text to indicate that the zap type is a private zap.
Universe 🛸
- Toolbar label for the universal view where posts from all connected relay servers appear.
+ Toolbar label for the universal view where notes from all connected relay servers appear.
@@ -1486,6 +1497,11 @@ Button text to indicate that the zap type is a private zap.
Label to display relay software version.
Section title for displaying the version number of the Damus app.
+
+
+ View QR Code
+ Button to switch to view users QR Code
+ View multiple events per user
@@ -1677,23 +1693,23 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
Description of private zap type where the zap is sent privately and does not identify the user to the public.
-
- %@ reacted to a post you were tagged in
- Notification that a user reacted to a post that the current user was tagged in
+
+ %@ reacted to a note you were tagged in
+ Notification that a user reacted to a note that the current user was tagged in
-
- %@ and %@ reacted to a post you were tagged in
- Notification that 2 users reacted to a post that the current user was tagged in
+
+ %@ and %@ reacted to a note you were tagged in
+ Notification that 2 users reacted to a note that the current user was tagged in
-
-
- %@ reacted to your post
- Notification that a user reacted to the current user's post
+
+
+ %@ reacted to your note
+ Notification that a user reacted to the current user's note
-
-
- %@ and %@ reacted to your post
+
+
+ %@ and %@ reacted to your noteNotification that 2 users reacted to the current user's profile
@@ -1707,24 +1723,24 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
Notification that 2 users reacted to the current user's profile
-
- %@ reposted a post you were tagged in
- Notification that a user reposted a post that the current user was tagged in
+
+ %@ reposted a note you were tagged in
+ Notification that a user reposted a note that the current user was tagged in
-
- %@ and %@ reposted a post you were tagged in
- Notification that 2 users reposted a post that the current user was tagged in
+
+ %@ and %@ reposted a note you were tagged in
+ Notification that 2 users reposted a note that the current user was tagged in
-
-
- %@ reposted your post
- Notification that a user reposted the current user's post
+
+
+ %@ reposted your note
+ Notification that a user reposted the current user's note
-
-
- %@ and %@ reposted your post
- Notification that 2 users reposted the current user's post
+
+
+ %@ and %@ reposted your note
+ Notification that 2 users reposted the current user's note
@@ -1757,24 +1773,24 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
You, in this context, is the person who controls their own social network. You is used in the context of a larger sentence that welcomes the reader to the social network that they control themself.
-
- %@ zapped a post you were tagged in
- Notification that a user zapped a post that the current user was tagged in
+
+ %@ zapped a note you were tagged in
+ Notification that a user zapped a note that the current user was tagged in
-
- %@ and %@ zapped a post you were tagged in
- Notification that 2 users zapped a post that the current user was tagged in
+
+ %@ and %@ zapped a note you were tagged in
+ Notification that 2 users zapped a note that the current user was tagged in
-
-
- %@ zapped your post
- Notification that a user zapped the current user's post
+
+
+ %@ zapped your note
+ Notification that a user zapped the current user's note
-
-
- %@ and %@ zapped your post
- Notification that 2 users zapped the current user's post
+
+
+ %@ and %@ zapped your note
+ Notification that 2 users zapped the current user's note
@@ -1849,28 +1865,28 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
-
- %2$@ and %1$d other reacted to a post you were tagged in
+
+ %2$@ and %1$d other reacted to a note you were tagged in
-
- %2$@ and %1$d others reacted to a post you were tagged in
+
+ %2$@ and %1$d others reacted to a note you were tagged in
-
+ %#@REACTED@
-
-
- %2$@ and %1$d other reacted to your post
+
+
+ %2$@ and %1$d other reacted to your note
-
-
- %2$@ and %1$d others reacted to your post
+
+
+ %2$@ and %1$d others reacted to your note
@@ -1939,28 +1955,28 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
-
- %2$@ and %1$d other reposted a post you were tagged in
+
+ %2$@ and %1$d other reposted a note you were tagged in
-
- %2$@ and %1$d others reposted a post you were tagged in
+
+ %2$@ and %1$d others reposted a note you were tagged in
-
+ %#@REPOSTED@
-
-
- %2$@ and %1$d other reposted your post
+
+
+ %2$@ and %1$d other reposted your note
-
-
- %2$@ and %1$d others reposted your post
+
+
+ %2$@ and %1$d others reposted your note
@@ -2059,28 +2075,28 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY.
-
- %2$@ and %1$d other zapped a post you were tagged in
+
+ %2$@ and %1$d other zapped a note you were tagged in
-
- %2$@ and %1$d others zapped a post you were tagged in
+
+ %2$@ and %1$d others zapped a note you were tagged in
-
+ %#@ZAPPED@
-
-
- %2$@ and %1$d other zapped your post
+
+
+ %2$@ and %1$d other zapped your note
-
-
- %2$@ and %1$d others zapped your post
+
+
+ %2$@ and %1$d others zapped your note
diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings
index 2c408aee..26eca404 100644
Binary files a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings and b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings differ
diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict
index a0481b4b..4cdad71c 100644
--- a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict
+++ b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.stringsdict
@@ -61,12 +61,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reacted to a post you were tagged in
+ %2$@ and %1$d other reacted to a note you were tagged inother
- %2$@ and %1$d others reacted to a post you were tagged in
+ %2$@ and %1$d others reacted to a note you were tagged in
- reacted_your_post_3
+ reacted_your_note_3NSStringLocalizedFormatKey%#@REACTED@
@@ -77,9 +77,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reacted to your post
+ %2$@ and %1$d other reacted to your noteother
- %2$@ and %1$d others reacted to your post
+ %2$@ and %1$d others reacted to your notereacted_your_profile_3
@@ -157,12 +157,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reposted a post you were tagged in
+ %2$@ and %1$d other reposted a note you were tagged inother
- %2$@ and %1$d others reposted a post you were tagged in
+ %2$@ and %1$d others reposted a note you were tagged in
- reposted_your_post_3
+ reposted_your_note_3NSStringLocalizedFormatKey%#@REPOSTED@
@@ -173,9 +173,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other reposted your post
+ %2$@ and %1$d other reposted your noteother
- %2$@ and %1$d others reposted your post
+ %2$@ and %1$d others reposted your notereposted_your_profile_3
@@ -269,9 +269,9 @@
NSStringFormatValueTypeKey@one
- You received %2$@ sat from %3$@: "%4$@"
+ You received %2$@ sat from %3$@: "%4$@"other
- You received %2$@ sats from %3$@: "%4$@"
+ You received %2$@ sats from %3$@: "%4$@"zapped_tagged_in_3
@@ -285,12 +285,12 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other zapped a post you were tagged in
+ %2$@ and %1$d other zapped a note you were tagged inother
- %2$@ and %1$d others zapped a post you were tagged in
+ %2$@ and %1$d others zapped a note you were tagged in
- zapped_your_post_3
+ zapped_your_note_3NSStringLocalizedFormatKey%#@ZAPPED@
@@ -301,9 +301,9 @@
NSStringFormatValueTypeKeydone
- %2$@ and %1$d other zapped your post
+ %2$@ and %1$d other zapped your noteother
- %2$@ and %1$d others zapped your post
+ %2$@ and %1$d others zapped your notezapped_your_profile_3
diff --git a/damusTests/EventGroupViewTests.swift b/damusTests/EventGroupViewTests.swift
index 6ccdcf6c..308adca3 100644
--- a/damusTests/EventGroupViewTests.swift
+++ b/damusTests/EventGroupViewTests.swift
@@ -27,9 +27,9 @@ final class EventGroupViewTests: XCTestCase {
let repost2 = NostrEvent(id: "", content: encodedPost, pubkey: "pk2", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [])), ev: test_event, locale: enUsLocale), "??")
- XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, locale: enUsLocale), "pk1:pk1 reposted a post you were tagged in")
- XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, locale: enUsLocale), "pk1:pk1 and pk2:pk2 reposted a post you were tagged in")
- XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost2])), ev: test_event, locale: enUsLocale), "pk1:pk1 and 2 others reposted a post you were tagged in")
+ XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, locale: enUsLocale), "pk1:pk1 reposted a note you were tagged in")
+ XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, locale: enUsLocale), "pk1:pk1 and pk2:pk2 reposted a note you were tagged in")
+ XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost2])), ev: test_event, locale: enUsLocale), "pk1:pk1 and 2 others reposted a note you were tagged in")
Bundle.main.localizations.map { Locale(identifier: $0) }.forEach {
XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [])), ev: test_event, locale: $0), "??")