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 @@ NSStringFormatValueTypeKey d one - %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 other - %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_3 NSStringLocalizedFormatKey %#@REACTED@ @@ -77,9 +77,9 @@ NSStringFormatValueTypeKey d one - %2$@ and %1$d other reacted to your post + %2$@ and %1$d other reacted to your note other - %2$@ and %1$d others reacted to your post + %2$@ and %1$d others reacted to your note reacted_your_profile_3 @@ -157,12 +157,12 @@ NSStringFormatValueTypeKey d one - %2$@ and %1$d other reposted a post you were tagged in + %2$@ and %1$d other reposted a note you were tagged in other - %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_3 NSStringLocalizedFormatKey %#@REPOSTED@ @@ -173,9 +173,9 @@ NSStringFormatValueTypeKey d one - %2$@ and %1$d other reposted your post + %2$@ and %1$d other reposted your note other - %2$@ and %1$d others reposted your post + %2$@ and %1$d others reposted your note reposted_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 @@ NSStringFormatValueTypeKey d one - %2$@ and %1$d other zapped a post you were tagged in + %2$@ and %1$d other zapped a note you were tagged in other - %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_3 NSStringLocalizedFormatKey %#@ZAPPED@ @@ -301,9 +301,9 @@ NSStringFormatValueTypeKey d one - %2$@ and %1$d other zapped your post + %2$@ and %1$d other zapped your note other - %2$@ and %1$d others zapped your post + %2$@ and %1$d others zapped your note zapped_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 DMs Explanation 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 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. + %@. 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 nostr Text on QR code view to prompt viewer looking at screen to follow the user. - - Follow them on nostr - Follow them on nostr - Text on QR code view to prompt viewer looking at screen to follow the user (someone else). - Followers Followers @@ -624,7 +619,7 @@ Sentence composed of 2 variables to describe how many people are following a use Hide 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. Hide all 🤙's @@ -634,7 +629,7 @@ Sentence composed of 2 variables to describe how many people are following a use Home 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. Illegal content @@ -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 + 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 + 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 + 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! 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 Post Button to post a note. - - Post from a user you've muted - 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 - 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 - 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 Private @@ -1141,7 +1136,7 @@ Button text to indicate that the zap type is a private zap. Reposted Reposted - Text indicating that the post was reposted (i.e. re-shared). + Text indicating that the note was reposted (i.e. re-shared). Reposted by %@ @@ -1179,6 +1174,16 @@ Button text to indicate that the zap type is a private zap. Save Image Context menu option to save an image. + + Scan Code + Scan Code + Button to switch to scan QR Code page. + + + Scan a user's pubkey + Scan a user's pubkey + No comment provided by engineer. + Scan the code Scan the code @@ -1244,7 +1249,7 @@ Button text to indicate that the zap type is a private zap. Share 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 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 + Show less + Button to show less of a long profile description. + Show more Show more - Button to show entire note. + Button to show entire note. + Button to show more of a long profile description. Show only from users you follow @@ -1359,14 +1370,14 @@ Button text to indicate that the zap type is a private zap. They are impersonating someone Button for user to report that the account is impersonating someone. -