Force default zap amount text field to accept only numbers

Show other people's zaps
Changelog-Fixed: Fix a bug where zaps on other people's posts weren't showing
2023-02-13 23:57:28 -05:00 · 2023-02-13 17:50:50 -08:00 · 2023-02-13 16:51:13 -08:00 · 2023-02-13 10:07:43 -08:00 · 2023-02-13 10:04:31 -08:00 · 2023-02-13 10:03:35 -08:00
133 changed files with 10357 additions and 1944 deletions
@@ -1,3 +1,48 @@
+## [1.0.0-15] - 2023-02-10
+
+### Added
+
+- Relay Filtering (William Casarin)
+- Japanese translations (Terry Yiu)
+- Add password autofill on account login and creation (Terry Yiu)
+- Show if relay is paid (William Casarin)
+- Add "Follows You" indicator on profile (William Casarin)
+- Add screen to select individual relays when posting/broadcasting (Andrii Sievrikov)
+- Relay Detail View (Joel Klabo)
+- Warn when attempting to post an nsec key (Terry Yiu)
+- DeepL translation integration (Terry Yiu)
+- Use local authentication (faceid) to access private key (Andrii Sievrikov)
+- Add accessibility labels to action bar (Bryan Montz)
+- Copy invoice button (Joel Klabo)
+- Receive Lightning Zaps (William Casarin)
+- Allow text selection in bio (Suhail Saqan)
+
+
+### Changed
+
+- Show "Follow Back" button on profile page (William Casarin)
+- When on your profile page, open relay view instead for your own relays (Terry Yiu)
+- Updated QR code view, include profile image, etc (ericholguin)
+- Clicking relay numbers now goes to relay config (radixrat)
+
+### Fixed
+
+- Load zaps, likes and reposts when you open a thread (William Casarin)
+- Fix bug where sidebar navigation fails to pop when switching timelines (William Casarin)
+- Use lnaddress before lnurl for tip addresses to avoid Anigma scamming (William Casarin)
+- Fix sidebar navigation bugs (OlegAba)
+- Fix issue where navigation fails pop to root when switching timelines (William Casarin)
+- Make @ mentions case insensitive (William Casarin)
+- Fix some lnurls not getting decoded properly (William Casarin)
+- Hide incoming DMs from blocked users (William Casarin)
+- Hide blocked users from search results (William Casarin)
+- Fix Cash App invoice payments (Rob Seward)
+- DM Padding (OlegAba)
+- Check for broken lnurls (William Casarin)
+
+
+
+[1.0.0-15]: https://github.com/damus-io/damus/releases/tag/v1.0.0-15
 ## [1.0.0-13] - 2023-01-30

 ### Added
@@ -514,5 +559,3 @@

 [0.1.2]: https://github.com/damus-io/damus/releases/tag/v0.1.2

-
-
@@ -26,6 +26,10 @@ static inline int is_boundary(char c) {
    return !isalnum(c);
 }

+static inline int is_invalid_url_ending(char c) {
+    return c == '!' || c == '?' || c == ')' || c == '.' || c == ',' || c == ';';
+}
+
 static void make_cursor(struct cursor *c, const u8 *content, size_t len)
 {
    c->start = content;
@@ -55,8 +59,8 @@ static int consume_until_whitespace(struct cursor *cur, int or_end) {
    while (cur->p < cur->end) {
        c = *cur->p;
        
-        if (is_whitespace(c) && consumedAtLeastOne)
-            return 1;
+        if (is_whitespace(c))
+            return consumedAtLeastOne;
        
        cur->p++;
        consumedAtLeastOne = true;
@@ -221,6 +225,9 @@ static int parse_url(struct cursor *cur, struct block *block) {
        return 0;
    }
    
+    // strip any unwanted characters
+    while(is_invalid_url_ending(peek_char(cur, -1))) cur->p--;
+    
    block->type = BLOCK_URL;
    block->block.str.start = (const char *)start;
    block->block.str.end = (const char *)cur->p;
@@ -15,6 +15,10 @@
 		3AA247FD297E3CFF0090C62D /* RepostsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FC297E3CFF0090C62D /* RepostsModel.swift */; };
 		3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA247FE297E3D900090C62D /* RepostsView.swift */; };
 		3AA24802297E3DC20090C62D /* RepostView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA24801297E3DC20090C62D /* RepostView.swift */; };
+		3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AA59D1C2999B0400061C48E /* DraftsModel.swift */; };
+		3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95C9298DF87B00F3D526 /* TranslationService.swift */; };
+		3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */; };
+		3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AB72AB8298ECF30004BB58C /* Translator.swift */; };
 		3ACB685C297633BC00C46468 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685A297633BC00C46468 /* InfoPlist.strings */; };
 		3ACB685F297633BC00C46468 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3ACB685D297633BC00C46468 /* Localizable.strings */; };
 		3ACBCB78295FE5C70037388A /* TimeAgoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ACBCB77295FE5C70037388A /* TimeAgoTests.swift */; };
@@ -28,7 +32,6 @@
 		4C0A3F8F280F640A000448DE /* ThreadModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F8E280F640A000448DE /* ThreadModel.swift */; };
 		4C0A3F91280F6528000448DE /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F90280F6528000448DE /* ChatView.swift */; };
 		4C0A3F93280F66F5000448DE /* ReplyMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F92280F66F5000448DE /* ReplyMap.swift */; };
-		4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C0A3F96280F8E02000448DE /* ThreadView.swift */; };
 		4C216F32286E388800040376 /* DMChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F31286E388800040376 /* DMChatView.swift */; };
 		4C216F34286F5ACD00040376 /* DMView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F33286F5ACD00040376 /* DMView.swift */; };
 		4C216F362870A9A700040376 /* InputDismissKeyboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C216F352870A9A700040376 /* InputDismissKeyboard.swift */; };
@@ -139,6 +142,8 @@
 		4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AD2976FA9300DC99E7 /* FormatTests.swift */; };
 		4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883AF297705DD00DC99E7 /* ZapButton.swift */; };
 		4CB883B6297730E400DC99E7 /* LNUrls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB883B5297730E400DC99E7 /* LNUrls.swift */; };
+		4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */; };
+		4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */; };
 		4CBCA930297DB57F00EC6B2F /* WebsiteLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */; };
 		4CC7AAE7297EFA7B00430951 /* Zap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAE6297EFA7B00430951 /* Zap.swift */; };
 		4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */; };
@@ -163,6 +168,14 @@
 		4CE6DF0427F7A08200C66700 /* damusUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */; };
 		4CE6DF1227F7A2B300C66700 /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 4CE6DF1127F7A2B300C66700 /* Starscream */; };
 		4CE6DF1627F8DEBF00C66700 /* RelayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */; };
+		4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794729941DA700F758CC /* RelayFilters.swift */; };
+		4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */; };
+		4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794D2996B16A00F758CC /* RelayToggle.swift */; };
+		4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8794F2996B2BD00F758CC /* RelayStatus.swift */; };
+		4CE879522996B68900F758CC /* RelayType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879512996B68900F758CC /* RelayType.swift */; };
+		4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879542996BAB900F758CC /* RelayPaidDetail.swift */; };
+		4CE879582996C45300F758CC /* ZapsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE879572996C45300F758CC /* ZapsView.swift */; };
+		4CE8795B2996C47A00F758CC /* ZapsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8795A2996C47A00F758CC /* ZapsModel.swift */; };
 		4CEE2AED2805B22500AB5EEF /* NostrRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AEC2805B22500AB5EEF /* NostrRequest.swift */; };
 		4CEE2AF1280B216B00AB5EEF /* EventDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */; };
 		4CEE2AF3280B25C500AB5EEF /* ProfilePicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CEE2AF2280B25C500AB5EEF /* ProfilePicView.swift */; };
@@ -188,6 +201,7 @@
 		5C513FBA297F72980072348F /* CustomPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FB9297F72980072348F /* CustomPicker.swift */; };
 		5C513FCC2984ACA60072348F /* QRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C513FCB2984ACA60072348F /* QRCodeView.swift */; };
 		6439E014296790CF0020672B /* ProfileZoomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6439E013296790CF0020672B /* ProfileZoomView.swift */; };
+		643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 643EA5C7296B764E005081BB /* RelayFilterView.swift */; };
 		647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
 		64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
 		6C7DE41F2955169800E66263 /* Vault in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7DE41E2955169800E66263 /* Vault */; };
@@ -200,6 +214,8 @@
 		DD597CBD2963D85A00C64D32 /* MarkdownTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */; };
 		E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E990020E2955F837003BBC5A /* EditMetadataView.swift */; };
 		E9E4ED0B295867B900DD7078 /* ThreadV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */; };
+		F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E91298B0F0700AB113A /* RelayDetailView.swift */; };
+		F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */; };
 		F7F0BA25297892BD009531F3 /* SwipeToDismiss.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */; };
 		F7F0BA272978E54D009531F3 /* ParicipantsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7F0BA262978E54D009531F3 /* ParicipantsView.swift */; };
 /* End PBXBuildFile section */
@@ -229,6 +245,9 @@
 		3A185A04297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A185A05297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "lv-LV"; path = "lv-LV.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A185A06297F2C3800F4BDC0 /* lv-LV */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "lv-LV"; path = "lv-LV.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A25EF132992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "el-GR"; path = "el-GR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		3A25EF142992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "el-GR"; path = "el-GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		3A25EF152992DA5D008ABE69 /* el-GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "el-GR"; path = "el-GR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A2B8B0A296A8982009CC16D /* en-US */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "en-US"; path = "en-US.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		3A4F3320297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A4F3321297CCFEE004B5F72 /* fr-FR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "fr-FR"; path = "fr-FR.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -237,6 +256,9 @@
 		3A5CAE1D298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A5CAE1E298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-CN"; path = "zh-CN.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A5CAE1F298DC0DB00B5334F /* zh-CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-CN"; path = "zh-CN.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		3A66D927299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3A66D928299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3A66D929299472FA008B44F4 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		3A929C20297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		3A929C21297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "it-IT"; path = "it-IT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		3A929C22297F2CF80090925E /* it-IT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "it-IT"; path = "it-IT.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
@@ -249,9 +271,13 @@
 		3AA247FC297E3CFF0090C62D /* RepostsModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepostsModel.swift; sourceTree = "<group>"; };
 		3AA247FE297E3D900090C62D /* RepostsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostsView.swift; sourceTree = "<group>"; };
 		3AA24801297E3DC20090C62D /* RepostView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepostView.swift; sourceTree = "<group>"; };
+		3AA59D1C2999B0400061C48E /* DraftsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraftsModel.swift; sourceTree = "<group>"; };
+		3AAA95C9298DF87B00F3D526 /* TranslationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslationService.swift; sourceTree = "<group>"; };
+		3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeepLPlan.swift; sourceTree = "<group>"; };
 		3AB5B86A2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AB5B86B2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AB5B86C2986D8A3006599D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		3AB72AB8298ECF30004BB58C /* Translator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Translator.swift; sourceTree = "<group>"; };
 		3AC524EE298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		3AC524EF298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
 		3AC524F0298C000B00693EBF /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -276,7 +302,6 @@
 		4C0A3F8E280F640A000448DE /* ThreadModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadModel.swift; sourceTree = "<group>"; };
 		4C0A3F90280F6528000448DE /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
 		4C0A3F92280F66F5000448DE /* ReplyMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyMap.swift; sourceTree = "<group>"; };
-		4C0A3F96280F8E02000448DE /* ThreadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadView.swift; sourceTree = "<group>"; };
 		4C216F31286E388800040376 /* DMChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMChatView.swift; sourceTree = "<group>"; };
 		4C216F33286F5ACD00040376 /* DMView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DMView.swift; sourceTree = "<group>"; };
 		4C216F352870A9A700040376 /* InputDismissKeyboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputDismissKeyboard.swift; sourceTree = "<group>"; };
@@ -417,6 +442,8 @@
 		4CB883AD2976FA9300DC99E7 /* FormatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTests.swift; sourceTree = "<group>"; };
 		4CB883AF297705DD00DC99E7 /* ZapButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapButton.swift; sourceTree = "<group>"; };
 		4CB883B5297730E400DC99E7 /* LNUrls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LNUrls.swift; sourceTree = "<group>"; };
+		4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileNameView.swift; sourceTree = "<group>"; };
+		4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FollowsYou.swift; sourceTree = "<group>"; };
 		4CBCA92F297DB57F00EC6B2F /* WebsiteLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebsiteLink.swift; sourceTree = "<group>"; };
 		4CC7AAE6297EFA7B00430951 /* Zap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Zap.swift; sourceTree = "<group>"; };
 		4CC7AAEA297F0AEC00430951 /* BuilderEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuilderEventView.swift; sourceTree = "<group>"; };
@@ -443,6 +470,14 @@
 		4CE6DF0127F7A08200C66700 /* damusUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = damusUITests.swift; sourceTree = "<group>"; };
 		4CE6DF0327F7A08200C66700 /* damusUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = damusUITestsLaunchTests.swift; sourceTree = "<group>"; };
 		4CE6DF1527F8DEBF00C66700 /* RelayConnection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayConnection.swift; sourceTree = "<group>"; };
+		4CE8794729941DA700F758CC /* RelayFilters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilters.swift; sourceTree = "<group>"; };
+		4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayMetadatas.swift; sourceTree = "<group>"; };
+		4CE8794D2996B16A00F758CC /* RelayToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayToggle.swift; sourceTree = "<group>"; };
+		4CE8794F2996B2BD00F758CC /* RelayStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayStatus.swift; sourceTree = "<group>"; };
+		4CE879512996B68900F758CC /* RelayType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayType.swift; sourceTree = "<group>"; };
+		4CE879542996BAB900F758CC /* RelayPaidDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayPaidDetail.swift; sourceTree = "<group>"; };
+		4CE879572996C45300F758CC /* ZapsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapsView.swift; sourceTree = "<group>"; };
+		4CE8795A2996C47A00F758CC /* ZapsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZapsModel.swift; sourceTree = "<group>"; };
 		4CEE2AE72804F57C00AB5EEF /* libsecp256k1.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libsecp256k1.a; sourceTree = "<group>"; };
 		4CEE2AEC2805B22500AB5EEF /* NostrRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NostrRequest.swift; sourceTree = "<group>"; };
 		4CEE2AF0280B216B00AB5EEF /* EventDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventDetailView.swift; sourceTree = "<group>"; };
@@ -469,6 +504,7 @@
 		5C513FB9297F72980072348F /* CustomPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomPicker.swift; sourceTree = "<group>"; };
 		5C513FCB2984ACA60072348F /* QRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeView.swift; sourceTree = "<group>"; };
 		6439E013296790CF0020672B /* ProfileZoomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileZoomView.swift; sourceTree = "<group>"; };
+		643EA5C7296B764E005081BB /* RelayFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayFilterView.swift; sourceTree = "<group>"; };
 		647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
 		64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		7C45AE70297353390031D7BC /* KFImageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KFImageModel.swift; sourceTree = "<group>"; };
@@ -480,6 +516,8 @@
 		DD597CBC2963D85A00C64D32 /* MarkdownTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkdownTests.swift; sourceTree = "<group>"; };
 		E990020E2955F837003BBC5A /* EditMetadataView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMetadataView.swift; sourceTree = "<group>"; };
 		E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadV2View.swift; sourceTree = "<group>"; };
+		F7908E91298B0F0700AB113A /* RelayDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayDetailView.swift; sourceTree = "<group>"; };
+		F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NIPURLBuilder.swift; sourceTree = "<group>"; };
 		F7F0BA24297892BD009531F3 /* SwipeToDismiss.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeToDismiss.swift; sourceTree = "<group>"; };
 		F7F0BA262978E54D009531F3 /* ParicipantsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParicipantsView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -621,6 +659,10 @@
 				4CF0ABD32980996B00D66079 /* Report.swift */,
 				4CF0ABDD2981A69500D66079 /* MutelistModel.swift */,
 				3AE45AF5297BB2E700C1D842 /* LibreTranslateServer.swift */,
+				3AAA95C9298DF87B00F3D526 /* TranslationService.swift */,
+				3AAA95CB298E07E900F3D526 /* DeepLPlan.swift */,
+				4CE8795A2996C47A00F758CC /* ZapsModel.swift */,
+				3AA59D1C2999B0400061C48E /* DraftsModel.swift */,
 			);
 			path = Models;
 			sourceTree = "<group>";
@@ -628,6 +670,8 @@
 		4C75EFA227FA576C0006080F /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				4CE879562996C44A00F758CC /* Zaps */,
+				4CB9D4A52992D01900A9A7E4 /* Profile */,
 				4CAAD8AE29888A9B00060CEA /* Relays */,
 				4CF0ABF42985CD4200D66079 /* Posting */,
 				4CF0ABDF2981A83000D66079 /* Muting */,
@@ -672,7 +716,6 @@
 				BAB68BEC29543FA3007BA466 /* SelectWalletView.swift */,
 				4C3AC7A02835A81400E1F516 /* SetupView.swift */,
 				E9E4ED0A295867B900DD7078 /* ThreadV2View.swift */,
-				4C0A3F96280F8E02000448DE /* ThreadView.swift */,
 				4CA2EF9F280E37AC0044ACD8 /* TimelineView.swift */,
 				4CB55EF4295E679D007FD187 /* UserRelaysView.swift */,
 				647D9A8C2968520300A295DE /* SideMenuView.swift */,
@@ -683,6 +726,7 @@
 				4CF0ABE42981EE0C00D66079 /* EULAView.swift */,
 				3AA247FE297E3D900090C62D /* RepostsView.swift */,
 				5C513FCB2984ACA60072348F /* QRCodeView.swift */,
+				643EA5C7296B764E005081BB /* RelayFilterView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -710,9 +754,11 @@
 		4C7FF7D628233637009601DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
+				4CE879492995B58700F758CC /* Relays */,
 				4CF0ABEA29844B2F00D66079 /* AnyCodable */,
 				4CC7AAE6297EFA7B00430951 /* Zap.swift */,
 				4C3A1D322960DB0500558C0F /* Markdown.swift */,
+				F7908E96298B1FDF00AB113A /* NIPURLBuilder.swift */,
 				4CEE2AF4280B29E600AB5EEF /* TimeAgo.swift */,
 				4CE4F8CC281352B30009DFBB /* Notifications.swift */,
 				4C363A8328233689006E126D /* Parser.swift */,
@@ -733,6 +779,7 @@
 				4CB883A52975F83C00DC99E7 /* LNUrlPayRequest.swift */,
 				4CB883A72975FC1800DC99E7 /* Zaps.swift */,
 				4CB883B5297730E400DC99E7 /* LNUrls.swift */,
+				3AB72AB8298ECF30004BB58C /* Translator.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -740,9 +787,14 @@
 		4CAAD8AE29888A9B00060CEA /* Relays */ = {
 			isa = PBXGroup;
 			children = (
+				4CE879532996BA0000F758CC /* Detail */,
 				4CB55EF2295E5D59007FD187 /* RecommendedRelayView.swift */,
 				4C06670028FC7C5900038D2A /* RelayView.swift */,
 				4CAAD8AF29888AD200060CEA /* RelayConfigView.swift */,
+				F7908E91298B0F0700AB113A /* RelayDetailView.swift */,
+				4CE8794D2996B16A00F758CC /* RelayToggle.swift */,
+				4CE8794F2996B2BD00F758CC /* RelayStatus.swift */,
+				4CE879512996B68900F758CC /* RelayType.swift */,
 			);
 			path = Relays;
 			sourceTree = "<group>";
@@ -764,6 +816,15 @@
 			path = Reactions;
 			sourceTree = "<group>";
 		};
+		4CB9D4A52992D01900A9A7E4 /* Profile */ = {
+			isa = PBXGroup;
+			children = (
+				4CB9D4A62992D02B00A9A7E4 /* ProfileNameView.swift */,
+				4CB9D4A82992D2F400A9A7E4 /* FollowsYou.swift */,
+			);
+			path = Profile;
+			sourceTree = "<group>";
+		};
 		4CC7AAEE297F11B300430951 /* Events */ = {
 			isa = PBXGroup;
 			children = (
@@ -882,6 +943,31 @@
 			path = damusUITests;
 			sourceTree = "<group>";
 		};
+		4CE879492995B58700F758CC /* Relays */ = {
+			isa = PBXGroup;
+			children = (
+				4CE8794729941DA700F758CC /* RelayFilters.swift */,
+				4CE8794B2995B59E00F758CC /* RelayMetadatas.swift */,
+			);
+			path = Relays;
+			sourceTree = "<group>";
+		};
+		4CE879532996BA0000F758CC /* Detail */ = {
+			isa = PBXGroup;
+			children = (
+				4CE879542996BAB900F758CC /* RelayPaidDetail.swift */,
+			);
+			path = Detail;
+			sourceTree = "<group>";
+		};
+		4CE879562996C44A00F758CC /* Zaps */ = {
+			isa = PBXGroup;
+			children = (
+				4CE879572996C45300F758CC /* ZapsView.swift */,
+			);
+			path = Zaps;
+			sourceTree = "<group>";
+		};
 		4CEE2AE62804F57B00AB5EEF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -1028,6 +1114,8 @@
 				ar,
 				nl,
 				"zh-CN",
+				"el-GR",
+				ja,
 			);
 			mainGroup = 4CE6DEDA27F7A08100C66700;
 			packageReferences = (
@@ -1093,6 +1181,7 @@
 				4C285C86283892E7008A31F1 /* CreateAccountModel.swift in Sources */,
 				4C64987C286D03E000EAE2B3 /* DirectMessagesView.swift in Sources */,
 				7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */,
+				4CE8794C2995B59E00F758CC /* RelayMetadatas.swift in Sources */,
 				4C363A8C28236B92006E126D /* PubkeyView.swift in Sources */,
 				4C5C7E68284ED36500A22DF5 /* SearchHomeModel.swift in Sources */,
 				4C75EFB728049D990006080F /* RelayPool.swift in Sources */,
@@ -1112,6 +1201,7 @@
 				4C7FF7D52823313F009601DB /* Mentions.swift in Sources */,
 				4C633350283D40E500B1C9C3 /* HomeModel.swift in Sources */,
 				4C987B57283FD07F0042CE38 /* FollowersModel.swift in Sources */,
+				3AB72AB9298ECF30004BB58C /* Translator.swift in Sources */,
 				4C363A9028247A1D006E126D /* NostrLink.swift in Sources */,
 				4C0A3F8C280F5FCA000448DE /* ChatroomView.swift in Sources */,
 				4C477C9E282C3A4800033AA3 /* TipCounter.swift in Sources */,
@@ -1134,6 +1224,7 @@
 				4C75EFB328049D640006080F /* NostrEvent.swift in Sources */,
 				4CA2EFA0280E37AC0044ACD8 /* TimelineView.swift in Sources */,
 				4C363A8428233689006E126D /* Parser.swift in Sources */,
+				3AAA95CA298DF87B00F3D526 /* TranslationService.swift in Sources */,
 				4CE4F9E328528C5200C00DD9 /* AddRelayView.swift in Sources */,
 				4C363A9A28283854006E126D /* Reply.swift in Sources */,
 				BA693074295D649800ADDB87 /* UserSettingsStore.swift in Sources */,
@@ -1149,8 +1240,10 @@
 				4CEE2AF7280B2DEA00AB5EEF /* ProfileName.swift in Sources */,
 				4CC7AAEB297F0AEC00430951 /* BuilderEventView.swift in Sources */,
 				31D2E847295218AF006D67F8 /* Shimmer.swift in Sources */,
+				F7908E97298B1FDF00AB113A /* NIPURLBuilder.swift in Sources */,
 				4C285C8228385570008A31F1 /* CarouselView.swift in Sources */,
 				4C3EA67F28FFC01D00C48A62 /* InvoiceView.swift in Sources */,
+				4CE8794829941DA700F758CC /* RelayFilters.swift in Sources */,
 				4CEE2B02280B39E800AB5EEF /* EventActionBar.swift in Sources */,
 				4C3BEFE0281DE1ED00B3DE84 /* DamusState.swift in Sources */,
 				7C45AE71297353390031D7BC /* KFImageModel.swift in Sources */,
@@ -1167,13 +1260,16 @@
 				4CC7AAF8297F1CEE00430951 /* EventProfile.swift in Sources */,
 				64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */,
 				4C3EA64928FF597700C48A62 /* bech32.c in Sources */,
+				4CE879522996B68900F758CC /* RelayType.swift in Sources */,
 				4C90BD162839DB54008EE7EF /* NostrMetadata.swift in Sources */,
+				4CE8795B2996C47A00F758CC /* ZapsModel.swift in Sources */,
 				4C3A1D3729637E0500558C0F /* PreviewCache.swift in Sources */,
 				4C3EA67528FF7A5A00C48A62 /* take.c in Sources */,
 				4C3AC7A12835A81400E1F516 /* SetupView.swift in Sources */,
 				4C06670128FC7C5900038D2A /* RelayView.swift in Sources */,
 				4C285C8C28398BC7008A31F1 /* Keys.swift in Sources */,
 				4CACA9DC280C38C000D9BBE8 /* Profiles.swift in Sources */,
+				4CE879582996C45300F758CC /* ZapsView.swift in Sources */,
 				4C633352283D419F00B1C9C3 /* SignalModel.swift in Sources */,
 				9609F058296E220800069BF3 /* BannerImageView.swift in Sources */,
 				4C363A94282704FA006E126D /* Post.swift in Sources */,
@@ -1224,27 +1320,33 @@
 				4C3AC7A728369BA200E1F516 /* SearchHomeView.swift in Sources */,
 				4CB883B0297705DD00DC99E7 /* ZapButton.swift in Sources */,
 				4C363A922825FCF2006E126D /* ProfileUpdate.swift in Sources */,
+				4CB9D4A92992D2F400A9A7E4 /* FollowsYou.swift in Sources */,
 				4C3BEFDA281DCA1400B3DE84 /* LikeCounter.swift in Sources */,
 				4CB88389296AF99A00DC99E7 /* EventDetailBar.swift in Sources */,
 				4CF0ABDE2981A69500D66079 /* MutelistModel.swift in Sources */,
+				4CE8794E2996B16A00F758CC /* RelayToggle.swift in Sources */,
 				4C3AC79B28306D7B00E1F516 /* Contacts.swift in Sources */,
 				4C3EA63D28FF52D600C48A62 /* bolt11.c in Sources */,
 				4CB55EF3295E5D59007FD187 /* RecommendedRelayView.swift in Sources */,
 				4CF0ABEC29844B4700D66079 /* AnyDecodable.swift in Sources */,
 				4C5F9118283D88E40052CD1C /* FollowingModel.swift in Sources */,
+				643EA5C8296B764E005081BB /* RelayFilterView.swift in Sources */,
 				4C3EA67D28FFBBA300C48A62 /* InvoicesView.swift in Sources */,
 				4C363A8E28236FE4006E126D /* NoteContentView.swift in Sources */,
 				4C90BD1A283AA67F008EE7EF /* Bech32.swift in Sources */,
 				E990020F2955F837003BBC5A /* EditMetadataView.swift in Sources */,
 				5C513FBA297F72980072348F /* CustomPicker.swift in Sources */,
 				4CACA9D5280C31E100D9BBE8 /* ReplyView.swift in Sources */,
+				F7908E92298B0F0700AB113A /* RelayDetailView.swift in Sources */,
 				4C3A1D332960DB0500558C0F /* Markdown.swift in Sources */,
+				4CE879552996BAB900F758CC /* RelayPaidDetail.swift in Sources */,
 				4CF0ABD42980996B00D66079 /* Report.swift in Sources */,
-				4C0A3F97280F8E02000448DE /* ThreadView.swift in Sources */,
 				4C06670B28FDE64700038D2A /* damus.c in Sources */,
+				3AAA95CC298E07E900F3D526 /* DeepLPlan.swift in Sources */,
 				4FE60CDD295E1C5E00105A1F /* Wallet.swift in Sources */,
 				3AA247FF297E3D900090C62D /* RepostsView.swift in Sources */,
 				3AE45AF6297BB2E700C1D842 /* LibreTranslateServer.swift in Sources */,
+				4CE879502996B2BD00F758CC /* RelayStatus.swift in Sources */,
 				4C99737B28C92A9200E53835 /* ChatroomMetadata.swift in Sources */,
 				4CC7AAF4297F18B400430951 /* ReplyDescription.swift in Sources */,
 				4C75EFA427FA577B0006080F /* PostView.swift in Sources */,
@@ -1253,7 +1355,9 @@
 				4CC7AAFA297F64AC00430951 /* EventMenu.swift in Sources */,
 				4C75EFBB2804A34C0006080F /* ProofOfWork.swift in Sources */,
 				4C3AC7A52836987600E1F516 /* MainTabView.swift in Sources */,
+				3AA59D1D2999B0400061C48E /* DraftsModel.swift in Sources */,
 				3169CAED294FCCFC00EE4006 /* Constants.swift in Sources */,
+				4CB9D4A72992D02B00A9A7E4 /* ProfileNameView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1315,6 +1419,8 @@
 				3AC524F0298C000B00693EBF /* ar */,
 				3A96D41C298DA94500388A2A /* nl */,
 				3A5CAE1F298DC0DB00B5334F /* zh-CN */,
+				3A25EF152992DA5D008ABE69 /* el-GR */,
+				3A66D929299472FA008B44F4 /* ja */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -1333,6 +1439,8 @@
 				3AC524EE298C000B00693EBF /* ar */,
 				3A96D41A298DA94500388A2A /* nl */,
 				3A5CAE1D298DC0DB00B5334F /* zh-CN */,
+				3A25EF132992DA5D008ABE69 /* el-GR */,
+				3A66D927299472FA008B44F4 /* ja */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -1351,6 +1459,8 @@
 				3AC524EF298C000B00693EBF /* ar */,
 				3A96D41B298DA94500388A2A /* nl */,
 				3A5CAE1E298DC0DB00B5334F /* zh-CN */,
+				3A25EF142992DA5D008ABE69 /* el-GR */,
+				3A66D928299472FA008B44F4 /* ja */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1486,7 +1596,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1494,6 +1604,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1508,7 +1619,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1527,7 +1638,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = damus/damus.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"damus/Preview Content\"";
 				DEVELOPMENT_TEAM = XK7H4JAB3D;
 				ENABLE_PREVIEWS = YES;
@@ -1535,6 +1646,7 @@
 				INFOPLIST_FILE = damus/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Damus;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
+				INFOPLIST_KEY_NSFaceIDUsageDescription = "Local authentication to access private key";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Granting Damus access to your photos allows you to save images.";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1549,7 +1661,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jb55.damus2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -5,8 +5,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/onevcat/Kingfisher",
      "state" : {
-        "revision" : "017f94ccfdacabb1ae7f45b75b4217b24c06e6ac",
-        "version" : "7.4.0"
+        "revision" : "415b1d97fb38bda1e5a6b2dde63354720832110b",
+        "version" : "7.6.1"
      }
    },
    {
@@ -71,10 +71,7 @@ struct TranslateView: View {
            }
        }
        .task {
-            let translate_url = damus_state.settings.libretranslate_url
-            let api_key = damus_state.settings.libretranslate_api_key
-            
-            guard noteLanguage == nil && !checkingTranslationStatus && translate_url != "" else {
+            guard noteLanguage == nil && !checkingTranslationStatus && damus_state.settings.can_translate(damus_state.pubkey) else {
                return
            }
            
@@ -86,16 +83,22 @@ struct TranslateView: View {
                currentLanguage = Locale.current.languageCode ?? "en"
            }

-            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in.
-            let content = event.get_content(damus_state.keypair.privkey)
-            noteLanguage = NLLanguageRecognizer.dominantLanguage(for: content)?.rawValue ?? currentLanguage
+            // Rely on Apple's NLLanguageRecognizer to tell us which language it thinks the note is in
+            // and filter on only the text portions of the content as URLs and hashtags confuse the language recognizer.
+            let originalBlocks = event.blocks(damus_state.keypair.privkey)
+            let originalOnlyText = originalBlocks.compactMap { $0.is_text }.joined(separator: " ")
+
+            // Only accept language recognition hypothesis if there's at least a 50% probability that it's accurate.
+            let languageRecognizer = NLLanguageRecognizer()
+            languageRecognizer.processString(originalOnlyText)
+            noteLanguage = languageRecognizer.languageHypotheses(withMaximum: 1).first(where: { $0.value >= 0.5 })?.key.rawValue ?? currentLanguage

            if let lang = noteLanguage, noteLanguage != currentLanguage {
-                // If the detected dominant language is a variant, remove the variant component and just take the language part as LibreTranslate typically only supports the variant-less language.
+                // If the detected dominant language is a variant, remove the variant component and just take the language part as translation services typically only supports the variant-less language.
                if #available(iOS 16, *) {
                    noteLanguage = Locale.LanguageCode(stringLiteral: lang).identifier(.alpha2)
                } else {
-                    noteLanguage = Locale.canonicalLanguageIdentifier(from: lang)
+                    noteLanguage = NSLocale(localeIdentifier: lang).languageCode
                }
            }
            
@@ -109,8 +112,15 @@ struct TranslateView: View {
            if note_lang != currentLanguage {
                do {
                    // If the note language is different from our language, send a translation request.
-                    let translator = Translator(translate_url, apiKey: api_key)
-                    translated_note = try await translator.translate(content, from: note_lang, to: currentLanguage)
+                    let translator = Translator(damus_state.settings)
+                    let originalContent = event.get_content(damus_state.keypair.privkey)
+                    translated_note = try await translator.translate(originalContent, from: note_lang, to: currentLanguage)
+
+                    if originalContent == translated_note {
+                        // If the translation is the same as the original, don't bother showing it.
+                        noteLanguage = currentLanguage
+                        translated_note = nil
+                    }
                } catch {
                    // If for whatever reason we're not able to figure out the language of the note, or translate the note, fail gracefully and do not retry. It's not the end of the world. Don't want to take down someone's translation server with an accidental denial of service attack.
                    noteLanguage = currentLanguage
@@ -120,9 +130,8 @@ struct TranslateView: View {

            if let translated = translated_note {
                // Render translated note.
-                let blocks = event.get_blocks(content: translated)
-                let show_images = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
-                translated_artifacts = render_blocks(blocks: blocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey, show_images: show_images)
+                let translatedBlocks = event.get_blocks(content: translated)
+                translated_artifacts = render_blocks(blocks: translatedBlocks, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
            }

            checkingTranslationStatus = false
@@ -17,7 +17,7 @@ struct UserView: View {
        let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: followers)
        
        NavigationLink(destination: pv) {
-            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles, contacts: damus_state.contacts)
+            ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
        
            VStack(alignment: .leading) {
                let profile = damus_state.profiles.lookup(id: pubkey)
@@ -52,7 +52,8 @@ struct ZapButton: View {
                damus_state.lnurls.endpoints[target.pubkey] = payreq
            }
            
-            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, amount: 1000000) else {
+            let zap_amount = get_default_zap_amount(pubkey: damus_state.pubkey) ?? 1000
+            guard let inv = await fetch_zap_invoice(payreq, zapreq: zapreq, sats: zap_amount) else {
                DispatchQueue.main.async {
                    zapping = false
                }
@@ -107,6 +108,7 @@ struct ZapButton: View {
                    send_zap()
                }
            }
+            .accessibilityLabel(NSLocalizedString("Zap", comment: "Accessibility label for zap button"))
            
            Text("\(bar.zap_total > 0 ? "\(format_msats_abbrev(bar.zap_total))" : "")")
                .offset(x: 22)
@@ -7,13 +7,12 @@

 import SwiftUI
 import Starscream
-import Kingfisher

 var BOOTSTRAP_RELAYS = [
    "wss://relay.damus.io",
    "wss://eden.nostr.land",
    "wss://relay.snort.social",
-    "wss://nostr.orangepill.dev",
+    "wss://offchain.pub",
    "wss://nos.lol",
    "wss://relay.current.fyi",
    "wss://brb.io",
@@ -28,12 +27,16 @@ enum Sheets: Identifiable {
    case post
    case report(ReportTarget)
    case reply(NostrEvent)
+    case event(NostrEvent)
+    case filter

    var id: String {
        switch self {
        case .report: return "report"
        case .post: return "post"
        case .reply(let ev): return "reply-" + ev.id
+        case .event(let ev): return "event-" + ev.id
+        case .filter: return "filter"
        }
    }
 }
@@ -138,6 +141,36 @@ struct ContentView: View {
        }
    }
    
+    func popToRoot() {
+        profile_open = false
+        thread_open = false
+        search_open = false
+        isSideBarOpened = false
+    }
+
+    var timelineNavItem: some View {
+        VStack {
+            switch selected_timeline {
+            case .home:
+                Image("damus-home")
+                .resizable()
+                .frame(width:30,height:30)
+                .shadow(color: Color("DamusPurple"), radius: 2)
+            case .dms:
+                Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
+                    .bold()
+            case .notifications:
+                Text("Notifications", comment: "Toolbar label for Notifications view.")
+                    .bold()
+            case .search:
+                Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
+                    .bold()
+            case .none:
+                Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
+            }
+        }
+    }
+    
    func MainContent(damus: DamusState) -> some View {
        VStack {
            NavigationLink(destination: MaybeProfileView, isActive: $profile_open) {
@@ -157,9 +190,10 @@ struct ContentView: View {
                PostingTimelineView
                
            case .notifications:
-                TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
-                    .navigationTitle(NSLocalizedString("Notifications", comment: "Navigation title for notifications."))
-                
+                VStack(spacing: 0) {
+                    Divider()
+                    TimelineView(events: $home.notifications, loading: $home.loading, damus: damus, show_friend_icon: true, filter: { _ in true })
+                }
            case .dms:
                DirectMessagesView(damus_state: damus_state!)
                    .environmentObject(home.dms)
@@ -171,24 +205,9 @@ struct ContentView: View {
        .navigationBarTitle(selected_timeline == .home ?  NSLocalizedString("Home", comment: "Navigation bar title for Home view where posts and replies appear from those who the user is following.") : NSLocalizedString("Global", comment: "Navigation bar title for Global view where posts from all connected relay servers appear."), displayMode: .inline)
        .toolbar {
            ToolbarItem(placement: .principal) {
-                switch selected_timeline {
-                case .home:
-                    Image("damus-home")
-                    .resizable()
-                    .frame(width:30,height:30)
-                    .shadow(color: Color("DamusPurple"), radius: 2)
-                case .dms:
-                    Text("DMs", comment: "Toolbar label for DMs view, where DM is the English abbreviation for Direct Message.")
-                        .bold()
-                case .notifications:
-                    Text("Notifications", comment: "Toolbar label for Notifications view.")
-                        .bold()
-                case .search:
-                    Text("Global", comment: "Toolbar label for Global view where posts from all connected relay servers appear.")
-                        .bold()
-                case .none:
-                    Text("", comment: "Toolbar label for unknown views. This label would be displayed only if a new timeline view is added but a toolbar label was not explicitly assigned to it yet.")
-                }
+                timelineNavItem
+                    .opacity(isSideBarOpened ? 0 : 1)
+                    .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
            }
        }
        .ignoresSafeArea(.keyboard)
@@ -197,7 +216,7 @@ struct ContentView: View {
    var MaybeSearchView: some View {
        Group {
            if let search = self.active_search {
-                SearchView(appstate: damus_state!, search: SearchModel(pool: damus_state!.pool, search: search))
+                SearchView(appstate: damus_state!, search: SearchModel(contacts: damus_state!.contacts, pool: damus_state!.pool, search: search))
            } else {
                EmptyView()
            }
@@ -245,15 +264,18 @@ struct ContentView: View {
            if let damus = self.damus_state {
                NavigationView {
                    ZStack {
-                        VStack {
+                        TabView { // Prevents navbar appearance change on scroll
                            MainContent(damus: damus)
                                .toolbar() {
                                    ToolbarItem(placement: .navigationBarLeading) {
                                        Button {
                                            isSideBarOpened.toggle()
                                        } label: {
-                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles, contacts: damus_state!.contacts)
+                                            ProfilePicView(pubkey: damus_state!.pubkey, size: 32, highlight: .none, profiles: damus_state!.profiles)
+                                                .opacity(isSideBarOpened ? 0 : 1)
+                                                .animation(isSideBarOpened ? .none : .default, value: isSideBarOpened)
                                        }
+                                        .disabled(isSideBarOpened)
                                    }
                                    
                                    ToolbarItem(placement: .navigationBarTrailing) {
@@ -265,19 +287,28 @@ struct ContentView: View {
                                                        .foregroundColor(.gray)
                                                }
                                            }
-
+                                            
+                                            // maybe expand this to other timelines in the future
+                                            if selected_timeline == .search {
+                                                Button(action: {
+                                                    //isFilterVisible.toggle()
+                                                    self.active_sheet = .filter
+                                                }) {
+                                                    // checklist, checklist.checked, lisdt.bullet, list.bullet.circle, line.3.horizontal.decrease...,  line.3.horizontail.decrease
+                                                    Label("Filter", systemImage: "line.3.horizontal.decrease")
+                                                        .foregroundColor(.gray)
+                                                        //.contentShape(Rectangle())
+                                                }
+                                            }
                                        }
                                    }
                                }
-
                        }
-                        
-                        Color.clear
-                        .overlay(
-                            SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened)
-                        )
+                        .tabViewStyle(.page(indexDisplayMode: .never))
                    }
-                    .navigationBarHidden(isSideBarOpened ? true: false) // Would prefer a different way of doing this.
+                    .overlay(
+                        SideMenuView(damus_state: damus, isSidebarVisible: $isSideBarOpened.animation())
+                    )
                }
                .navigationViewStyle(.stack)
            
@@ -287,7 +318,6 @@ struct ContentView: View {
        }
        .onAppear() {
            self.connect()
-            //KingfisherManager.shared.cache.clearDiskCache()
            setup_notifications()
        }
        .sheet(item: $active_sheet) { item in
@@ -298,6 +328,17 @@ struct ContentView: View {
                PostView(replying_to: nil, references: [], damus_state: damus_state!)
            case .reply(let event):
                ReplyView(replying_to: event, damus: damus_state!)
+            case .event(let event):
+                EventDetailView()
+            case .filter:
+                let timeline = selected_timeline ?? .home
+                if #available(iOS 16.0, *) {
+                    RelayFilterView(state: damus_state!, timeline: timeline)
+                        .presentationDetents([.height(550)])
+                        .presentationDragIndicator(.visible)
+                } else {
+                    RelayFilterView(state: damus_state!, timeline: timeline)
+                }
            }
        }
        .onOpenURL { url in
@@ -416,6 +457,8 @@ struct ContentView: View {
            let post_res = obj.object as! NostrPostResult
            switch post_res {
            case .post(let post):
+                //let post = tup.0
+                //let to_relays = tup.1
                print("post \(post.content)")
                let new_ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
                self.damus_state?.pool.send(.event(new_ev))
@@ -520,6 +563,7 @@ struct ContentView: View {
    }
    
    func switch_timeline(_ timeline: Timeline) {
+        self.popToRoot()
        NotificationCenter.default.post(name: .switched_timeline, object: timeline)
        
        if timeline == self.selected_timeline {
@@ -545,24 +589,33 @@ struct ContentView: View {

    func connect() {
        let pool = RelayPool()
+        let metadatas = RelayMetadatas()
+        let relay_filters = RelayFilters(our_pubkey: pubkey)
        
+        let new_relay_filters = load_relay_filters(pubkey) == nil
        for relay in BOOTSTRAP_RELAYS {
-            add_relay(pool, relay)
+            if let url = URL(string: relay) {
+                add_new_relay(relay_filters: relay_filters, metadatas: metadatas, pool: pool, url: url, info: .rw, new_relay_filters: new_relay_filters)
+            }
        }
        
        pool.register_handler(sub_id: sub_id, handler: home.handle_event)

-        self.damus_state = DamusState(pool: pool, keypair: keypair,
-                                likes: EventCounter(our_pubkey: pubkey),
-                                boosts: EventCounter(our_pubkey: pubkey),
-                                contacts: Contacts(our_pubkey: pubkey),
-                                tips: TipCounter(our_pubkey: pubkey),
-                                profiles: Profiles(),
-                                dms: home.dms,
-                                previews: PreviewCache(),
-                                zaps: Zaps(our_pubkey: pubkey),
-                                lnurls: LNUrls(),
-                                settings: UserSettingsStore()
+        self.damus_state = DamusState(pool: pool,
+                                      keypair: keypair,
+                                      likes: EventCounter(our_pubkey: pubkey),
+                                      boosts: EventCounter(our_pubkey: pubkey),
+                                      contacts: Contacts(our_pubkey: pubkey),
+                                      tips: TipCounter(our_pubkey: pubkey),
+                                      profiles: Profiles(),
+                                      dms: home.dms,
+                                      previews: PreviewCache(),
+                                      zaps: Zaps(our_pubkey: pubkey),
+                                      lnurls: LNUrls(),
+                                      settings: UserSettingsStore(),
+                                      relay_filters: relay_filters,
+                                      relay_metadata: metadatas,
+                                      drafts: Drafts()
        )
        home.damus_state = self.damus_state!
        
@@ -31,6 +31,17 @@ class ActionBarModel: ObservableObject {
        self.our_zap = our_zap
    }
    
+    func update(damus: DamusState, evid: String) {
+        self.likes = damus.likes.counts[evid] ?? 0
+        self.boosts = damus.boosts.counts[evid] ?? 0
+        self.zaps = damus.zaps.event_counts[evid] ?? 0
+        self.zap_total = damus.zaps.event_totals[evid] ?? 0
+        self.our_like = damus.likes.our_events[evid]
+        self.our_boost = damus.boosts.our_events[evid]
+        self.our_zap = damus.zaps.our_zaps[evid]?.first
+        self.objectWillChange.send()
+    }
+    
    var is_empty: Bool {
        return likes == 0 && boosts == 0 && zaps == 0
    }
@@ -21,6 +21,9 @@ struct DamusState {
    let zaps: Zaps
    let lnurls: LNUrls
    let settings: UserSettingsStore
+    let relay_filters: RelayFilters
+    let relay_metadata: RelayMetadatas
+    let drafts: Drafts
    
    var pubkey: String {
        return keypair.pubkey
@@ -32,6 +35,6 @@ struct DamusState {

    
    static var empty: DamusState {
-        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore())
+        return DamusState.init(pool: RelayPool(), keypair: Keypair(pubkey: "", privkey: ""), likes: EventCounter(our_pubkey: ""), boosts: EventCounter(our_pubkey: ""), contacts: Contacts(our_pubkey: ""), tips: TipCounter(our_pubkey: ""), profiles: Profiles(), dms: DirectMessagesModel(our_pubkey: ""), previews: PreviewCache(), zaps: Zaps(our_pubkey: ""), lnurls: LNUrls(), settings: UserSettingsStore(), relay_filters: RelayFilters(our_pubkey: ""), relay_metadata: RelayMetadatas(), drafts: Drafts())
    }
 }
@@ -0,0 +1,35 @@
+//
+//  DeepLPlan.swift
+//  damus
+//
+//  Created by Terry Yiu on 2/3/23.
+//
+
+import Foundation
+
+enum DeepLPlan: String, CaseIterable, Identifiable {
+    var id: String { self.rawValue }
+
+    struct Model: Identifiable, Hashable {
+        var id: String { self.tag }
+        var tag: String
+        var displayName: String
+        var url: String
+    }
+
+    case free
+    case pro
+
+    var model: Model {
+        switch self {
+        case .free:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("Free", comment: "Dropdown option for selecting Free plan for DeepL translation service."), url: "https://api-free.deepl.com")
+        case .pro:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("Pro", comment: "Dropdown option for selecting Pro plan for DeepL translation service."), url: "https://api.deepl.com")
+        }
+    }
+
+    static var allModels: [Model] {
+        return Self.allCases.map { $0.model }
+    }
+}
@@ -13,6 +13,8 @@ class DirectMessageModel: ObservableObject {
            is_request = determine_is_request()
        }
    }
+
+    @Published var draft: String
    
    var is_request: Bool
    var our_pubkey: String
@@ -31,11 +33,13 @@ class DirectMessageModel: ObservableObject {
        self.events = events
        self.is_request = false
        self.our_pubkey = our_pubkey
+        self.draft = ""
    }
    
    init(our_pubkey: String) {
        self.events = []
        self.is_request = false
        self.our_pubkey = our_pubkey
+        self.draft = ""
    }
 }
@@ -0,0 +1,13 @@
+//
+//  DraftsModel.swift
+//  damus
+//
+//  Created by Terry Yiu on 2/12/23.
+//
+
+import Foundation
+
+class Drafts: ObservableObject {
+    @Published var post: String = ""
+    @Published var replies: [NostrEvent: String] = [:]
+}
@@ -51,11 +51,7 @@ class FollowersModel: ObservableObject {
        if has_contact.contains(ev.pubkey) {
            return
        }
-        process_contact_event(
-            pool: damus_state.pool,
-            contacts: damus_state.contacts,
-            pubkey: damus_state.pubkey, ev: ev
-        )
+        process_contact_event(state: damus_state, ev: ev)
        contacts?.append(ev.pubkey)
        has_contact.insert(ev.pubkey)
    }
@@ -117,13 +117,17 @@ class HomeModel: ObservableObject {
        }
    }
    
-    func handle_zap_event_with_zapper(_ ev: NostrEvent, zapper: String) {
+    func handle_zap_event_with_zapper(_ ev: NostrEvent, our_pubkey: String, zapper: String) {
        guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
            return
        }
        
        damus_state.zaps.add_zap(zap: zap)
        
+        guard zap.target.pubkey == our_pubkey else {
+            return
+        }
+        
        if !insert_uniq_sorted_event(events: &notifications, new_ev: ev, cmp: { $0.created_at > $1.created_at }) {
            return
        }
@@ -138,16 +142,12 @@ class HomeModel: ObservableObject {
            return
        }
        
-        guard ptag == damus_state.pubkey else {
+        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: ptag) {
+            handle_zap_event_with_zapper(ev, our_pubkey: damus_state.pubkey, zapper: local_zapper)
            return
        }
        
-        if let local_zapper = damus_state.profiles.lookup_zapper(pubkey: damus_state.pubkey) {
-            handle_zap_event_with_zapper(ev, zapper: local_zapper)
-            return
-        }
-        
-        guard let profile = damus_state.profiles.lookup(id: damus_state.pubkey) else {
+        guard let profile = damus_state.profiles.lookup(id: ptag) else {
            return
        }
        
@@ -161,7 +161,8 @@ class HomeModel: ObservableObject {
            }
            
            DispatchQueue.main.async {
-                self.handle_zap_event_with_zapper(ev, zapper: zapper)
+                self.damus_state.profiles.zappers[ptag] = zapper
+                self.handle_zap_event_with_zapper(ev, our_pubkey: self.damus_state.pubkey, zapper: zapper)
            }
        }
        
@@ -193,7 +194,7 @@ class HomeModel: ObservableObject {
    }

    func handle_contact_event(sub_id: String, relay_id: String, ev: NostrEvent) {
-        process_contact_event(pool: damus_state.pool, contacts: damus_state.contacts, pubkey: damus_state.pubkey, ev: ev)
+        process_contact_event(state: self.damus_state, ev: ev)

        if sub_id == init_subid {
            pool.send(.unsubscribe(init_subid), to: [relay_id])
@@ -464,7 +465,7 @@ class HomeModel: ObservableObject {
    }

    func handle_text_event(sub_id: String, _ ev: NostrEvent) {
-        if should_hide_event(contacts: damus_state.contacts, ev: ev) {
+        guard should_show_event(contacts: damus_state.contacts, ev: ev) else {
            return
        }

@@ -476,7 +477,7 @@ class HomeModel: ObservableObject {
    }

    func handle_dm(_ ev: NostrEvent) {
-        if let notifs = handle_incoming_dm(prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
+        if let notifs = handle_incoming_dm(contacts: damus_state.contacts, prev_events: self.new_events, dms: self.dms, our_pubkey: self.damus_state.pubkey, ev: ev) {
            self.new_events = notifs
        }
    }
@@ -643,31 +644,31 @@ func robohash(_ pk: String) -> String {
    return "https://robohash.org/" + pk
 }

-func load_our_stuff(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
-    guard ev.pubkey == pubkey else {
+func load_our_stuff(state: DamusState, ev: NostrEvent) {
+    guard ev.pubkey == state.pubkey else {
        return
    }
    
    // only use new stuff
-    if let current_ev = contacts.event {
+    if let current_ev = state.contacts.event {
        guard ev.created_at > current_ev.created_at else {
            return
        }
    }
    
-    let m_old_ev = contacts.event
-    contacts.event = ev
+    let m_old_ev = state.contacts.event
+    state.contacts.event = ev

-    load_our_contacts(contacts: contacts, our_pubkey: pubkey, m_old_ev: m_old_ev, ev: ev)
-    load_our_relays(contacts: contacts, our_pubkey: pubkey, pool: pool, m_old_ev: m_old_ev, ev: ev)
+    load_our_contacts(contacts: state.contacts, our_pubkey: state.pubkey, m_old_ev: m_old_ev, ev: ev)
+    load_our_relays(state: state, m_old_ev: m_old_ev, ev: ev)
 }

-func process_contact_event(pool: RelayPool, contacts: Contacts, pubkey: String, ev: NostrEvent) {
-    load_our_stuff(pool: pool, contacts: contacts, pubkey: pubkey, ev: ev)
-    add_contact_if_friend(contacts: contacts, ev: ev)
+func process_contact_event(state: DamusState, ev: NostrEvent) {
+    load_our_stuff(state: state, ev: ev)
+    add_contact_if_friend(contacts: state.contacts, ev: ev)
 }

-func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_old_ev: NostrEvent?, ev: NostrEvent) {
+func load_our_relays(state: DamusState, m_old_ev: NostrEvent?, ev: NostrEvent) {
    let bootstrap_dict: [String: RelayInfo] = [:]
    let old_decoded = m_old_ev.flatMap { decode_json_relays($0.content) } ?? BOOTSTRAP_RELAYS.reduce(into: bootstrap_dict) { (d, r) in
        d[r] = .rw
@@ -691,14 +692,15 @@ func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_
    
    let diff = old.symmetricDifference(new)
    
+    let new_relay_filters = load_relay_filters(state.pubkey) == nil
    for d in diff {
        changed = true
        if new.contains(d) {
            if let url = URL(string: d) {
-                try? pool.add_relay(url, info: decoded[d] ?? .rw)
+                add_new_relay(relay_filters: state.relay_filters, metadatas: state.relay_metadata, pool: state.pool, url: url, info: decoded[d] ?? .rw, new_relay_filters: new_relay_filters)
            }
        } else {
-            pool.remove_relay(d)
+            state.pool.remove_relay(d)
        }
    }
    
@@ -707,7 +709,62 @@ func load_our_relays(contacts: Contacts, our_pubkey: String, pool: RelayPool, m_
    }
 }

-func handle_incoming_dm(prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
+func add_new_relay(relay_filters: RelayFilters, metadatas: RelayMetadatas, pool: RelayPool, url: URL, info: RelayInfo, new_relay_filters: Bool) {
+    try? pool.add_relay(url, info: info)
+    
+    let relay_id = url.absoluteString
+    guard metadatas.lookup(relay_id: relay_id) == nil else {
+        return
+    }
+    
+    Task.detached(priority: .background) {
+        guard let meta = try? await fetch_relay_metadata(relay_id: relay_id) else {
+            return
+        }
+        
+        DispatchQueue.main.async {
+            metadatas.insert(relay_id: relay_id, metadata: meta)
+            
+            // if this is the first time adding filters, we should filter non-paid relays
+            if new_relay_filters && !meta.is_paid {
+                relay_filters.insert(timeline: .search, relay_id: relay_id)
+            }
+        }
+    }
+}
+
+func fetch_relay_metadata(relay_id: String) async throws -> RelayMetadata? {
+    var urlString = relay_id.replacingOccurrences(of: "wss://", with: "https://")
+    urlString = urlString.replacingOccurrences(of: "ws://", with: "http://")
+    
+    guard let url = URL(string: urlString) else {
+        return nil
+    }
+    
+    var request = URLRequest(url: url)
+    request.setValue("application/nostr+json", forHTTPHeaderField: "Accept")
+    
+    var res: (Data, URLResponse)? = nil
+    
+    res = try await URLSession.shared.data(for: request)
+    
+    guard let data = res?.0 else {
+        return nil
+    }
+    
+    let nip11 = try JSONDecoder().decode(RelayMetadata.self, from: data)
+    return nip11
+}
+
+func process_relay_metadata() {
+}
+
+func handle_incoming_dm(contacts: Contacts, prev_events: NewEventsBits, dms: DirectMessagesModel, our_pubkey: String, ev: NostrEvent) -> NewEventsBits? {
+    // hide blocked users
+    guard should_show_event(contacts: contacts, ev: ev) else {
+        return prev_events
+    }
+    
    var inserted = false
    var found = false
    let ours = ev.pubkey == our_pubkey
@@ -781,10 +838,10 @@ func event_has_our_pubkey(_ ev: NostrEvent, our_pubkey: String) -> Bool {
 }


-func should_hide_event(contacts: Contacts, ev: NostrEvent) -> Bool {
+func should_show_event(contacts: Contacts, ev: NostrEvent) -> Bool {
    if contacts.is_muted(ev.pubkey) {
-        return true
+        return false
    }
-    return !ev.should_show_event
+    return ev.should_show_event
 }

@@ -17,7 +17,6 @@ enum LibreTranslateServer: String, CaseIterable, Identifiable {
        var url: String?
    }

-    case none
    case argosopentech
    case terraprint
    case vern
@@ -25,8 +24,6 @@ enum LibreTranslateServer: String, CaseIterable, Identifiable {

    var model: Model {
        switch self {
-        case .none:
-            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation server."), url: nil)
        case .argosopentech:
            return .init(tag: self.rawValue, displayName: "translate.argosopentech.com", url: "https://translate.argosopentech.com")
        case .terraprint:
@@ -20,6 +20,24 @@ class ProfileModel: ObservableObject, Equatable {
    var sub_id = UUID().description
    var prof_subid = UUID().description
    
+    func follows(pubkey: String) -> Bool {
+        guard let contacts = self.contacts else {
+            return false
+        }
+        
+        for tag in contacts.tags {
+            guard tag.count >= 2 && tag[0] == "p" else {
+                continue
+            }
+            
+            if tag[1] == pubkey {
+                return true
+            }
+        }
+        
+        return false
+    }
+    
    func get_follow_target() -> FollowTarget {
        if let contacts = contacts {
            return .contact(contacts)
@@ -70,7 +88,7 @@ class ProfileModel: ObservableObject, Equatable {
    }
    
    func handle_profile_contact_event(_ ev: NostrEvent) {
-        process_contact_event(pool: damus.pool, contacts: damus.contacts, pubkey: damus.pubkey, ev: ev)
+        process_contact_event(state: damus, ev: ev)
        
        // only use new stuff
        if let current_ev = self.contacts {
@@ -31,12 +31,13 @@ class SearchHomeModel: ObservableObject {
    }
    
    func filter_muted() {
-        events = events.filter { !should_hide_event(contacts: damus_state.contacts, ev: $0) }
+        events = events.filter { should_show_event(contacts: damus_state.contacts, ev: $0) }
    }
    
    func subscribe() {
        loading = true
-        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event)
+        let to_relays = determine_to_relays(pool: damus_state.pool, filters: damus_state.relay_filters)
+        damus_state.pool.subscribe(sub_id: base_subid, filters: [get_base_filter()], handler: handle_event, to: to_relays)
    }

    func unsubscribe(to: String? = nil) {
@@ -54,7 +55,7 @@ class SearchHomeModel: ObservableObject {
            guard sub_id == self.base_subid || sub_id == self.profiles_subid else {
                return
            }
-            if ev.is_textlike && !should_hide_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
+            if ev.is_textlike && should_show_event(contacts: damus_state.contacts, ev: ev) && !ev.is_reply(nil) {
                if seen_pubkey.contains(ev.pubkey) {
                    return
                }
@@ -15,14 +15,20 @@ class SearchModel: ObservableObject {
    
    let pool: RelayPool
    var search: NostrFilter
+    let contacts: Contacts
    let sub_id = UUID().description
    let limit: UInt32 = 500
    
-    init(pool: RelayPool, search: NostrFilter) {
+    init(contacts: Contacts, pool: RelayPool, search: NostrFilter) {
+        self.contacts = contacts
        self.pool = pool
        self.search = search
    }
    
+    func filter_muted()  {
+        self.events = self.events.filter { should_show_event(contacts: contacts, ev: $0) }
+    }
+    
    func subscribe() {
        // since 1 month
        search.limit = self.limit
@@ -47,6 +53,10 @@ class SearchModel: ObservableObject {
            return
        }
        
+        guard should_show_event(contacts: contacts, ev: ev) else {
+            return
+        }
+        
        if insert_uniq_sorted_event(events: &self.events, new_ev: ev, cmp: { $0.created_at > $1.created_at } ) {
            objectWillChange.send()
        }
@@ -88,6 +98,21 @@ func event_matches_hashtag(_ ev: NostrEvent, hashtags: [String]) -> Bool {
    return false
 }

+func tag_is_hashtag(_ tag: [String]) -> Bool {
+    // "hashtag" is deprecated, will remove in the future
+    return tag.count >= 2 && (tag[0] == "hashtag" || tag[0] == "t")
+}
+
+func has_hashtag(_ tags: [[String]], hashtag: String) -> Bool {
+    for tag in tags {
+        if tag_is_hashtag(tag) && tag[1] == hashtag {
+            return true
+        }
+    }
+    
+    return false
+}
+
 func event_matches_filter(_ ev: NostrEvent, filter: NostrFilter) -> Bool {
    if let hashtags = filter.hashtag {
        return event_matches_hashtag(ev, hashtags: hashtags)
@@ -0,0 +1,37 @@
+//
+//  TranslationService.swift
+//  damus
+//
+//  Created by Terry Yiu on 2/3/23.
+//
+
+import Foundation
+
+enum TranslationService: String, CaseIterable, Identifiable {
+    var id: String { self.rawValue }
+
+    struct Model: Identifiable, Hashable {
+        var id: String { self.tag }
+        var tag: String
+        var displayName: String
+    }
+
+    case none
+    case libretranslate
+    case deepl
+
+    var model: Model {
+        switch self {
+        case .none:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("None", comment: "Dropdown option for selecting no translation service."))
+        case .libretranslate:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("LibreTranslate (Open Source)", comment: "Dropdown option for selecting LibreTranslate as the translation service."))
+        case .deepl:
+            return .init(tag: self.rawValue, displayName: NSLocalizedString("DeepL (Proprietary, Higher Accuracy)", comment: "Dropdown option for selecting DeepL as the translation service."))
+        }
+    }
+
+    static var allModels: [Model] {
+        return Self.allCases.map { $0.model }
+    }
+}
@@ -12,6 +12,29 @@ func should_show_wallet_selector(_ pubkey: String) -> Bool {
    return UserDefaults.standard.object(forKey: "show_wallet_selector") as? Bool ?? true
 }

+func pk_setting_key(_ pubkey: String, key: String) -> String {
+    return "\(pubkey)_\(key)"
+}
+
+func default_zap_setting_key(pubkey: String) -> String {
+    return pk_setting_key(pubkey, key: "default_zap_amount")
+}
+
+func set_default_zap_amount(pubkey: String, amount: Int) {
+    let key = default_zap_setting_key(pubkey: pubkey)
+    UserDefaults.standard.setValue(amount, forKey: key)
+}
+
+func get_default_zap_amount(pubkey: String) -> Int? {
+    let key = default_zap_setting_key(pubkey: pubkey)
+    let amt = UserDefaults.standard.integer(forKey: key)
+    if amt == 0 {
+        return nil
+    }
+    return amt
+}
+
+
 func get_default_wallet(_ pubkey: String) -> Wallet {
    if let defaultWalletName = UserDefaults.standard.string(forKey: "default_wallet"),
       let default_wallet = Wallet(rawValue: defaultWalletName)
@@ -22,7 +45,23 @@ func get_default_wallet(_ pubkey: String) -> Wallet {
    }
 }

-func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
+private func get_translation_service(_ pubkey: String) -> TranslationService? {
+    guard let translation_service = UserDefaults.standard.string(forKey: "translation_service") else {
+        return nil
+    }
+
+    return TranslationService(rawValue: translation_service)
+}
+
+private func get_deepl_plan(_ pubkey: String) -> DeepLPlan? {
+    guard let server_name = UserDefaults.standard.string(forKey: "deepl_plan") else {
+        return nil
+    }
+
+    return DeepLPlan(rawValue: server_name)
+}
+
+private func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
    guard let server_name = UserDefaults.standard.string(forKey: "libretranslate_server") else {
        return nil
    }
@@ -30,7 +69,7 @@ func get_libretranslate_server(_ pubkey: String) -> LibreTranslateServer? {
    return LibreTranslateServer(rawValue: server_name)
 }

-func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
+private func get_libretranslate_url(_ pubkey: String, server: LibreTranslateServer) -> String? {
    if let url = server.model.url {
        return url
    }
@@ -57,6 +96,32 @@ class UserSettingsStore: ObservableObject {
        }
    }

+    @Published var translation_service: TranslationService {
+        didSet {
+            UserDefaults.standard.set(translation_service.rawValue, forKey: "translation_service")
+        }
+    }
+
+    @Published var deepl_plan: DeepLPlan {
+        didSet {
+            UserDefaults.standard.set(deepl_plan.rawValue, forKey: "deepl_plan")
+        }
+    }
+
+    @Published var deepl_api_key: String {
+        didSet {
+            do {
+                if deepl_api_key == "" {
+                    try clearDeepLApiKey()
+                } else {
+                    try saveDeepLApiKey(deepl_api_key)
+                }
+            } catch {
+                // No-op.
+            }
+        }
+    }
+
    @Published var libretranslate_server: LibreTranslateServer {
        didSet {
            if oldValue == libretranslate_server {
@@ -67,7 +132,7 @@ class UserSettingsStore: ObservableObject {

            libretranslate_api_key = ""

-            if libretranslate_server == .custom || libretranslate_server == .none {
+            if libretranslate_server == .custom {
                libretranslate_url = ""
            } else {
                libretranslate_url = libretranslate_server.model.url!
@@ -102,18 +167,25 @@ class UserSettingsStore: ObservableObject {
        show_wallet_selector = should_show_wallet_selector(pubkey)

        left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
-        
-        if let server = get_libretranslate_server(pubkey) {
-            self.libretranslate_server = server
-            self.libretranslate_url = get_libretranslate_url(pubkey, server: server) ?? ""
+
+        // Note from @tyiu:
+        // Default translation service is disabled by default for now until we gain some confidence that it is working well in production.
+        // Instead of throwing all Damus users onto feature immediately, allow for discovery of feature organically.
+        // Also, we are connecting to servers listed as mirrors on the official LibreTranslate GitHub README that do not require API keys.
+        // However, we have not asked them for permission to use, so we're trying to be good neighbors for now.
+        // Opportunity: spin up dedicated trusted LibreTranslate server that requires an API key for any access (or higher rate limit access).
+        if let translation_service = get_translation_service(pubkey) {
+            self.translation_service = translation_service
        } else {
-            // Note from @tyiu:
-            // Default server is disabled by default for now until we gain some confidence that it is working well in production.
-            // Instead of throwing all Damus users onto feature immediately, allow for discovery of feature organically.
-            // Also, we are connecting to servers listed as mirrors on the official LibreTranslate GitHub README that do not require API keys.
-            // However, we have not asked them for permission to use, so we're trying to be good neighbors for now.
-            // Opportunity: spin up dedicated trusted LibreTranslate server that requires an API key for any access (or higher rate limit access).
-            libretranslate_server = .none
+            self.translation_service = .none
+        }
+
+        if let libretranslate_server = get_libretranslate_server(pubkey) {
+            self.libretranslate_server = libretranslate_server
+            self.libretranslate_url = get_libretranslate_url(pubkey, server: libretranslate_server) ?? ""
+        } else {
+            // Choose a random server to distribute load.
+            libretranslate_server = .allCases.filter { $0 != .custom }.randomElement()!
            libretranslate_url = ""
        }
            
@@ -122,15 +194,46 @@ class UserSettingsStore: ObservableObject {
        } catch {
            libretranslate_api_key = ""
        }
+
+        if let deepl_plan = get_deepl_plan(pubkey) {
+            self.deepl_plan = deepl_plan
+        } else {
+            self.deepl_plan = .free
+        }
+
+        do {
+            deepl_api_key = try Vault.getPrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
+        } catch {
+            deepl_api_key = ""
+        }
    }

-    func saveLibreTranslateApiKey(_ apiKey: String) throws {
+    private func saveLibreTranslateApiKey(_ apiKey: String) throws {
        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }

-    func clearLibreTranslateApiKey() throws {
+    private func clearLibreTranslateApiKey() throws {
        try Vault.deletePrivateKey(keychainConfiguration: DamusLibreTranslateKeychainConfiguration())
    }
+
+    private func saveDeepLApiKey(_ apiKey: String) throws {
+        try Vault.savePrivateKey(apiKey, keychainConfiguration: DamusDeepLKeychainConfiguration())
+    }
+
+    private func clearDeepLApiKey() throws {
+        try Vault.deletePrivateKey(keychainConfiguration: DamusDeepLKeychainConfiguration())
+    }
+
+    func can_translate(_ pubkey: String) -> Bool {
+        switch translation_service {
+        case .none:
+            return false
+        case .libretranslate:
+            return URLComponents(string: libretranslate_url) != nil
+        case .deepl:
+            return deepl_api_key != ""
+        }
+    }
 }

 struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
@@ -138,3 +241,9 @@ struct DamusLibreTranslateKeychainConfiguration: KeychainConfiguration {
    var accessGroup: String? = nil
    var accountName = "libretranslate_apikey"
 }
+
+struct DamusDeepLKeychainConfiguration: KeychainConfiguration {
+    var serviceName = "damus"
+    var accessGroup: String? = nil
+    var accountName = "deepl_apikey"
+}
@@ -0,0 +1,77 @@
+//
+//  ZapsModel.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import Foundation
+
+class ZapsModel: ObservableObject {
+    let state: DamusState
+    let target: ZapTarget
+    var zaps: [Zap]
+    
+    let zaps_subid = UUID().description
+    
+    init(state: DamusState, target: ZapTarget) {
+        self.state = state
+        self.target = target
+        self.zaps = []
+    }
+    
+    func subscribe() {
+        var filter = NostrFilter.filter_kinds([9735])
+        switch target {
+        case .profile(let profile_id):
+            filter.pubkeys = [profile_id]
+        case .note(let note_target):
+            filter.referenced_ids = [note_target.note_id]
+        }
+        state.pool.subscribe(sub_id: zaps_subid, filters: [filter], handler: handle_event)
+    }
+    
+    func unsubscribe() {
+        state.pool.unsubscribe(sub_id: zaps_subid)
+    }
+    
+    func handle_event(relay_id: String, conn_ev: NostrConnectionEvent) {
+        guard case .nostr_event(let resp) = conn_ev else {
+            return
+        }
+        
+        guard resp.subid == zaps_subid else {
+            return
+        }
+        
+        guard case .event(_, let ev) = resp else {
+            return
+        }
+        
+        guard ev.kind == 9735 else {
+            return
+        }
+        
+        if let zap = state.zaps.zaps[ev.id] {
+            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
+                objectWillChange.send()
+            }
+        } else {
+            guard let zapper = state.profiles.lookup_zapper(pubkey: target.pubkey) else {
+                return
+            }
+            
+            guard let zap = Zap.from_zap_event(zap_ev: ev, zapper: zapper) else {
+                return
+            }
+            
+            state.zaps.add_zap(zap: zap)
+            
+            if insert_uniq_sorted_zap(zaps: &zaps, new_zap: zap) {
+                objectWillChange.send()
+            }
+        }
+        
+        
+    }
+}
@@ -102,7 +102,7 @@ struct Profile: Codable {
    }
    
    var lnurl: String? {
-        guard let addr = lud06 ?? lud16 else {
+        guard let addr = lud16 ?? lud06 else {
            return nil;
        }
        
@@ -370,6 +370,7 @@ func decode_nostr_event(txt: String) -> NostrResponse? {

 func encode_json<T: Encodable>(_ val: T) -> String? {
    let encoder = JSONEncoder()
+    encoder.outputFormatting = .withoutEscapingSlashes
    return (try? encoder.encode(val)).map { String(decoding: $0, as: UTF8.self) }
 }

@@ -24,6 +24,30 @@ enum RelayFlags: Int {
    case broken = 1
 }

+struct Limitations: Codable {
+    let payment_required: Bool?
+    
+    static var empty: Limitations {
+        Limitations(payment_required: nil)
+    }
+}
+
+struct RelayMetadata: Codable {
+    let name: String?
+    let description: String?
+    let pubkey: String?
+    let contact: String?
+    let supported_nips: [Int]?
+    let software: String?
+    let version: String?
+    let limitation: Limitations?
+    let payments_url: String?
+    
+    var is_paid: Bool {
+        return limitation?.payment_required ?? false
+    }
+}
+
 class Relay: Identifiable {
    let descriptor: RelayDescriptor
    let connection: RelayConnection
@@ -118,10 +118,9 @@ func make_nostr_req(_ req: NostrRequest) -> String? {
 }

 func make_nostr_push_event(ev: NostrEvent) -> String? {
-    let encoder = JSONEncoder()
-    encoder.outputFormatting = .withoutEscapingSlashes
-    let event_data = try! encoder.encode(ev)
-    let event = String(decoding: event_data, as: UTF8.self)
+    guard let event = encode_json(ev) else {
+        return nil
+    }
    let encoded = "[\"EVENT\",\(event)]"
    print(encoded)
    return encoded
@@ -42,6 +42,8 @@ class RelayPool {
    var relays: [Relay] = []
    var handlers: [RelayHandler] = []
    var request_queue: [QueuedRequest] = []
+    var seen: Set<String> = Set()
+    var counts: [String: UInt64] = [:]

    var descriptors: [RelayDescriptor] {
        relays.map { $0.descriptor }
@@ -149,9 +151,9 @@ class RelayPool {
        self.send(.unsubscribe(sub_id), to: to)
    }
    
-    func subscribe(sub_id: String, filters: [NostrFilter], handler: @escaping (String, NostrConnectionEvent) -> ()) {
+    func subscribe(sub_id: String, filters: [NostrFilter], handler: @escaping (String, NostrConnectionEvent) -> (), to: [String]? = nil) {
        register_handler(sub_id: sub_id, handler: handler)
-        send(.subscribe(.init(filters: filters, sub_id: sub_id)))
+        send(.subscribe(.init(filters: filters, sub_id: sub_id)), to: to)
    }
    
    func subscribe_to(sub_id: String, filters: [NostrFilter], to: [String]?, handler: @escaping (String, NostrConnectionEvent) -> ()) {
@@ -241,8 +243,25 @@ class RelayPool {
        }
    }
    
+    func record_seen(relay_id: String, event: NostrConnectionEvent) {
+        if case .nostr_event(let ev) = event {
+            if case .event(_, let nev) = ev {
+                let k = relay_id + nev.id
+                if !seen.contains(k) {
+                    seen.insert(k)
+                    if counts[relay_id] == nil {
+                        counts[relay_id] = 1
+                    } else {
+                        counts[relay_id] = (counts[relay_id] ?? 0) + 1
+                    }
+                }
+            }
+        }
+    }
+    
    func handle_event(relay_id: String, event: NostrConnectionEvent) {
        record_last_pong(relay_id: relay_id, event: event)
+        record_seen(relay_id: relay_id, event: event)
        
        // run req queue when we reconnect
        if case .ws_event(let ws) = event {
@@ -147,7 +147,7 @@ public func bech32_decode(_ str: String) throws -> (hrp: String, data: Data)? {
    guard let strBytes = str.data(using: .utf8) else {
        throw Bech32Error.nonUTF8String
    }
-    guard strBytes.count <= 90 else {
+    guard strBytes.count <= 2024 else {
        throw Bech32Error.stringLengthExceeded
    }
    var lower: Bool = false
@@ -29,7 +29,7 @@ public struct DismissKeyboardOnTap: ViewModifier {

 }

-func end_editing() {
+public func end_editing() {
    UIApplication.shared.connectedScenes
      .filter {$0.activationState == .foregroundActive}
      .map {$0 as? UIWindowScene}
@@ -158,6 +158,20 @@ func get_saved_privkey() -> String? {
    return mkey.map { $0.trimmingCharacters(in: .whitespaces) }
 }

+/**
+ Detects whether a string might contain an nsec1 prefixed private key.
+ It does not determine if it's the current user's private key and does not verify if it is properly encoded or has the right length.
+ */
+func contentContainsPrivateKey(_ content: String) -> Bool {
+    if #available(iOS 16.0, *) {
+        return content.contains(/nsec1[02-9ac-z]+/)
+    } else {
+        let regex = try! NSRegularExpression(pattern: "nsec1[02-9ac-z]+")
+        return (regex.firstMatch(in: content, range: NSRange(location: 0, length: content.count)) != nil)
+    }
+
+}
+
 fileprivate func removePrivateKeyFromUserDefaults() throws {
    guard let privKey = UserDefaults.standard.string(forKey: "privkey") else { return }
    try save_privkey(privkey: privKey)
@@ -0,0 +1,26 @@
+//
+//  NIPURLBuilder.swift
+//  damus
+//
+//  Created by Honk on 2/1/23.
+//
+
+import Foundation
+
+struct NIPURLBuilder {
+    static private let baseURL = "https://github.com/nostr-protocol/nips/blob/master/"
+    static func url(forNIP nip: Int) -> URL? {
+        let urlString = baseURL + "\(formatNipNumber(nip: nip)).md"
+        return URL(string: urlString)
+    }
+    
+    static func formatNipNumber(nip: Int) -> String {
+        let formatted: String
+        if nip < 10 {
+            formatted = "0\(nip)"
+        } else {
+            formatted = "\(nip)"
+        }
+        return formatted
+    }
+}
@@ -98,6 +98,9 @@ extension Notification.Name {
    static var deleted_account: Notification.Name {
        return Notification.Name("deleted_account")
    }
+    static var new_zap: Notification.Name {
+        return Notification.Name("new_zap")
+    }
 }

 func handle_notify(_ name: Notification.Name) -> NotificationCenter.Publisher {
@@ -0,0 +1,94 @@
+//
+//  RelayFilters.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-08.
+//
+
+import Foundation
+
+struct RelayFilter: Hashable {
+    let timeline: Timeline
+    let relay_id: String
+    
+    init(timeline: Timeline, relay_id: String, on: Bool = false) {
+        self.timeline = timeline
+        self.relay_id = relay_id
+    }
+}
+
+class RelayFilters {
+    private let our_pubkey: String
+    private var disabled: Set<RelayFilter>
+    
+    func is_filtered(timeline: Timeline, relay_id: String) -> Bool {
+        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
+        let contains = disabled.contains(filter)
+        return contains
+    }
+    
+    func remove(timeline: Timeline, relay_id: String) {
+        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
+        if !disabled.contains(filter) {
+            return
+        }
+        
+        disabled.remove(filter)
+        save_relay_filters(our_pubkey, filters: disabled)
+    }
+    
+    func insert(timeline: Timeline, relay_id: String) {
+        let filter = RelayFilter(timeline: timeline, relay_id: relay_id)
+        if disabled.contains(filter) {
+            return
+        }
+        
+        disabled.insert(filter)
+        save_relay_filters(our_pubkey, filters: disabled)
+    }
+    
+    init(our_pubkey: String) {
+        self.our_pubkey = our_pubkey
+        disabled = load_relay_filters(our_pubkey) ?? Set()
+    }
+}
+
+func save_relay_filters(_ pubkey: String, filters: Set<RelayFilter>) {
+    let key = pk_setting_key(pubkey, key: "relay_filters")
+    let arr = Array(filters.map { filter in "\(filter.timeline)\t\(filter.relay_id)" })
+    UserDefaults.standard.set(arr, forKey: key)
+}
+
+func relay_filter_setting_key(_ pubkey: String) -> String {
+    return pk_setting_key(pubkey, key: "relay_filters")
+}
+
+func clear_relay_filters(_ pubkey: String) {
+    let key = relay_filter_setting_key(pubkey)
+    UserDefaults.standard.removeObject(forKey: key)
+}
+
+func load_relay_filters(_ pubkey: String) -> Set<RelayFilter>? {
+    let key = relay_filter_setting_key(pubkey)
+    guard let filters = UserDefaults.standard.stringArray(forKey: key) else {
+        return nil
+    }
+    
+    return filters.reduce(into: Set()) { s, str in
+        let parts = str.components(separatedBy: "\t")
+        guard parts.count == 2 else {
+            return
+        }
+        guard let timeline = Timeline.init(rawValue: parts[0]) else {
+            return
+        }
+        let filter = RelayFilter(timeline: timeline, relay_id: parts[1])
+        s.insert(filter)
+    }
+}
+
+func determine_to_relays(pool: RelayPool, filters: RelayFilters) -> [String] {
+    return pool.descriptors
+        .map { $0.url.absoluteString }
+        .filter { !filters.is_filtered(timeline: .search, relay_id: $0) }
+}
@@ -0,0 +1,20 @@
+//
+//  RelayMetadatas.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-09.
+//
+
+import Foundation
+
+class RelayMetadatas {
+    private var metadata: [String: RelayMetadata] = [:]
+    
+    func lookup(relay_id: String) -> RelayMetadata? {
+        return metadata[relay_id]
+    }
+    
+    func insert(relay_id: String, metadata: RelayMetadata) {
+        self.metadata[relay_id] = metadata
+    }
+}
@@ -0,0 +1,127 @@
+//
+//  Translator.swift
+//  damus
+//
+//  Created by Terry Yiu on 2/4/23.
+//
+
+import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
+public struct Translator {
+    private let userSettingsStore: UserSettingsStore
+    private let session = URLSession.shared
+    private let encoder = JSONEncoder()
+    private let decoder = JSONDecoder()
+
+    init(_ userSettingsStore: UserSettingsStore) {
+        self.userSettingsStore = userSettingsStore
+    }
+
+    public func translate(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
+        switch userSettingsStore.translation_service {
+        case .libretranslate:
+            return try await translateWithLibreTranslate(text, from: sourceLanguage, to: targetLanguage)
+        case .deepl:
+            return try await translateWithDeepL(text, from: sourceLanguage, to: targetLanguage)
+        case .none:
+            return text
+        }
+    }
+
+    private func translateWithLibreTranslate(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
+        let url = try makeURL(userSettingsStore.libretranslate_url, path: "/translate")
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        struct RequestBody: Encodable {
+            let q: String
+            let source: String
+            let target: String
+            let api_key: String?
+        }
+        let body = RequestBody(q: text, source: sourceLanguage, target: targetLanguage, api_key: userSettingsStore.libretranslate_api_key)
+        request.httpBody = try encoder.encode(body)
+
+        struct Response: Decodable {
+            let translatedText: String
+        }
+        let response: Response = try await decodedData(for: request)
+        return response.translatedText
+    }
+
+    private func translateWithDeepL(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String? {
+        if userSettingsStore.deepl_api_key == "" {
+            return nil
+        }
+
+        let url = try makeURL(userSettingsStore.deepl_plan.model.url, path: "/v2/translate")
+
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("DeepL-Auth-Key \(userSettingsStore.deepl_api_key)", forHTTPHeaderField: "Authorization")
+
+        struct RequestBody: Encodable {
+            let text: [String]
+            let source_lang: String
+            let target_lang: String
+        }
+        let body = RequestBody(text: [text], source_lang: sourceLanguage.uppercased(), target_lang: targetLanguage.uppercased())
+        request.httpBody = try encoder.encode(body)
+
+        struct Response: Decodable {
+            let translations: [DeepLTranslations]
+        }
+        struct DeepLTranslations: Decodable {
+            let detected_source_language: String
+            let text: String
+        }
+
+        let response: Response = try await decodedData(for: request)
+        return response.translations.map { $0.text }.joined(separator: " ")
+    }
+
+    private func makeURL(_ baseUrl: String, path: String) throws -> URL {
+        guard var components = URLComponents(string: baseUrl) else {
+            throw URLError(.badURL)
+        }
+        components.path = path
+        guard let url = components.url else {
+            throw URLError(.badURL)
+        }
+        return url
+    }
+
+    private func decodedData<Output: Decodable>(for request: URLRequest) async throws -> Output {
+        let data = try await session.data(for: request)
+        let result = try decoder.decode(Output.self, from: data)
+        return result
+    }
+}
+
+private extension URLSession {
+    func data(for request: URLRequest) async throws -> Data {
+        var task: URLSessionDataTask?
+        let onCancel = { task?.cancel() }
+        return try await withTaskCancellationHandler(
+            operation: {
+                try await withCheckedThrowingContinuation { continuation in
+                    task = dataTask(with: request) { data, _, error in
+                        guard let data = data else {
+                            let error = error ?? URLError(.badServerResponse)
+                            return continuation.resume(throwing: error)
+                        }
+                        continuation.resume(returning: data)
+                    }
+                    task?.resume()
+                }
+            },
+            onCancel: { onCancel() }
+        )
+    }
+}
@@ -285,17 +285,19 @@ func fetch_static_payreq(_ lnurl: String) async -> LNUrlPayRequest? {
    return endpoint
 }

-func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent, amount: Int64) async -> String? {
+func fetch_zap_invoice(_ payreq: LNUrlPayRequest, zapreq: NostrEvent, sats: Int) async -> String? {
    guard var base_url = payreq.callback.flatMap({ URLComponents(string: $0) }) else {
        return nil
    }
    
    let zappable = payreq.allowsNostr ?? false
+    let amount: Int64 = Int64(sats) * 1000
    
    var query = [URLQueryItem(name: "amount", value: "\(amount)")]
    
    if zappable {
        if let json = encode_json(zapreq) {
+            print("zapreq json: \(json)")
            query.append(URLQueryItem(name: "nostr", value: json))
        }
    }
@@ -60,6 +60,8 @@ class Zaps {
        event_counts[id] = event_counts[id]! + 1
        event_totals[id] = event_totals[id]! + zap.invoice.amount
        
+        notify(.new_zap, zap)
+        
        return
    }
 }
@@ -28,13 +28,14 @@ struct EventActionBar: View {
    @State var sheet: ActionBarSheet? = nil
    @State var confirm_boost: Bool = false
    @State var show_share_sheet: Bool = false
-    @StateObject var bar: ActionBarModel
    
-    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel, test_lnurl: String? = nil) {
+    @ObservedObject var bar: ActionBarModel
+    
+    init(damus_state: DamusState, event: NostrEvent, bar: ActionBarModel? = nil, test_lnurl: String? = nil) {
        self.damus_state = damus_state
        self.event = event
        self.test_lnurl = test_lnurl
-        _bar = StateObject.init(wrappedValue: bar)
+        _bar = ObservedObject(wrappedValue: bar ?? make_actionbar_model(ev: event.id, damus: damus_state))
    }
    
    var lnurl: String? {
@@ -47,6 +48,7 @@ struct EventActionBar: View {
                EventActionButton(img: "bubble.left", col: nil) {
                    notify(.reply, event)
                }
+                .accessibilityLabel(NSLocalizedString("Reply", comment: "Accessibility label for reply button"))
            }
            Spacer()
            ZStack {
@@ -58,6 +60,7 @@ struct EventActionBar: View {
                        self.confirm_boost = true
                    }
                }
+                .accessibilityLabel(NSLocalizedString("Boosts", comment: "Accessibility label for boosts button"))
                Text("\(bar.boosts > 0 ? "\(bar.boosts)" : "")")
                    .offset(x: 18)
                    .font(.footnote.weight(.medium))
@@ -89,6 +92,7 @@ struct EventActionBar: View {
            EventActionButton(img: "square.and.arrow.up", col: Color.gray) {
                show_share_sheet = true
            }
+            .accessibilityLabel(NSLocalizedString("Share", comment: "Button to share a post"))
        }
        .sheet(isPresented: $show_share_sheet) {
            if let note_id = bech32_note_id(event.id) {
@@ -107,6 +111,16 @@ struct EventActionBar: View {
        } message: {
            Text("Are you sure you want to repost this?", comment: "Alert message to ask if user wants to repost a post.")
        }
+        .onReceive(handle_notify(.new_zap)) { n in
+            let zap = n.object as! Zap
+            guard case .note(let note_target) = zap.target else {
+                return
+            }
+            guard note_target.note_id == self.event.id else {
+                return
+            }
+            self.bar.update(damus: self.damus_state, evid: self.event.id)
+        }
        .onReceive(handle_notify(.liked)) { n in
            let liked = n.object as! Counted
            if liked.id != event.id {
@@ -166,6 +180,7 @@ struct LikeButton: View {
            Image(liked ? "shaka-full" : "shaka-line")
                .foregroundColor(liked ? .accentColor : .gray)
        }
+        .accessibilityLabel(NSLocalizedString("Like", comment: "Accessibility Label for Like button"))
    }
 }

@@ -10,7 +10,17 @@ import SwiftUI
 struct EventDetailBar: View {
    let state: DamusState
    let target: String
-    @StateObject var bar: ActionBarModel
+    let target_pk: String
+    
+    @ObservedObject var bar: ActionBarModel
+    
+    init (state: DamusState, target: String, target_pk: String) {
+        self.state = state
+        self.target = target
+        self.target_pk = target_pk
+        self._bar = ObservedObject(wrappedValue: make_actionbar_model(ev: target, damus: state))
+        
+    }
    
    var body: some View {
        HStack {
@@ -29,7 +39,11 @@ struct EventDetailBar: View {
            }
            
            if bar.zaps > 0 {
-                Text("\(Text("\(bar.zaps)", comment: "Number of zap payments on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("zaps_count", comment: "Part of a larger sentence to describe how many zap payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
+                let dst = ZapsView(state: state, target: .note(id: target, author: target_pk))
+                NavigationLink(destination: dst) {
+                    Text("\(Text("\(bar.zaps)", comment: "Number of zap payments on a post.").font(.body.bold())) \(Text(String(format: NSLocalizedString("zaps_count", comment: "Part of a larger sentence to describe how many zap payments there are on a post."), bar.boosts)).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.")
+                }
+                .buttonStyle(PlainButtonStyle())
            }
        }
    }
@@ -37,6 +51,6 @@ struct EventDetailBar: View {

 struct EventDetailBar_Previews: PreviewProvider {
    static var previews: some View {
-        EventDetailBar(state: test_damus_state(), target: "", bar: ActionBarModel.empty())
+        EventDetailBar(state: test_damus_state(), target: "", target_pk: "")
    }
 }
@@ -75,7 +75,7 @@ struct ChatView: View {
        HStack {
            VStack {
                if is_active || just_started {
-                    ProfilePicView(pubkey: event.pubkey, size: 32, highlight: is_active ? .main : .none, profiles: damus_state.profiles, contacts:damus_state.contacts)
+                    ProfilePicView(pubkey: event.pubkey, size: 32, highlight: is_active ? .main : .none, profiles: damus_state.profiles)
                }

                Spacer()
@@ -97,7 +97,7 @@ struct ChatView: View {
                    if let ref_id = thread.replies.lookup(event.id) {
                        if !is_reply_to_prev() {
                            /*
-                            ReplyQuoteView(keypair: damus_state.keypair, quoter: event, event_id: ref_id, profiles: damus_state.profiles, previews: damus_state.previews, contacts: damus_state.contacts)
+                            ReplyQuoteView(keypair: damus_state.keypair, quoter: event, event_id: ref_id, profiles: damus_state.profiles, previews: damus_state.previews)
                                .frame(maxHeight: expand_reply ? nil : 100)
                                .environmentObject(thread)
                                .onTapGesture {
@@ -116,7 +116,7 @@ struct ChatView: View {
                                    size: .normal)

                    if is_active || next_ev == nil || next_ev!.pubkey != event.pubkey {
-                        let bar = make_actionbar_model(ev: event, damus: damus_state)
+                        let bar = make_actionbar_model(ev: event.id, damus: damus_state)
                        EventActionBar(damus_state: damus_state, event: event, bar: bar)
                    }

@@ -7,26 +7,8 @@
 import AVFoundation
 import Kingfisher
 import SwiftUI
-
-enum RemoteImagePolicy: String, CaseIterable {
-    case everyone
-    case friendsOnly
-    case friendsOfFriends
-    case restricted
-}
-
-func remoteImagePolicyText(_ fs: RemoteImagePolicy) -> String {
-    switch fs {
-    case .everyone:
-        return "Everyone"
-    case .friendsOnly:
-        return "Friends Only"
-    case .friendsOfFriends:
-        return "Friends of Friends"
-    case .restricted:
-        return "Block Images"
-    }
-}
+import LocalAuthentication
+import Combine

 struct ConfigView: View {
    let state: DamusState
@@ -34,29 +16,65 @@ struct ConfigView: View {
    @State var confirm_logout: Bool = false
    @State var confirm_delete_account: Bool = false
    @State var show_privkey: Bool = false
-    @State var show_libretranslate_api_key: Bool = false
+    @State var has_authenticated_locally: Bool = false
+    @State var show_api_key: Bool = false
    @State var privkey: String
    @State var privkey_copied: Bool = false
    @State var pubkey_copied: Bool = false
    @State var delete_text: String = ""
+    @State var default_zap_amount: String
+    
    @ObservedObject var settings: UserSettingsStore
-    @AppStorage("remote_image_policy") var remote_image_policy: RemoteImagePolicy = .everyone
    
    let generator = UIImpactFeedbackGenerator(style: .light)
    
    init(state: DamusState) {
        self.state = state
+        let zap_amt = get_default_zap_amount(pubkey: state.pubkey).map({ "\($0)" }) ?? "1000"
+        _default_zap_amount = State(initialValue: zap_amt)
        _privkey = State(initialValue: self.state.keypair.privkey_bech32 ?? "")
        _settings = ObservedObject(initialValue: state.settings)
    }

+    func authenticateLocally(completion: @escaping (Bool) -> Void) {
+        // Need to authenticate only once while ConfigView is presented
+        guard !has_authenticated_locally else {
+            completion(true)
+            return
+        }
+        let context = LAContext()
+        if context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) {
+            context.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: NSLocalizedString("Local authentication to access private key", comment: "Face ID usage description shown when trying to access private key")) { success, error in
+                DispatchQueue.main.async {
+                    has_authenticated_locally = success
+                    completion(success)
+                }
+            }
+        } else {
+            // If there's no authentication set up on the device, let the user copy the key without it
+            has_authenticated_locally = true
+            completion(true)
+        }
+    }
+    
    // TODO: (jb55) could be more general but not gonna worry about it atm
    func CopyButton(is_pk: Bool) -> some View {
        return Button(action: {
-            UIPasteboard.general.string = is_pk ? self.state.keypair.pubkey_bech32 : self.privkey
-            self.privkey_copied = !is_pk
-            self.pubkey_copied = is_pk
-            generator.impactOccurred()
+            let copyKey = {
+                UIPasteboard.general.string = is_pk ? self.state.keypair.pubkey_bech32 : self.privkey
+                self.privkey_copied = !is_pk
+                self.pubkey_copied = is_pk
+                generator.impactOccurred()
+            }
+            if has_authenticated_locally {
+                copyKey()
+            } else {
+                authenticateLocally { success in
+                    if success {
+                        copyKey()
+                    }
+                }
+            }
        }) {
            let copied = is_pk ? self.pubkey_copied : self.privkey_copied
            Image(systemName: copied ? "checkmark.circle" : "doc.on.doc")
@@ -78,7 +96,7 @@ struct ConfigView: View {
                if let sec = state.keypair.privkey_bech32 {
                    Section(NSLocalizedString("Secret Account Login Key", comment: "Section title for user's secret account login key.")) {
                        HStack {
-                            if show_privkey == false {
+                            if show_privkey == false || !has_authenticated_locally {
                                SecureField(NSLocalizedString("Private Key", comment: "Title of the secure field that holds the user's private key."), text: $privkey)
                                    .disabled(true)
                            } else {
@@ -90,6 +108,13 @@ struct ConfigView: View {
                        }

                        Toggle(NSLocalizedString("Show", comment: "Toggle to show or hide user's secret account login key."), isOn: $show_privkey)
+                            .onChange(of: show_privkey) { newValue in
+                                if newValue {
+                                    authenticateLocally { success in
+                                        show_privkey = success
+                                    }
+                                }
+                            }
                    }
                }

@@ -103,37 +128,74 @@ struct ConfigView: View {
                        }
                    }
                }
+                
+                
+                Section(NSLocalizedString("Default Zap Amount in sats", comment: "Section title for zap configuration")) {
+                    TextField("1000", text: $default_zap_amount)
+                        .keyboardType(.numberPad)
+                        .onReceive(Just(default_zap_amount)) { newValue in
+                            let filtered = newValue.filter { Set("0123456789").contains($0) }

-                Section(NSLocalizedString("LibreTranslate Translations", comment: "Section title for selecting the server that hosts the LibreTranslate machine translation API.")) {
-                    Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
-                        ForEach(LibreTranslateServer.allCases, id: \.self) { server in
+                            if filtered != newValue {
+                                default_zap_amount = filtered
+                            }
+
+                            if filtered == "" {
+                                set_default_zap_amount(pubkey: state.pubkey, amount: 1000)
+                                return
+                            }
+
+                            guard let amt = Int(filtered) else {
+                                return
+                            }
+                            set_default_zap_amount(pubkey: state.pubkey, amount: amt)
+                        }
+                }
+
+                Section(NSLocalizedString("Translations", comment: "Section title for selecting the translation service.")) {
+                    Picker(NSLocalizedString("Service", comment: "Prompt selection of translation service provider."), selection: $settings.translation_service) {
+                        ForEach(TranslationService.allCases, id: \.self) { server in
                            Text(server.model.displayName)
                                .tag(server.model.tag)
                        }
                    }

-                    if settings.libretranslate_server != .none {
-                        TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
-                            .disableAutocorrection(true)
-                            .disabled(settings.libretranslate_server != .custom)
-                            .autocapitalization(UITextAutocapitalizationType.none)
-                        HStack {
-                            if show_libretranslate_api_key {
-                                TextField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_api_key)
-                                    .disableAutocorrection(true)
-                                    .autocapitalization(UITextAutocapitalizationType.none)
-                                Button(NSLocalizedString("Hide API Key", comment: "Button to hide the LibreTranslate server API key.")) {
-                                    show_libretranslate_api_key = false
-                                }
-                            } else {
-                                SecureField(NSLocalizedString("API Key (optional)", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_api_key)
-                                    .disableAutocorrection(true)
-                                    .autocapitalization(UITextAutocapitalizationType.none)
-                                Button(NSLocalizedString("Show API Key", comment: "Button to hide the LibreTranslate server API key.")) {
-                                    show_libretranslate_api_key = true
-                                }
+                    if settings.translation_service == .libretranslate {
+                        Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
+                            ForEach(LibreTranslateServer.allCases, id: \.self) { server in
+                                Text(server.model.displayName)
+                                    .tag(server.model.tag)
                            }
                        }
+
+                        if settings.libretranslate_server == .custom {
+                            TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
+                                .disableAutocorrection(true)
+                                .autocapitalization(UITextAutocapitalizationType.none)
+                        }
+
+                        SecureField(NSLocalizedString("API Key (optional)", comment: "Prompt for optional entry of API Key to use translation server."), text: $settings.libretranslate_api_key)
+                            .disableAutocorrection(true)
+                            .disabled(settings.translation_service != .libretranslate)
+                            .autocapitalization(UITextAutocapitalizationType.none)
+                    }
+
+                    if settings.translation_service == .deepl {
+                        Picker(NSLocalizedString("Plan", comment: "Prompt selection of DeepL subscription plan to perform machine translations on notes"), selection: $settings.deepl_plan) {
+                            ForEach(DeepLPlan.allCases, id: \.self) { server in
+                                Text(server.model.displayName)
+                                    .tag(server.model.tag)
+                            }
+                        }
+
+                        SecureField(NSLocalizedString("API Key (required)", comment: "Prompt for required entry of API Key to use translation server."), text: $settings.deepl_api_key)
+                            .disableAutocorrection(true)
+                            .disabled(settings.translation_service != .deepl)
+                            .autocapitalization(UITextAutocapitalizationType.none)
+
+                        if settings.deepl_api_key == "" {
+                            Link(NSLocalizedString("Get API Key", comment: "Button to navigate to DeepL website to get a translation API key."), destination: URL(string: "https://www.deepl.com/pro-api")!)
+                        }
                    }
                }

@@ -149,35 +211,7 @@ struct ConfigView: View {
                        KingfisherManager.shared.cache.cleanExpiredDiskCache()
                    }
                }
-                
-                Section(NSLocalizedString("Remote Image Loading Policy", comment: "Section title for remote image loading policy")) {
-                    Menu {
-                        Button {
-                            self.remote_image_policy = .everyone
-                        } label: {
-                            Text(remoteImagePolicyText(.everyone))
-                        }
-                        Button {
-                            self.remote_image_policy = .friendsOfFriends
-                        } label: {
-                            Text(remoteImagePolicyText(.friendsOfFriends))
-                        }
-                        Button {
-                            self.remote_image_policy = .friendsOnly
-                        } label: {
-                            Text(remoteImagePolicyText(.friendsOnly))
-                        }
-                        Button {
-                            self.remote_image_policy = .restricted
-                        } label: {
-                            Text(remoteImagePolicyText(.restricted))
-                        }
-                    } label: {
-                        Text("\(remoteImagePolicyText(remote_image_policy))")
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                    }
-                }
-                
+
                if state.is_privkey_user {
                    Section(NSLocalizedString("Delete", comment: "Section title for deleting the user")) {
                        Button(NSLocalizedString("Delete Account", comment: "Button to delete the user's account."), role: .destructive) {
@@ -185,12 +219,18 @@ struct ConfigView: View {
                        }
                    }
                }
+
+                let bundleShortVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+                let bundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
+                Section(NSLocalizedString("Version", comment: "Section title for displaying the version number of the Damus app.")) {
+                    Text("\(bundleShortVersion) (\(bundleVersion))", comment: "Text indicating which version of the Damus app is running. Should typically not need to be translated.")
+                }
            }
        }
        .navigationTitle(NSLocalizedString("Settings", comment: "Navigation title for Settings view."))
        .navigationBarTitleDisplayMode(.large)
-        .alert(NSLocalizedString("Delete Account", comment: "Alert for deleting the users account."), isPresented: $confirm_delete_account) {
-            TextField("Type DELETE to delete", text: $delete_text)
+        .alert(NSLocalizedString("Permanently Delete Account", comment: "Alert for deleting the users account."), isPresented: $confirm_delete_account) {
+            TextField(NSLocalizedString("Type DELETE to delete", comment: "Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should."), text: $delete_text)
            Button(NSLocalizedString("Cancel", comment: "Cancel deleting the user."), role: .cancel) {
                confirm_delete_account = false
            }
@@ -222,6 +262,81 @@ struct ConfigView: View {
            dismiss()
        }
    }
+
+    var libretranslate_view: some View {
+        VStack {
+            Picker(NSLocalizedString("Server", comment: "Prompt selection of LibreTranslate server to perform machine translations on notes"), selection: $settings.libretranslate_server) {
+                ForEach(LibreTranslateServer.allCases, id: \.self) { server in
+                    Text(server.model.displayName)
+                        .tag(server.model.tag)
+                }
+            }
+
+            TextField(NSLocalizedString("URL", comment: "Example URL to LibreTranslate server"), text: $settings.libretranslate_url)
+                .disableAutocorrection(true)
+                .disabled(settings.libretranslate_server != .custom)
+                .autocapitalization(UITextAutocapitalizationType.none)
+            HStack {
+                let libretranslate_api_key_placeholder = NSLocalizedString("API Key (optional)", comment: "Prompt for optional entry of API Key to use translation server.")
+                if show_api_key {
+                    TextField(libretranslate_api_key_placeholder, text: $settings.libretranslate_api_key)
+                        .disableAutocorrection(true)
+                        .autocapitalization(UITextAutocapitalizationType.none)
+                    if settings.libretranslate_api_key != "" {
+                        Button(NSLocalizedString("Hide API Key", comment: "Button to hide the LibreTranslate server API key.")) {
+                            show_api_key = false
+                        }
+                    }
+                } else {
+                    SecureField(libretranslate_api_key_placeholder, text: $settings.libretranslate_api_key)
+                        .disableAutocorrection(true)
+                        .autocapitalization(UITextAutocapitalizationType.none)
+                    if settings.libretranslate_api_key != "" {
+                        Button(NSLocalizedString("Show API Key", comment: "Button to show the LibreTranslate server API key.")) {
+                            show_api_key = true
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    var deepl_view: some View {
+        VStack {
+            Picker(NSLocalizedString("Plan", comment: "Prompt selection of DeepL subscription plan to perform machine translations on notes"), selection: $settings.deepl_plan) {
+                ForEach(DeepLPlan.allCases, id: \.self) { server in
+                    Text(server.model.displayName)
+                        .tag(server.model.tag)
+                }
+            }
+
+            HStack {
+                let deepl_api_key_placeholder = NSLocalizedString("API Key (required)", comment: "Prompt for required entry of API Key to use translation server.")
+                if show_api_key {
+                    TextField(deepl_api_key_placeholder, text: $settings.deepl_api_key)
+                        .disableAutocorrection(true)
+                        .autocapitalization(UITextAutocapitalizationType.none)
+                    if settings.deepl_api_key != "" {
+                        Button(NSLocalizedString("Hide API Key", comment: "Button to hide the DeepL translation API key.")) {
+                            show_api_key = false
+                        }
+                    }
+                } else {
+                    SecureField(deepl_api_key_placeholder, text: $settings.deepl_api_key)
+                        .disableAutocorrection(true)
+                        .autocapitalization(UITextAutocapitalizationType.none)
+                    if settings.deepl_api_key != "" {
+                        Button(NSLocalizedString("Show API Key", comment: "Button to show the DeepL translation API key.")) {
+                            show_api_key = true
+                        }
+                    }
+                }
+                if settings.deepl_api_key == "" {
+                    Link(NSLocalizedString("Get API Key", comment: "Button to navigate to DeepL website to get a translation API key."), destination: URL(string: "https://www.deepl.com/pro-api")!)
+                }
+            }
+        }
+    }
 }

 struct ConfigView_Previews: PreviewProvider {
@@ -11,7 +11,7 @@ struct DMChatView: View {
    let damus_state: DamusState
    let pubkey: String
    @EnvironmentObject var dms: DirectMessageModel
-    @State var message: String = ""
+    @State var showPrivateKeyWarning: Bool = false

    var Messages: some View {
        ScrollViewReader { scroller in
@@ -42,7 +42,7 @@ struct DMChatView: View {
        let profile_page = ProfileView(damus_state: damus_state, profile: pmodel, followers: fmodel)
        return NavigationLink(destination: profile_page) {
            HStack {
-                ProfilePicView(pubkey: pubkey, size: 24, highlight: .none, profiles: damus_state.profiles, contacts:damus_state.contacts)
+                ProfilePicView(pubkey: pubkey, size: 24, highlight: .none, profiles: damus_state.profiles)

                ProfileName(pubkey: pubkey, profile: profile, damus: damus_state, show_friend_confirmed: true)
            }
@@ -51,7 +51,7 @@ struct DMChatView: View {
    }

    var InputField: some View {
-        TextEditor(text: $message)
+        TextEditor(text: $dms.draft)
            .textEditorBackground {
                InputBackground()
            }
@@ -92,8 +92,17 @@ struct DMChatView: View {
            HStack(spacing: 0) {
                InputField

-                if !message.isEmpty {
-                    Button(role: .none, action: send_message) {
+                if !dms.draft.isEmpty {
+                    Button(
+                        role: .none,
+                        action: {
+                            showPrivateKeyWarning = contentContainsPrivateKey(dms.draft)
+
+                            if !showPrivateKeyWarning {
+                                send_message()
+                            }
+                        }
+                    ) {
                        Label("", systemImage: "arrow.right.circle")
                            .font(.title)
                    }
@@ -102,7 +111,7 @@ struct DMChatView: View {
            .fixedSize(horizontal: false, vertical: true)
            .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)

-            Text(message).opacity(0).padding(.all, 8)
+            Text(dms.draft).opacity(0).padding(.all, 8)
                .fixedSize(horizontal: false, vertical: true)
                .frame(minHeight: 70, maxHeight: 150, alignment: .bottom)
        }
@@ -112,7 +121,7 @@ struct DMChatView: View {

    func send_message() {
        let tags = [["p", pubkey]]
-        let post_blocks = parse_post_blocks(content: message)
+        let post_blocks = parse_post_blocks(content: dms.draft)
        let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags)
        let content = render_blocks(blocks: post_tags.blocks)
        
@@ -121,7 +130,7 @@ struct DMChatView: View {
            return
        }

-        message = ""
+        dms.draft = ""

        damus_state.pool.send(.event(dm))
        end_editing()
@@ -147,6 +156,19 @@ struct DMChatView: View {
        }
        .navigationTitle(NSLocalizedString("DMs", comment: "Navigation title for DMs view, where DM is the English abbreviation for Direct Message."))
        .toolbar { Header }
+        .onDisappear {
+            if dms.draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                dms.draft = ""
+            }
+        }
+        .alert(NSLocalizedString("Note contains \"nsec1\" private key. Are you sure?", comment: "Alert user that they might be attempting to paste a private key and ask them to confirm."), isPresented: $showPrivateKeyWarning, actions: {
+            Button(NSLocalizedString("No", comment: "Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key."), role: .cancel) {
+                showPrivateKeyWarning = false
+            }
+            Button(NSLocalizedString("Yes, Post with Private Key", comment: "Button to proceed with posting a note even though it looks like they might be posting a private key."), role: .destructive) {
+                send_message()
+            }
+        })
    }
 }

@@ -120,7 +120,7 @@ struct EditMetadataView: View {
                let pfp_size: CGFloat = 90.0

                HStack(alignment: .center) {
-                    ProfilePicView(pubkey: damus_state.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles, contacts: damus_state.contacts)
+                    ProfilePicView(pubkey: damus_state.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles)
                        .offset(y: -(pfp_size/2.0)) // Increase if set a frame

                   Spacer()
@@ -7,119 +7,10 @@

 import SwiftUI

-struct CollapsedEvents: Identifiable {
-    let count: Int
-    let start: Int
-    let end: Int
-    
-    var id: String = UUID().description
-}
-
-enum CollapsedEvent: Identifiable {
-    case event(NostrEvent, Highlight)
-    case collapsed(CollapsedEvents)
-
-    var id: String {
-        switch self {
-        case .event(let ev, _):
-            return ev.id
-        case .collapsed(let c):
-            return c.id
-        }
-    }
-}
-

 struct EventDetailView: View {
-    let sub_id = UUID().description
-    let damus: DamusState
-    
-    @StateObject var thread: ThreadModel
-    @State var collapsed: Bool = true
-    
-    func toggle_collapse_thread(scroller: ScrollViewProxy, id mid: String?, animate: Bool = true) {
-        self.collapsed = !self.collapsed
-        if let id = mid {
-            if !self.collapsed {
-                scroll_to_event(scroller: scroller, id: id, delay: 0.1, animate: animate)
-            }
-        }
-    }
-    
-    func uncollapse_section(scroller: ScrollViewProxy, c: CollapsedEvents)
-    {
-        let ev = thread.events[c.start]
-        print("uncollapsing section at \(c.start) '\(ev.content.prefix(12))...'")
-        let start_id = ev.id
-        
-        toggle_collapse_thread(scroller: scroller, id: start_id, animate: false)
-    }
-    
-    func CollapsedEventView(_ cev: CollapsedEvent, scroller: ScrollViewProxy) -> some View {
-        Group {
-            switch cev {
-            case .collapsed(let c):
-                Text(String(format: NSLocalizedString("collapsed_event_view_other_notes", comment: "Text to indicate that the thread was collapsed and that there are other notes to view if tapped."), c.count))
-                    .padding([.top,.bottom], 8)
-                    .font(.footnote)
-                    .foregroundColor(.gray)
-                    .onTapGesture {
-                        //self.uncollapse_section(scroller: proxy, c: c)
-                        //self.toggle_collapse_thread(scroller: proxy, id: nil)
-                        if let ev = thread.events[safe: c.start] {
-                            thread.set_active_event(ev, privkey: damus.keypair.privkey)
-                        }
-                        toggle_thread_view()
-                    }
-            case .event(let ev, _):
-                EventView(damus: damus, event: ev, has_action_bar: true)
-                    .onTapGesture {
-                        if thread.initial_event.id == ev.id {
-                            toggle_thread_view()
-                        } else {
-                            thread.set_active_event(ev, privkey: damus.keypair.privkey)
-                        }
-                    }
-            }
-        }
-    }
-    
    var body: some View {
-        ScrollViewReader { proxy in
-            if thread.loading {
-                ProgressView().progressViewStyle(.circular)
-            }
-            
-            ScrollView(.vertical) {
-                LazyVStack {
-                    let collapsed_events = calculated_collapsed_events(
-                        privkey: damus.keypair.privkey,
-                        collapsed: self.collapsed,
-                        active: thread.event,
-                        events: thread.events
-                    )
-                    ForEach(collapsed_events, id: \.id) { cev in
-                        CollapsedEventView(cev, scroller: proxy)
-                    }
-                }
-                .padding(.horizontal)
-                .padding(.top)
-                
-                EndBlock()
-            }
-            .onChange(of: thread.loading) { val in
-                scroll_after_load(thread: thread, proxy: proxy)
-            }
-            .onAppear() {
-                scroll_after_load(thread: thread, proxy: proxy)
-            }
-        }
-        .navigationBarTitle(NSLocalizedString("Thread", comment: "Navigation bar title for note thread."))
-
-    }
-    
-    func toggle_thread_view() {
-        NotificationCenter.default.post(name: .toggle_thread_view, object: nil)
+        Text("EventDetailView")
    }
 }

@@ -130,167 +21,13 @@ func scroll_after_load(thread: ThreadModel, proxy: ScrollViewProxy) {
    }
 }

-
 struct EventDetailView_Previews: PreviewProvider {
    static var previews: some View {
        let state = test_damus_state()
-        let tm = ThreadModel(evid: "4da698ceac09a16cdb439276fa3d13ef8f6620ffb45d11b76b3f103483c2d0b0", damus_state: state)
-        EventDetailView(damus: state, thread: tm)
+        EventDetailView()
    }
 }

-/// Find the entire reply path for the active event
-func make_reply_map(active: NostrEvent, events: [NostrEvent], privkey: String?) -> [String: ()]
-{
-    let event_map: [String: Int] = zip(events,0...events.count).reduce(into: [:]) { (acc, arg1) in
-        let (ev, i) = arg1
-        acc[ev.id] = i
-    }
-    var is_reply: [String: ()] = [:]
-    var i: Int = 0
-    var start: Int = 0
-    var iterations: Int = 0
-
-    if events.count == 0 {
-        return is_reply
-    }
-    
-    for ev in events {
-        /// does this event reply to the active event?
-        let ev_refs = ev.event_refs(privkey)
-        for ev_ref in ev_refs {
-            if let reply = ev_ref.is_reply {
-                if reply.ref_id == active.id {
-                    is_reply[ev.id] = ()
-                    start = i
-                }
-            }
-        }
-        
-        /// does the active event reply to this event?
-        let active_refs = active.event_refs(privkey)
-        for active_ref in active_refs {
-            if let reply = active_ref.is_reply {
-                if reply.ref_id == ev.id {
-                    is_reply[ev.id] = ()
-                    start = i
-                }
-            }
-        }
-        
-        i += 1
-    }
-
-    i = start
-
-    while true {
-        if iterations > 1024 {
-            // infinite loop? or super large thread
-            print("breaking from large reply_map... big thread??")
-            break
-        }
-
-        let ev = events[i]
-
-        let ref_ids = ev.referenced_ids
-        if ref_ids.count == 0 {
-            break
-        }
-
-        let ref_id = ref_ids[ref_ids.count-1]
-        let pubkey = ref_id.ref_id
-        is_reply[pubkey] = ()
-
-        if let mi = event_map[pubkey] {
-            i = mi
-        } else {
-            break
-        }
-
-        iterations += 1
-    }
-
-    return is_reply
-}
-
-func determine_highlight(reply_map: [String: ()], current: NostrEvent, active: NostrEvent) -> Highlight
-{
-    if current.id == active.id {
-        return .main
-    } else if reply_map[current.id] != nil {
-        return .reply
-    } else {
-        return .none
-    }
-}
-
-func calculated_collapsed_events(privkey: String?, collapsed: Bool, active: NostrEvent?, events: [NostrEvent]) -> [CollapsedEvent] {
-    var count: Int = 0
-    
-    guard let active = active else {
-        return []
-    }
-    
-    let reply_map = make_reply_map(active: active, events: events, privkey: privkey)
-    
-    if !collapsed {
-        return events.reduce(into: []) { acc, ev in
-            let highlight = determine_highlight(reply_map: reply_map, current: ev, active: active)
-            return acc.append(.event(ev, highlight))
-        }
-    }
-
-    let nevents = events.count
-    var start: Int = 0
-    var i: Int = 0
-    
-    return events.reduce(into: []) { (acc, ev) in
-        let highlight = determine_highlight(reply_map: reply_map, current: ev, active: active)
-
-        switch highlight {
-        case .none:
-            if i == 0 {
-                start = 1
-            }
-            count += 1
-        case .main: fallthrough
-        case .custom: fallthrough
-        case .reply:
-            if count != 0 {
-                let c = CollapsedEvents(count: count, start: start, end: i)
-                acc.append(.collapsed(c))
-                start = i
-                count = 0
-            }
-            acc.append(.event(ev, highlight))
-        }
-
-        if i == nevents-1 {
-            if count != 0 {
-                let c = CollapsedEvents(count: count, start: i-count, end: i)
-                acc.append(.collapsed(c))
-                count = 0
-            }
-        }
-
-        i += 1
-    }
-}
-
-
-
-func any_collapsed(_ evs: [CollapsedEvent]) -> Bool {
-    for ev in evs {
-        switch ev {
-        case .collapsed:
-            return true
-        case .event:
-            continue
-        }
-    }
-    return false
-}
-

 func print_event(_ ev: NostrEvent) {
    print(ev.description)
@@ -98,18 +98,12 @@ func should_show_images(contacts: Contacts, ev: NostrEvent, our_pubkey: String,
    if ev.pubkey == our_pubkey {
        return true
    }
-
-    let remote_image_policy: RemoteImagePolicy = RemoteImagePolicy(rawValue: UserDefaults.standard.string(forKey: "remote_image_policy") ?? "") ?? .friendsOfFriends
-    if remote_image_policy == .everyone ||
-       remote_image_policy == .friendsOnly && contacts.is_friend(ev.pubkey) ||
-       remote_image_policy == .friendsOfFriends && contacts.is_in_friendosphere(ev.pubkey) {
+    if contacts.is_in_friendosphere(ev.pubkey) {
        return true
    }
-
-    if let boost_key = booster_pubkey, contacts.is_in_friendosphere(boost_key) && remote_image_policy != .restricted {
+    if let boost_key = booster_pubkey, contacts.is_in_friendosphere(boost_key) {
        return true
    }
-    
    return false
 }

@@ -158,16 +152,14 @@ func format_date(_ created_at: Int64) -> String {
    return dateFormatter.string(from: date)
 }

-
-
-func make_actionbar_model(ev: NostrEvent, damus: DamusState) -> ActionBarModel {
-    let likes = damus.likes.counts[ev.id]
-    let boosts = damus.boosts.counts[ev.id]
-    let zaps = damus.zaps.event_counts[ev.id]
-    let zap_total = damus.zaps.event_totals[ev.id]
-    let our_like = damus.likes.our_events[ev.id]
-    let our_boost = damus.boosts.our_events[ev.id]
-    let our_zap = damus.zaps.our_zaps[ev.id]
+func make_actionbar_model(ev: String, damus: DamusState) -> ActionBarModel {
+    let likes = damus.likes.counts[ev]
+    let boosts = damus.boosts.counts[ev]
+    let zaps = damus.zaps.event_counts[ev]
+    let zap_total = damus.zaps.event_totals[ev]
+    let our_like = damus.likes.our_events[ev]
+    let our_boost = damus.boosts.our_events[ev]
+    let our_zap = damus.zaps.our_zaps[ev]

    return ActionBarModel(likes: likes ?? 0,
                          boosts: boosts ?? 0,
@@ -53,8 +53,7 @@ struct BuilderEventView: View {
            NostrFilter(ids: [self.event_id], limit: 1),
            NostrFilter(
                kinds: [NostrKind.zap.rawValue],
-                referenced_ids: [self.event_id],
-                limit: 500
+                referenced_ids: [self.event_id]
            )
        ])
    }
@@ -35,7 +35,7 @@ struct EventProfile: View {
                let pv = ProfileView(damus_state: damus_state, profile: pmodel, followers: FollowersModel(damus_state: damus_state, target: pubkey))
                
                NavigationLink(destination: pv) {
-                    ProfilePicView(pubkey: pubkey, size: pfp_size, highlight: .none, profiles: damus_state.profiles, contacts: damus_state.contacts)
+                    ProfilePicView(pubkey: pubkey, size: pfp_size, highlight: .none, profiles: damus_state.profiles)
                }
            }
            
@@ -25,11 +25,11 @@ struct MutedEventView: View {
        self.selected = selected
        self._nav_target = nav_target
        self._navigating = navigating
-        self._shown = State(initialValue: !should_hide_event(contacts: damus_state.contacts, ev: event))
+        self._shown = State(initialValue: should_show_event(contacts: damus_state.contacts, ev: event))
    }
    
    var should_mute: Bool {
-        return should_hide_event(contacts: damus_state.contacts, ev: event)
+        return !should_show_event(contacts: damus_state.contacts, ev: event)
    }
    
    var FillColor: Color {
@@ -15,6 +15,14 @@ struct SelectedEventView: View {
        event.pubkey
    }
    
+    @StateObject var bar: ActionBarModel
+    
+    init(damus: DamusState, event: NostrEvent) {
+        self.damus = damus
+        self.event = event
+        self._bar = StateObject(wrappedValue: make_actionbar_model(ev: event.id, damus: damus))
+    }
+    
    var body: some View {
        HStack(alignment: .top) {
            let profile = damus.profiles.lookup(id: pubkey)
@@ -35,19 +43,27 @@ struct SelectedEventView: View {
                Divider()
                    .padding([.bottom], 4)
                
-                let bar = make_actionbar_model(ev: event, damus: damus)
-                
                if !bar.is_empty {
-                    EventDetailBar(state: damus, target: event.id, bar: bar)
+                    EventDetailBar(state: damus, target: event.id, target_pk: event.pubkey)
                    Divider()
                }
                
-                EventActionBar(damus_state: damus, event: event, bar: bar)
+                EventActionBar(damus_state: damus, event: event)
                    .padding([.top], 4)

                Divider()
                    .padding([.top], 4)
            }
+            .onReceive(handle_notify(.new_zap)) { n in
+                let zap = n.object as! Zap
+                guard case .note(let note_target) = zap.target else {
+                    return
+                }
+                guard note_target.note_id == self.event.id else {
+                    return
+                }
+                self.bar.update(damus: self.damus, evid: self.event.id)
+            }
            .padding([.leading], 2)
            .event_context_menu(event, keypair: damus.keypair, target_pubkey: event.pubkey)
        }
@@ -17,13 +17,13 @@ struct TextEvent: View {
    var body: some View {
        HStack(alignment: .top) {
            let profile = damus.profiles.lookup(id: pubkey)
-
+        
            VStack {
                let pmodel = ProfileModel(pubkey: pubkey, damus: damus)
                let pv = ProfileView(damus_state: damus, profile: pmodel, followers: FollowersModel(damus_state: damus, target: pubkey))
                
                NavigationLink(destination: pv) {
-                    ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus.profiles, contacts: damus.contacts)
+                    ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus.profiles)
                }
                
                Spacer()
@@ -48,9 +48,7 @@ struct TextEvent: View {
                if has_action_bar {
                    Rectangle().frame(height: 2).opacity(0)
                    
-                    let bar = make_actionbar_model(ev: event, damus: damus)
-                    
-                    EventActionBar(damus_state: damus, event: event, bar: bar)
+                    EventActionBar(damus_state: damus, event: event)
                        .padding([.top], 4)
                }
            }
@@ -13,7 +13,7 @@ struct ZapEvent: View {
    
    var body: some View {
        VStack(alignment: .leading) {
-            Text("⚡️ \(format_msats(zap.invoice.amount))")
+            Text("⚡️ \(format_msats(zap.invoice.amount))", comment: "Text indicating the zap amount. i.e. number of satoshis that were tipped to a user")
                .font(.headline)
                .padding([.top], 2)

@@ -12,13 +12,14 @@ struct FollowButtonView: View {
    @Environment(\.colorScheme) var colorScheme
    
    let target: FollowTarget
+    let follows_you: Bool
    @State var follow_state: FollowState
    
    var body: some View {
        Button {
            follow_state = perform_follow_btn_action(follow_state, target: target)
        } label: {
-            Text(follow_btn_txt(follow_state))
+            Text(follow_btn_txt(follow_state, follows_you: follows_you))
                .frame(width: 105, height: 30)
                //.padding(.vertical, 10)
                .font(.caption.weight(.bold))
@@ -70,16 +71,19 @@ struct FollowButtonPreviews: View {
    var body: some View {
        VStack {
            Text("Unfollows", comment: "Text to indicate that the button next to it is in a state that will unfollow a profile when tapped.")
-            FollowButtonView(target: target, follow_state: .unfollows)
+            FollowButtonView(target: target, follows_you: false, follow_state: .unfollows)
            
            Text("Following", comment: "Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile.")
-            FollowButtonView(target: target, follow_state: .following)
+            FollowButtonView(target: target, follows_you: false, follow_state: .following)
+           
+            Text("Follows", comment: "Text to indicate that button next to it is in a state that will follow a profile when tapped.")
+            FollowButtonView(target: target, follows_you: false, follow_state: .follows)
            
            Text("Follows", comment: "Text to indicate that button next to it is in a state that will follow a profile when tapped.")
-            FollowButtonView(target: target, follow_state: .follows)
+            FollowButtonView(target: target, follows_you: true, follow_state: .follows)
            
            Text("Unfollowing", comment: "Text to indicate that the button next to it is in  a state that indicates that it is in the process of unfollowing a profile.")
-            FollowButtonView(target: target, follow_state: .unfollowing)
+            FollowButtonView(target: target, follows_you: false, follow_state: .unfollowing)
        }
    }
 }
@@ -17,7 +17,7 @@ struct FollowUserView: View {
        HStack {
            UserView(damus_state: damus_state, pubkey: target.pubkey)
            
-            FollowButtonView(target: target, follow_state: damus_state.contacts.follow_state(target.pubkey))
+            FollowButtonView(target: target, follows_you: false, follow_state: damus_state.contacts.follow_state(target.pubkey))
        }
    }
 }
@@ -275,6 +275,7 @@ struct KeyInput: View {
            .autocapitalization(.none)
            .foregroundColor(.white)
            .font(.body.monospaced())
+            .textContentType(.password)
    }
 }

@@ -7,7 +7,7 @@

 import SwiftUI

-enum Timeline: String, CustomStringConvertible {
+enum Timeline: String, CustomStringConvertible, Hashable {
    case home
    case notifications
    case search
@@ -9,10 +9,6 @@ import SwiftUI
 import LinkPresentation
 import NaturalLanguage

-#if canImport(FoundationNetworking)
-    import FoundationNetworking
-#endif
-
 struct NoteContentView: View {
    let damus_state: DamusState
    let event: NostrEvent
@@ -65,7 +61,7 @@ struct NoteContentView: View {
    var body: some View {
        MainContent()
            .onAppear() {
-                self.artifacts = render_note_content(ev: event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey, show_images: show_images)
+                self.artifacts = render_note_content(ev: event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
            }
            .onReceive(handle_notify(.profile_updated)) { notif in
                let profile = notif.object as! ProfileUpdate
@@ -74,7 +70,7 @@ struct NoteContentView: View {
                    switch block {
                    case .mention(let m):
                        if m.type == .pubkey && m.ref.ref_id == profile.pubkey {
-                            self.artifacts = render_note_content(ev: event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey, show_images: show_images)
+                            self.artifacts = render_note_content(ev: event, profiles: damus_state.profiles, privkey: damus_state.keypair.privkey)
                        }
                    case .text: return
                    case .hashtag: return
@@ -154,83 +150,6 @@ func mention_str(_ m: Mention, profiles: Profiles) -> AttributedString {
    }
 }

-
-public struct Translator {
-    private let url: String
-    private let apiKey: String?
-    private let session = URLSession.shared
-    private let encoder = JSONEncoder()
-    private let decoder = JSONDecoder()
-
-    public init(_ url: String, apiKey: String? = nil) {
-        self.url = url
-        self.apiKey = apiKey
-    }
-
-    public func translate(_ text: String, from sourceLanguage: String, to targetLanguage: String) async throws -> String {
-        let url = try makeURL(path: "/translate")
-
-        var request = URLRequest(url: url)
-        request.httpMethod = "POST"
-        request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-
-        struct RequestBody: Encodable {
-            let q: String
-            let source: String
-            let target: String
-            let api_key: String?
-        }
-        let body = RequestBody(q: text, source: sourceLanguage, target: targetLanguage, api_key: apiKey)
-        request.httpBody = try encoder.encode(body)
-
-        struct Response: Decodable {
-            let translatedText: String
-        }
-        let response: Response = try await decodedData(for: request)
-        return response.translatedText
-    }
-
-    private func makeURL(path: String) throws -> URL {
-        guard var components = URLComponents(string: url) else {
-            throw URLError(.badURL)
-        }
-        components.path = path
-        guard let url = components.url else {
-            throw URLError(.badURL)
-        }
-        return url
-    }
-
-    private func decodedData<Output: Decodable>(for request: URLRequest) async throws -> Output {
-        let data = try await session.data(for: request)
-        let result = try decoder.decode(Output.self, from: data)
-        return result
-    }
-}
-
-private extension URLSession {
-    func data(for request: URLRequest) async throws -> Data {
-        var task: URLSessionDataTask?
-        let onCancel = { task?.cancel() }
-        return try await withTaskCancellationHandler(
-            operation: {
-                try await withCheckedThrowingContinuation { continuation in
-                    task = dataTask(with: request) { data, _, error in
-                        guard let data = data else {
-                            let error = error ?? URLError(.badServerResponse)
-                            return continuation.resume(throwing: error)
-                        }
-                        continuation.resume(returning: data)
-                    }
-                    task?.resume()
-                }
-            },
-            onCancel: { onCancel() }
-        )
-    }
-}
-
-
 struct NoteContentView_Previews: PreviewProvider {
    static var previews: some View {
        let state = test_damus_state()
@@ -261,12 +180,12 @@ struct NoteArtifacts {
    }
 }

-func render_note_content(ev: NostrEvent, profiles: Profiles, privkey: String?, show_images: Bool) -> NoteArtifacts {
+func render_note_content(ev: NostrEvent, profiles: Profiles, privkey: String?) -> NoteArtifacts {
    let blocks = ev.blocks(privkey)
-    return render_blocks(blocks: blocks, profiles: profiles, privkey: privkey, show_images: show_images)
+    return render_blocks(blocks: blocks, profiles: profiles, privkey: privkey)
 }

-func render_blocks(blocks: [Block], profiles: Profiles, privkey: String?, show_images: Bool) -> NoteArtifacts {
+func render_blocks(blocks: [Block], profiles: Profiles, privkey: String?) -> NoteArtifacts {
    var invoices: [Invoice] = []
    var img_urls: [URL] = []
    var link_urls: [URL] = []
@@ -283,7 +202,7 @@ func render_blocks(blocks: [Block], profiles: Profiles, privkey: String?, show_i
            return str
        case .url(let url):
            // Handle Image URLs
-            if show_images && is_image_url(url) {
+            if is_image_url(url) {
                // Append Image
                img_urls.append(url)
                return str
@@ -39,7 +39,7 @@ struct ParticipantsView: View {
                ForEach(originalReferences.pRefs) { participant in
                    let pubkey = participant.id
                    HStack {
-                        ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles, contacts: damus_state.contacts)
+                        ProfilePicView(pubkey: pubkey, size: PFP_SIZE, highlight: .none, profiles: damus_state.profiles)
                        
                        VStack(alignment: .leading) {
                            let profile = damus_state.profiles.lookup(id: pubkey)
@@ -16,7 +16,9 @@ let POST_PLACEHOLDER = NSLocalizedString("Type your post here...", comment: "Tex

 struct PostView: View {
    @State var post: String = ""
+
    @FocusState var focus: Bool
+    @State var showPrivateKeyWarning: Bool = false
    
    let replying_to: NostrEvent?
    let references: [ReferencedId]
@@ -46,6 +48,13 @@ struct PostView: View {
        let new_post = NostrPost(content: content, references: references, kind: kind)

        NotificationCenter.default.post(name: .post, object: NostrPostResult.post(new_post))
+
+        if let replying_to {
+            damus_state.drafts.replies.removeValue(forKey: replying_to)
+        } else {
+            damus_state.drafts.post = ""
+        }
+
        dismiss()
    }

@@ -65,7 +74,11 @@ struct PostView: View {

                if !is_post_empty {
                    Button(NSLocalizedString("Post", comment: "Button to post a note.")) {
-                        self.send_post()
+                        showPrivateKeyWarning = contentContainsPrivateKey(self.post)
+
+                        if !showPrivateKeyWarning {
+                            self.send_post()
+                        }
                    }
                }
            }
@@ -75,6 +88,13 @@ struct PostView: View {
                TextEditor(text: $post)
                    .focused($focus)
                    .textInputAutocapitalization(.sentences)
+                    .onChange(of: post) { _ in
+                        if let replying_to {
+                            damus_state.drafts.replies[replying_to] = post
+                        } else {
+                            damus_state.drafts.post = post
+                        }
+                    }

                if post.isEmpty {
                    Text(POST_PLACEHOLDER)
@@ -94,11 +114,37 @@ struct PostView: View {
            }
        }
        .onAppear() {
+            if let replying_to {
+                if damus_state.drafts.replies[replying_to] == nil {
+                    damus_state.drafts.replies[replying_to] = ""
+                }
+                if let p = damus_state.drafts.replies[replying_to] {
+                    post = p
+                }
+            } else {
+                post = damus_state.drafts.post
+            }
+
            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                self.focus = true
            }
        }
+        .onDisappear {
+            if let replying_to, let reply = damus_state.drafts.replies[replying_to], reply.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                damus_state.drafts.replies.removeValue(forKey: replying_to)
+            } else if replying_to == nil && damus_state.drafts.post.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                damus_state.drafts.post = ""
+            }
+        }
        .padding()
+        .alert(NSLocalizedString("Note contains \"nsec1\" private key. Are you sure?", comment: "Alert user that they might be attempting to paste a private key and ask them to confirm."), isPresented: $showPrivateKeyWarning, actions: {
+            Button(NSLocalizedString("No", comment: "Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key."), role: .cancel) {
+                showPrivateKeyWarning = false
+            }
+            Button(NSLocalizedString("Yes, Post with Private Key", comment: "Button to proceed with posting a note even though it looks like they might be posting a private key."), role: .destructive) {
+                self.send_post()
+            }
+        })
    }
 }

@@ -57,8 +57,10 @@ struct UserSearch_Previews: PreviewProvider {
 }


-func search_users(profiles: Profiles, tags: [[String]], search: String) -> [SearchedUser] {
+func search_users(profiles: Profiles, tags: [[String]], search _search: String) -> [SearchedUser] {
    var seen_user = Set<String>()
+    let search = _search.lowercased()
+    
    return tags.reduce(into: Array<SearchedUser>()) { arr, tag in
        guard tag.count >= 2 && tag[0] == "p" else {
            return
@@ -77,7 +79,7 @@ func search_users(profiles: Profiles, tags: [[String]], search: String) -> [Sear
        
        let profile = profiles.lookup(id: pubkey)
        
-        guard ((petname?.hasPrefix(search) ?? false) || (profile?.name?.hasPrefix(search) ?? false)) else {
+        guard ((petname?.lowercased().hasPrefix(search) ?? false) || (profile?.name?.lowercased().hasPrefix(search) ?? false)) else {
            return
        }
        
@@ -0,0 +1,34 @@
+//
+//  FollowsYou.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-07.
+//
+
+import SwiftUI
+
+struct FollowsYou: View {
+    @Environment(\.colorScheme) var colorScheme
+
+    var fill_color: Color {
+        colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
+    }
+    
+    var body: some View {
+        Text("Follows you", comment: "Text to indicate that a user is following your profile.")
+            .padding([.leading, .trailing], 6.0)
+            .padding([.top, .bottom], 2.0)
+            .foregroundColor(.gray)
+            .background {
+                RoundedRectangle(cornerRadius: 5.0)
+                    .foregroundColor(fill_color)
+            }
+            .font(.footnote)
+    }
+}
+
+struct FollowsYou_Previews: PreviewProvider {
+    static var previews: some View {
+        FollowsYou()
+    }
+}
@@ -0,0 +1,61 @@
+//
+//  ProfileNameView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-07.
+//
+
+import SwiftUI
+
+struct ProfileNameView: View {
+    let pubkey: String
+    let profile: Profile?
+    let follows_you: Bool
+    let damus: DamusState
+    
+    var spacing: CGFloat { 10.0 }
+    
+    var body: some View {
+        Group {
+            if let real_name = profile?.display_name {
+                VStack(alignment: .leading) {
+                    Text(real_name)
+                        .font(.title3.weight(.bold))
+                    HStack(alignment: .center, spacing: spacing) {
+                        ProfileName(pubkey: pubkey, profile: profile, prefix: "@", damus: damus, show_friend_confirmed: true)
+                            .font(.callout)
+                            .foregroundColor(.gray)
+                        
+                        if follows_you {
+                            FollowsYou()
+                        }
+                    }
+                    KeyView(pubkey: pubkey)
+                        .pubkey_context_menu(bech32_pubkey: pubkey)
+                }
+            } else {
+                VStack(alignment: .leading) {
+                    HStack(alignment: .center, spacing: spacing) {
+                        ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true)
+                            .font(.title3.weight(.bold))
+                        if follows_you {
+                            FollowsYou()
+                        }
+                    }
+                    KeyView(pubkey: pubkey)
+                        .pubkey_context_menu(bech32_pubkey: pubkey)
+                }
+            }
+        }
+    }
+}
+
+struct ProfileNameView_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack {
+            ProfileNameView(pubkey: test_event.pubkey, profile: nil, follows_you: true, damus: test_damus_state())
+            
+            ProfileNameView(pubkey: test_event.pubkey, profile: nil, follows_you: false, damus: test_damus_state())
+        }
+    }
+}
@@ -98,21 +98,19 @@ struct ProfilePicView: View {
    let size: CGFloat
    let highlight: Highlight
    let profiles: Profiles
-    let contacts: Contacts
    
    @State var picture: String?
    
-    init (pubkey: String, size: CGFloat, highlight: Highlight, profiles: Profiles, contacts: Contacts, picture: String? = nil) {
+    init (pubkey: String, size: CGFloat, highlight: Highlight, profiles: Profiles, picture: String? = nil) {
        self.pubkey = pubkey
        self.profiles = profiles
-        self.contacts = contacts
        self.size = size
        self.highlight = highlight
        self._picture = State(initialValue: picture)
    }
    
    var body: some View {
-        InnerProfilePicView(url: get_profile_url(picture: picture, pubkey: pubkey, profiles: profiles, contacts: contacts), fallbackUrl: URL(string: robohash(pubkey)), pubkey: pubkey, size: size, highlight: highlight)
+        InnerProfilePicView(url: get_profile_url(picture: picture, pubkey: pubkey, profiles: profiles), fallbackUrl: URL(string: robohash(pubkey)), pubkey: pubkey, size: size, highlight: highlight)
            .onReceive(handle_notify(.profile_updated)) { notif in
                let updated = notif.object as! ProfileUpdate

@@ -127,19 +125,8 @@ struct ProfilePicView: View {
    }
 }

-func get_profile_url(picture: String?, pubkey: String, profiles: Profiles, contacts: Contacts) -> URL {
-    var pic: String
-    let remote_image_policy: RemoteImagePolicy = RemoteImagePolicy(rawValue: UserDefaults.standard.string(forKey: "remote_image_policy") ?? "") ?? .friendsOfFriends
-    
-    if pubkey == contacts.our_pubkey ||
-       remote_image_policy == .everyone ||
-       remote_image_policy == .friendsOnly && contacts.is_friend(pubkey) ||
-       remote_image_policy == .friendsOfFriends && contacts.is_in_friendosphere(pubkey) {
-        pic = picture ?? profiles.lookup(id: pubkey)?.picture ?? robohash(pubkey)
-    } else {
-        pic = robohash(pubkey)
-    }
-    
+func get_profile_url(picture: String?, pubkey: String, profiles: Profiles) -> URL {
+    let pic = picture ?? profiles.lookup(id: pubkey)?.picture ?? robohash(pubkey)
    if let url = URL(string: pic) {
        return url
    }
@@ -163,8 +150,7 @@ struct ProfilePicView_Previews: PreviewProvider {
            pubkey: pubkey,
            size: 100,
            highlight: .none,
-            profiles: make_preview_profiles(pubkey),
-            contacts: Contacts(our_pubkey: pubkey))
+            profiles: make_preview_profiles(pubkey))
    }
 }

@@ -13,7 +13,7 @@ struct ProfilePictureSelector: View {
    var body: some View {
        let highlight: Highlight = .custom(Color.white, 2.0)
        ZStack {
-            ProfilePicView(pubkey: pubkey, size: 80.0, highlight: highlight, profiles: Profiles(), contacts: Contacts(our_pubkey: pubkey))
+            ProfilePicView(pubkey: pubkey, size: 80.0, highlight: highlight, profiles: Profiles())
        }
    }
 }
@@ -19,7 +19,7 @@ enum FollowState {
    case unfollows
 }

-func follow_btn_txt(_ fs: FollowState) -> String {
+func follow_btn_txt(_ fs: FollowState, follows_you: Bool) -> String {
    switch fs {
    case .follows:
        return NSLocalizedString("Unfollow", comment: "Button to unfollow a user.")
@@ -28,7 +28,11 @@ func follow_btn_txt(_ fs: FollowState) -> String {
    case .unfollowing:
        return NSLocalizedString("Unfollowing...", comment: "Label to indicate that the user is in the process of unfollowing another user.")
    case .unfollows:
-        return NSLocalizedString("Follow", comment: "Button to follow a user.")
+        if follows_you {
+            return NSLocalizedString("Follow Back", comment: "Button to follow a user back.")
+        } else {
+            return NSLocalizedString("Follow", comment: "Button to follow a user.")
+        }
    }
 }

@@ -45,35 +49,6 @@ func follow_btn_enabled_state(_ fs: FollowState) -> Bool {
    }
 }

-struct ProfileNameView: View {
-    let pubkey: String
-    let profile: Profile?
-    let damus: DamusState
-    
-    var body: some View {
-        Group {
-            if let real_name = profile?.display_name {
-                VStack(alignment: .leading) {
-                    Text(real_name)
-                        .font(.title3.weight(.bold))
-                    ProfileName(pubkey: pubkey, profile: profile, prefix: "@", damus: damus, show_friend_confirmed: true)
-                        .font(.callout)
-                        .foregroundColor(.gray)
-                    KeyView(pubkey: pubkey)
-                        .pubkey_context_menu(bech32_pubkey: pubkey)
-                }
-            } else {
-                VStack(alignment: .leading) {
-                    ProfileName(pubkey: pubkey, profile: profile, damus: damus, show_friend_confirmed: true)
-                        .font(.title3.weight(.bold))
-                    KeyView(pubkey: pubkey)
-                        .pubkey_context_menu(bech32_pubkey: pubkey)
-                }
-            }
-        }
-    }
-}
-
 struct EditButton: View {
    let damus_state: DamusState
    
@@ -239,6 +214,61 @@ struct ProfileView: View {
        return 0
    }
    
+    func ActionSection(profile_data: Profile?) -> some View {
+        return Group {
+            ActionSheetButton
+            
+            if let profile = profile_data {
+                if let lnurl = profile.lnurl, lnurl != "" {
+                    LNButton(lnurl: lnurl, profile: profile)
+                }
+            }
+            
+            DMButton
+            
+            if profile.pubkey != damus_state.pubkey {
+                FollowButtonView(
+                    target: profile.get_follow_target(),
+                    follows_you: profile.follows(pubkey: damus_state.pubkey),
+                    follow_state: damus_state.contacts.follow_state(profile.pubkey)
+                )
+            } else if damus_state.keypair.privkey != nil {
+                NavigationLink(destination: EditMetadataView(damus_state: damus_state)) {
+                    EditButton(damus_state: damus_state)
+                }
+            }
+            
+        }
+    }
+    
+    func NameSection(profile_data: Profile?) -> some View {
+        return Group {
+            HStack(alignment: .center) {
+                ProfilePicView(pubkey: profile.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles)
+                    .onTapGesture {
+                        is_zoomed.toggle()
+                    }
+                    .fullScreenCover(isPresented: $is_zoomed) {
+                        ProfileZoomView(pubkey: profile.pubkey, profiles: damus_state.profiles)                        }
+                    .offset(y: -(pfp_size/2.0)) // Increase if set a frame
+                
+                Spacer()
+                
+                ActionSection(profile_data: profile_data)
+                    .offset(y: -15.0) // Increase if set a frame
+            }
+            
+            let follows_you = profile.follows(pubkey: damus_state.pubkey)
+            ProfileNameView(pubkey: profile.pubkey, profile: profile_data, follows_you: follows_you, damus: damus_state)
+            //.padding(.bottom)
+                .padding(.top,-(pfp_size/2.0))
+        }
+    }
+    
+    var pfp_size: CGFloat {
+        return 90.0
+    }
+    
    var TopSection: some View {
        ZStack(alignment: .top) {
            GeometryReader { geometry in
@@ -251,55 +281,14 @@ struct ProfileView: View {
            }.frame(height: BANNER_HEIGHT)
            
            VStack(alignment: .leading, spacing: 8.0) {
-                let data = damus_state.profiles.lookup(id: profile.pubkey)
-                let pfp_size: CGFloat = 90.0
+                let profile_data = damus_state.profiles.lookup(id: profile.pubkey)
                
-                HStack(alignment: .center) {
-                    ProfilePicView(pubkey: profile.pubkey, size: pfp_size, highlight: .custom(imageBorderColor(), 4.0), profiles: damus_state.profiles, contacts: damus_state.contacts)
-                        .onTapGesture {
-                            is_zoomed.toggle()
-                        }
-                        .fullScreenCover(isPresented: $is_zoomed) {
-                            ProfileZoomView(pubkey: profile.pubkey, profiles: damus_state.profiles, contacts: damus_state.contacts)}
-                        .offset(y: -(pfp_size/2.0)) // Increase if set a frame
-                    
-                    Spacer()
-                    
-                    Group {
-                        ActionSheetButton
-                        
-                        if let profile = data {
-                            if let lnurl = profile.lnurl, lnurl != "" {
-                                LNButton(lnurl: lnurl, profile: profile)
-                            }
-                        }
-                        
-                        DMButton
-                        
-                        if profile.pubkey != damus_state.pubkey {
-                            FollowButtonView(
-                                target: profile.get_follow_target(),
-                                follow_state: damus_state.contacts.follow_state(profile.pubkey)
-                            )
-                        } else if damus_state.keypair.privkey != nil {
-                            NavigationLink(destination: EditMetadataView(damus_state: damus_state)) {
-                                EditButton(damus_state: damus_state)
-                            }
-                        }
-                        
-                    }
-                    .offset(y: -15.0) // Increase if set a frame
-                    
-                }
-                               
-                ProfileNameView(pubkey: profile.pubkey, profile: data, damus: damus_state)
-                    //.padding(.bottom)
-                    .padding(.top,-(pfp_size/2.0))
+                NameSection(profile_data: profile_data)
                
-                Text(ProfileView.markdown.process(data?.about ?? ""))
+                Text(ProfileView.markdown.process(profile_data?.about ?? ""))
                    .font(.subheadline).textSelection(.enabled)
                
-                if let url = data?.website_url {
+                if let url = profile_data?.website_url {
                    WebsiteLink(url: url)
                }
                
@@ -333,10 +322,19 @@ struct ProfileView: View {
                    }
                    
                    if let relays = profile.relays {
-                        NavigationLink(destination: UserRelaysView(state: damus_state, pubkey: profile.pubkey, relays: Array(relays.keys).sorted())) {
-                            Text("\(Text("\(relays.keys.count)", comment: "Number of relay servers a user is connected.").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("relays_count", comment: "Part of a larger sentence to describe how many relay servers a user is connected."), relays.keys.count)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'.")
+                        // Only open relay config view if the user is logged in with private key and they are looking at their own profile.
+                        let relay_text = Text("\(Text("\(relays.keys.count)", comment: "Number of relay servers a user is connected.").font(.subheadline.weight(.medium))) \(Text(String(format: NSLocalizedString("relays_count", comment: "Part of a larger sentence to describe how many relay servers a user is connected."), relays.keys.count)).font(.subheadline).foregroundColor(.gray))", comment: "Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'.")
+                        if profile.pubkey == damus_state.pubkey && damus_state.is_privkey_user {
+                            NavigationLink(destination: RelayConfigView(state: damus_state)) {
+                                relay_text
+                            }
+                            .buttonStyle(PlainButtonStyle())
+                        } else {
+                            NavigationLink(destination: UserRelaysView(state: damus_state, pubkey: profile.pubkey, relays: Array(relays.keys).sorted())) {
+                                relay_text
+                            }
+                            .buttonStyle(PlainButtonStyle())
                        }
-                        .buttonStyle(PlainButtonStyle())
                    }
                }
            }
@@ -11,7 +11,6 @@ struct ProfileZoomView: View {
    @Environment(\.presentationMode) var presentationMode
    let pubkey: String
    let profiles: Profiles
-    let contacts: Contacts

    @GestureState private var scaleState: CGFloat = 1
    @GestureState private var offsetState = CGSize.zero
@@ -69,7 +68,7 @@ struct ProfileZoomView: View {

                Spacer()
                
-                ProfilePicView(pubkey: pubkey, size: 200.0, highlight: .none, profiles: profiles, contacts: contacts)
+                ProfilePicView(pubkey: pubkey, size: 200.0, highlight: .none, profiles: profiles)
                    .padding(100)
                    .scaledToFit()
                    .scaleEffect(self.scale * scaleState)
@@ -93,8 +92,6 @@ struct ProfileZoomView_Previews: PreviewProvider {
    static var previews: some View {
        ProfileZoomView(
            pubkey: pubkey,
-            profiles: make_preview_profiles(pubkey),
-            contacts: Contacts(our_pubkey: pubkey)
-        )
+            profiles: make_preview_profiles(pubkey))
    }
 }
@@ -42,7 +42,7 @@ struct QRCodeView: View {
                let profile = damus_state.profiles.lookup(id: damus_state.pubkey)
                
                if (damus_state.profiles.lookup(id: damus_state.pubkey)?.picture) != nil {
-                    ProfilePicView(pubkey: damus_state.pubkey, size: 90.0, highlight: .custom(Color("DamusWhite"), 4.0), profiles: damus_state.profiles, contacts: damus_state.contacts)
+                    ProfilePicView(pubkey: damus_state.pubkey, size: 90.0, highlight: .custom(Color("DamusWhite"), 4.0), profiles: damus_state.profiles)
                        .padding(.top, 50)
                } else {
                    Image(systemName: "person.fill")
@@ -79,12 +79,12 @@ struct QRCodeView: View {
                
                Spacer()
                
-                Text("Follow me on nostr")
+                Text("Follow me on nostr", comment: "Text on QR code view to prompt viewer looking at screen to follow the user.")
                    .foregroundColor(Color("DamusWhite"))
                    .font(.system(size: 24, weight: .heavy))
                    .padding(.top)
                
-                Text("Scan the code")
+                Text("Scan the code", comment: "Text on QR code view to prompt viewer to scan the QR code on screen with their device camera.")
                    .foregroundColor(Color("DamusWhite"))
                    .font(.system(size: 18, weight: .ultraLight))
                
@@ -0,0 +1,44 @@
+//
+//  RelayFilterView.swift
+//  damus
+//
+//  Created by Ben Weeks on 1/8/23.
+//
+
+import SwiftUI
+
+struct RelayFilterView: View {
+    let state: DamusState
+    let timeline: Timeline
+    //@State var relays: [RelayDescriptor]
+    //@EnvironmentObject var user_settings: UserSettingsStore
+    //@State var relays: [RelayDescriptor]
+    
+    init(state: DamusState, timeline: Timeline) {
+        self.state = state
+        self.timeline = timeline
+        
+        //_relays = State(initialValue: state.pool.descriptors)
+    }
+    
+    var relays: [RelayDescriptor] {
+        return state.pool.descriptors
+    }
+    
+    var body: some View {
+        Text("To filter your \(timeline.rawValue) feed, please choose applicable relays from the list below:")
+            .padding()
+            .padding(.top, 20)
+            .padding(.bottom, 0)
+        
+        List(Array(relays), id: \.url) { relay in
+            RelayToggle(state: state, timeline: timeline, relay_id: relay.url.absoluteString)
+        }
+    }
+}
+
+struct RelayFilterView_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayFilterView(state: test_damus_state(), timeline: .search)
+    }
+}
@@ -0,0 +1,33 @@
+//
+//  RelayPaidDetail.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import SwiftUI
+
+struct RelayPaidDetail: View {
+    let payments_url: String?
+    
+    @Environment(\.openURL) var openURL
+    
+    var body: some View {
+        HStack {
+            RelayType(is_paid: true)
+            if let url = payments_url.flatMap({ URL(string: $0) }) {
+                Button(action: {
+                    openURL(url)
+                }, label: {
+                    Text("\(url)")
+                })
+            }
+        }
+    }
+}
+
+struct RelayPaidDetail_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayPaidDetail(payments_url: "https://jb55.com")
+    }
+}
@@ -37,7 +37,7 @@ struct RecommendedRelayView: View {
                        guard let ev_after_add = add_relay(ev: ev_before_add, privkey: privkey, current_relays: damus.pool.descriptors, relay: relay, info: .rw) else {
                            return
                        }
-                        process_contact_event(pool: damus.pool, contacts: damus.contacts, pubkey: damus.pubkey, ev: ev_after_add)
+                        process_contact_event(state: damus, ev: ev_after_add)
                        damus.pool.send(.event(ev_after_add))
                    }
                }
@@ -13,6 +13,8 @@ struct RelayConfigView: View {
    @State var show_add_relay: Bool = false
    @State var relays: [RelayDescriptor]
    
+    @Environment(\.dismiss) var dismiss
+    
    init(state: DamusState) {
        self.state = state
        _relays = State(initialValue: state.pool.descriptors)
@@ -33,6 +35,9 @@ struct RelayConfigView: View {
        .onReceive(handle_notify(.relays_changed)) { _ in
            self.relays = state.pool.descriptors
        }
+        .onReceive(handle_notify(.switched_timeline)) { _ in
+            dismiss()
+        }
        .sheet(isPresented: $show_add_relay) {
            AddRelayView(show_add_relay: $show_add_relay, relay: $new_relay) { m_relay in
                guard var relay = m_relay else {
@@ -67,7 +72,7 @@ struct RelayConfigView: View {
                    return
                }
                
-                process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: ev)
+                process_contact_event(state: state, ev: ev)
                
                state.pool.send(.event(new_ev))
            }
@@ -0,0 +1,96 @@
+//
+//  RelayDetailView.swift
+//  damus
+//
+//  Created by Joel Klabo on 2/1/23.
+//
+
+import SwiftUI
+
+struct RelayDetailView: View {
+    let state: DamusState
+    let relay: String
+    let nip11: RelayMetadata
+    
+    @State private var errorString: String?
+    
+    @Environment(\.dismiss) var dismiss
+    
+    func FieldText(_ str: String?) -> some View {
+        Text(str ?? "No data available")
+    }
+    
+    var body: some View {
+        Group {
+            Form {
+                if let pubkey = nip11.pubkey {
+                    Section(NSLocalizedString("Admin", comment: "Label to display relay contact user.")) {
+                        UserView(damus_state: state, pubkey: pubkey)
+                    }
+                }
+                Section(NSLocalizedString("Relay", comment: "Label to display relay address.")) {
+                    HStack {
+                        Text(relay)
+                        Spacer()
+                        RelayStatus(pool: state.pool, relay: relay)
+                    }
+                }
+                if nip11.is_paid {
+                    Section(content: {
+                        RelayPaidDetail(payments_url: nip11.payments_url)
+                    }, header: {
+                        Text("Paid Relay")
+                    }, footer: {
+                        Text("This is a paid relay, you must pay for posts to be accepted.")
+                    })
+                }
+                
+                Section(NSLocalizedString("Description", comment: "Label to display relay description.")) {
+                    FieldText(nip11.description)
+                }
+                Section(NSLocalizedString("Contact", comment: "Label to display relay contact information.")) {
+                    FieldText(nip11.contact)
+                }
+                Section(NSLocalizedString("Software", comment: "Label to display relay software.")) {
+                    FieldText(nip11.software)
+                }
+                Section(NSLocalizedString("Version", comment: "Label to display relay software version.")) {
+                    FieldText(nip11.version)
+                }
+                if let nips = nip11.supported_nips, nips.count > 0 {
+                    Section(NSLocalizedString("Supported NIPs", comment: "Label to display relay's supported NIPs.")) {
+                        Text(nipsList(nips: nips))
+                    }
+                }
+            }
+        }
+        .onReceive(handle_notify(.switched_timeline)) { notif in
+            dismiss()
+        }
+        .navigationTitle(nip11.name ?? "")
+    }
+    
+    private func nipsList(nips: [Int]) -> AttributedString {
+        var attrString = AttributedString()
+        let lastNipIndex = nips.count - 1
+        for (index, nip) in nips.enumerated() {
+            if let link = NIPURLBuilder.url(forNIP: nip) {
+                let nipString = NIPURLBuilder.formatNipNumber(nip: nip)
+                var nipAttrString = AttributedString(stringLiteral: nipString)
+                nipAttrString.link = link
+                attrString = attrString + nipAttrString
+                if index < lastNipIndex {
+                    attrString = attrString + AttributedString(stringLiteral: ", ")
+                }
+            }
+        }
+        return attrString
+    }
+}
+
+struct RelayDetailView_Previews: PreviewProvider {
+    static var previews: some View {
+        let metadata = RelayMetadata(name: "name", description: "desc", pubkey: "pubkey", contact: "contact", supported_nips: [1,2,3], software: "software", version: "version", limitation: Limitations.empty, payments_url: "https://jb55.com")
+        RelayDetailView(state: test_damus_state(), relay: "relay", nip11: metadata)
+    }
+}
@@ -0,0 +1,50 @@
+//
+//  RelayStatus.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import SwiftUI
+
+struct RelayStatus: View {
+    let pool: RelayPool
+    let relay: String
+    
+    let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
+    
+    @State var conn_color: Color = .gray
+    
+    func update_connection_color() {
+        for relay in pool.relays {
+            if relay.id == self.relay {
+                let c = relay.connection
+                if c.isConnected {
+                    conn_color = .green
+                } else if c.isConnecting || c.isReconnecting {
+                    conn_color = .yellow
+                } else {
+                    conn_color = .red
+                }
+            }
+        }
+    }
+    
+    var body: some View {
+        Circle()
+            .frame(width: 8.0, height: 8.0)
+            .foregroundColor(conn_color)
+            .onReceive(timer) { _ in
+                update_connection_color()
+            }
+            .onAppear() {
+                update_connection_color()
+            }
+    }
+}
+
+struct RelayStatus_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayStatus(pool: test_damus_state().pool, relay: "relay")
+    }
+}
@@ -0,0 +1,42 @@
+//
+//  RelayToggle.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import SwiftUI
+
+struct RelayToggle: View {
+    let state: DamusState
+    let timeline: Timeline
+    let relay_id: String
+    
+    func toggle_binding(relay_id: String) -> Binding<Bool> {
+        return Binding(get: {
+            !state.relay_filters.is_filtered(timeline: timeline, relay_id: relay_id)
+        }, set: { on in
+            if !on {
+                state.relay_filters.insert(timeline: timeline, relay_id: relay_id)
+            } else {
+                state.relay_filters.remove(timeline: timeline, relay_id: relay_id)
+            }
+        })
+    }
+    
+    var body: some View {
+        HStack {
+            RelayStatus(pool: state.pool, relay: relay_id)
+            RelayType(is_paid: state.relay_metadata.lookup(relay_id: relay_id)?.is_paid ?? false)
+            Toggle(relay_id, isOn: toggle_binding(relay_id: relay_id))
+                .toggleStyle(SwitchToggleStyle(tint: .accentColor))
+        }
+    }
+}
+
+struct RelayToggle_Previews: PreviewProvider {
+    static var previews: some View {
+        RelayToggle(state: test_damus_state(), timeline: .search, relay_id: "wss://jb55.com")
+            .padding()
+    }
+}
@@ -0,0 +1,27 @@
+//
+//  RelayType.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import SwiftUI
+
+struct RelayType: View {
+    let is_paid: Bool
+    
+    var body: some View {
+
+        Image(systemName: is_paid ? "dollarsign.circle.fill" : "globe.americas.fill")
+            .foregroundColor(is_paid ? Color("DamusGreen") : .gray)
+    }
+}
+
+struct RelayType_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack {
+            RelayType(is_paid: false)
+            RelayType(is_paid: true)
+        }
+    }
+}
@@ -11,37 +11,22 @@ struct RelayView: View {
    let state: DamusState
    let relay: String
    
-    let timer = Timer.publish(every: 2, on: .main, in: .common).autoconnect()
-    @State var conn_color: Color = .gray
-    
-    func update_connection_color() {
-        for relay in state.pool.relays {
-            if relay.id == self.relay {
-                let c = relay.connection
-                if c.isConnected {
-                    conn_color = .green
-                } else if c.isConnecting || c.isReconnecting {
-                    conn_color = .yellow
+    var body: some View {
+        Group {
+            HStack {
+                RelayStatus(pool: state.pool, relay: relay)
+                RelayType(is_paid: state.relay_metadata.lookup(relay_id: relay)?.is_paid ?? false)
+                if let meta = state.relay_metadata.lookup(relay_id: relay) {
+                    NavigationLink {
+                        RelayDetailView(state: state, relay: relay, nip11: meta)
+                    } label: {
+                        Text(relay)
+                    }
                } else {
-                    conn_color = .red
+                    Text(relay)
                }
            }
        }
-    }
-    
-    var body: some View {
-        HStack {
-            Circle()
-                .frame(width: 8.0, height: 8.0)
-                .foregroundColor(conn_color)
-            Text(relay)
-        }
-        .onReceive(timer) { _ in
-            update_connection_color()
-        }
-        .onAppear() {
-            update_connection_color()
-        }
        .swipeActions {
            if let privkey = state.keypair.privkey {
                RemoveAction(privkey: privkey)
@@ -75,7 +60,7 @@ struct RelayView: View {
                return
            }
            
-            process_contact_event(pool: state.pool, contacts: state.contacts, pubkey: state.pubkey, ev: new_ev)
+            process_contact_event(state: state, ev: new_ev)
            state.pool.send(.event(new_ev))
        } label: {
            Label(NSLocalizedString("Delete", comment: "Button to delete a relay server that the user connects to."), systemImage: "trash")
@@ -86,6 +71,6 @@ struct RelayView: View {

 struct RelayView_Previews: PreviewProvider {
    static var previews: some View {
-        RelayView(state: test_damus_state(), relay: "wss://relay.damus.io", conn_color: .red)
+        RelayView(state: test_damus_state(), relay: "wss://relay.damus.io")
    }
 }
@@ -15,6 +15,9 @@ struct SaveKeysView: View {
    @State var priv_copied: Bool = false
    @State var loading: Bool = false
    @State var error: String? = nil
+
+    @FocusState var pubkey_focused: Bool
+    @FocusState var privkey_focused: Bool
    
    var body: some View {
        ZStack(alignment: .top) {
@@ -39,7 +42,7 @@ struct SaveKeysView: View {
                    .foregroundColor(.white)
                    .padding(.bottom, 10)
                
-                SaveKeyView(text: account.pubkey_bech32, is_copied: $pub_copied)
+                SaveKeyView(text: account.pubkey_bech32, textContentType: .username, is_copied: $pub_copied, focus: $pubkey_focused)
                    .padding(.bottom, 10)
                
                if pub_copied {
@@ -52,7 +55,7 @@ struct SaveKeysView: View {
                        .foregroundColor(.white)
                        .padding(.bottom, 10)
                    
-                    SaveKeyView(text: account.privkey_bech32, is_copied: $priv_copied)
+                    SaveKeyView(text: account.privkey_bech32, textContentType: .newPassword, is_copied: $priv_copied, focus: $privkey_focused)
                        .padding(.bottom, 10)
                }
                
@@ -77,6 +80,13 @@ struct SaveKeysView: View {
        }
        .navigationBarBackButtonHidden(true)
        .navigationBarItems(leading: BackNav())
+        .onAppear {
+            // Hack to force keyboard to show up for a short moment and then hiding it to register password autofill flow.
+            pubkey_focused = true
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                pubkey_focused = false
+            }
+        }
    }
    
    func complete_account_creation(_ account: CreateAccountModel) {
@@ -138,7 +148,9 @@ struct SaveKeysView: View {

 struct SaveKeyView: View {
    let text: String
+    let textContentType: UITextContentType
    @Binding var is_copied: Bool
+    var focus: FocusState<Bool>.Binding
    
    func copy_text() {
        UIPasteboard.general.string = text
@@ -166,8 +178,8 @@ struct SaveKeyView: View {
                        }
                }
            }
-          
-            Text(text)
+
+            TextField("", text: .constant(text))
                .padding(5)
                .background {
                    RoundedRectangle(cornerRadius: 4.0).opacity(0.2)
@@ -177,7 +189,14 @@ struct SaveKeyView: View {
                .foregroundColor(.white)
                .onTapGesture {
                    copy_text()
+                    // Hack to force keyboard to hide. Showing keyboard on text field is necessary to register password autofill flow but the text itself should not be modified.
+                    DispatchQueue.main.async {
+                        end_editing()
+                    }
                }
+                .textContentType(textContentType)
+                .deleteDisabled(true)
+                .focused(focus)
            
            spacerBlock(width: 0, height: 0) /// set a 'width' > 0 here to vary key Text's aspect ratio
        }
@@ -35,7 +35,7 @@ struct SearchResultsView: View {
                        }
                    }
                case .hashtag(let ht):
-                    let search_model = SearchModel(pool: damus_state.pool, search: .filter_hashtag([ht]))
+                    let search_model = SearchModel(contacts: damus_state.contacts, pool: damus_state.pool, search: .filter_hashtag([ht]))
                    let dst = SearchView(appstate: damus_state, search: search_model)
                    NavigationLink(destination: dst) {
                        Text("Search hashtag: #\(ht)", comment: "Navigation link to search hashtag.")
@@ -25,6 +25,9 @@ struct SearchView: View {
            .onDisappear() {
                search.unsubscribe()
            }
+            .onReceive(handle_notify(.new_mutes)) { notif in
+                search.filter_muted()
+            }
    }
 }

@@ -43,7 +46,7 @@ struct SearchView_Previews: PreviewProvider {
        let filter = NostrFilter.filter_hashtag(["bitcoin"])
        let pool = test_state.pool
        
-        let model = SearchModel(pool: pool, search: filter)
+        let model = SearchModel(contacts: test_state.contacts, pool: pool, search: filter)
        
        SearchView(appstate: test_state, search: model)
    }
@@ -17,6 +17,7 @@ struct SideMenuView: View {
    @Environment(\.colorScheme) var colorScheme
    
    var sideBarWidth = min(UIScreen.main.bounds.size.width * 0.65, 400.0)
+    let verticalSpacing: CGFloat = 20
    
    func fillColor() -> Color {
        colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
@@ -33,104 +34,86 @@ struct SideMenuView: View {
            }
            .background(Color("DamusDarkGrey").opacity(0.6))
            .opacity(isSidebarVisible ? 1 : 0)
-            .animation(.easeInOut.delay(0.2), value: isSidebarVisible)
+            .animation(.default, value: isSidebarVisible)
            .onTapGesture {
                isSidebarVisible.toggle()
            }
            content
        }
-        .edgesIgnoringSafeArea(.all)
-
    }
    
    var content: some View {
        HStack(alignment: .top) {
            ZStack(alignment: .top) {
                fillColor()
-
-                VStack(alignment: .leading, spacing: 20) {
-                    let profile = damus_state.profiles.lookup(id: damus_state.pubkey)
-                    let followers = FollowersModel(damus_state: damus_state, target: damus_state.pubkey)
-                    let profile_model = ProfileModel(pubkey: damus_state.pubkey, damus: damus_state)
+                    .ignoresSafeArea()
+                
+                VStack(alignment: .leading, spacing: 0) {
                    
-                    NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
-                        if let picture = damus_state.profiles.lookup(id: damus_state.pubkey)?.picture {
-                            ProfilePicView(pubkey: damus_state.pubkey, size: 60, highlight: .none, profiles: damus_state.profiles, contacts: damus_state.contacts, picture: picture)
-                        } else {
-                            Image(systemName: "person.fill")
+                    VStack(alignment: .leading, spacing: 0) {
+                        let profile = damus_state.profiles.lookup(id: damus_state.pubkey)
+                        let followers = FollowersModel(damus_state: damus_state, target: damus_state.pubkey)
+                        let profile_model = ProfileModel(pubkey: damus_state.pubkey, damus: damus_state)
+                        
+                        NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
+                            
+                            HStack {
+                                ProfilePicView(pubkey: damus_state.pubkey, size: 60, highlight: .none, profiles: damus_state.profiles)
+                                
+                                VStack(alignment: .leading) {
+                                    if let display_name = profile?.display_name {
+                                        Text(display_name)
+                                            .foregroundColor(textColor())
+                                            .font(.title)
+                                            .lineLimit(1)
+                                    }
+                                    if let name = profile?.name {
+                                        Text("@" + name)
+                                            .foregroundColor(Color("DamusMediumGrey"))
+                                            .font(.body)
+                                            .lineLimit(1)
+                                    }
+                                }
+                            }
+                            .padding(.bottom, verticalSpacing)
                        }
-                        VStack(alignment: .leading) {
-                            if let display_name = profile?.display_name {
-                                Text(display_name)
-                                    .foregroundColor(textColor())
-                                    .font(.title)
-                            }
-                            if let name = profile?.name {
-                                Text("@" + name)
-                                    .foregroundColor(Color("DamusMediumGrey"))
-                                    .font(.body)
+                        
+                        Divider()
+                        
+                        ScrollView {
+                            VStack(spacing: verticalSpacing) {
+                                NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
+                                    navLabel(title: NSLocalizedString("Profile", comment: "Sidebar menu label for Profile view."), systemImage: "person")
+                                }
+                                
+                                /*
+                                NavigationLink(destination: EmptyView()) {
+                                    navLabel(title: NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), systemImage: "bolt")
+                                }
+                                */
+                                 
+                                NavigationLink(destination: MutelistView(damus_state: damus_state, users: get_mutelist_users(damus_state.contacts.mutelist) )) {
+                                    navLabel(title: NSLocalizedString("Blocked", comment: "Sidebar menu label for Profile view."), systemImage: "exclamationmark.octagon")
+                                }
+                                
+                                NavigationLink(destination: RelayConfigView(state: damus_state)) {
+                                    navLabel(title: NSLocalizedString("Relays", comment: "Sidebar menu label for Relays view."), systemImage: "network")
+                                }
+                                
+                                NavigationLink(destination: ConfigView(state: damus_state)) {
+                                    navLabel(title: NSLocalizedString("Settings", comment: "Sidebar menu label for accessing the app settings"), systemImage: "gear")
+                                }
                            }
+                            .padding([.top, .bottom], verticalSpacing)
                        }
                    }
+                    .simultaneousGesture(TapGesture().onEnded {
+                        isSidebarVisible = false
+                    })
                    
                    Divider()
-                        .padding(.trailing,40)
-
-                    NavigationLink(destination: ProfileView(damus_state: damus_state, profile: profile_model, followers: followers)) {
-                        Label(NSLocalizedString("Profile", comment: "Sidebar menu label for Profile view."), systemImage: "person")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    .simultaneousGesture(TapGesture().onEnded {
-                        isSidebarVisible = false
-                    })
                    
-                    /*
-                    NavigationLink(destination: EmptyView()) {
-                        Label(NSLocalizedString("Relays", comment: "Sidebar menu label for Relay servers view"), systemImage: "xserve")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    .simultaneousGesture(TapGesture().onEnded {
-                        isSidebarVisible.toggle()
-                    })
-                    */
-                    
-                    /*
-                    NavigationLink(destination: EmptyView()) {
-                        Label(NSLocalizedString("Wallet", comment: "Sidebar menu label for Wallet view."), systemImage: "bolt")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    .simultaneousGesture(TapGesture().onEnded {
-                        isSidebarVisible.toggle()
-                    })
-                     */
-                    
-                    NavigationLink(destination: MutelistView(damus_state: damus_state, users: get_mutelist_users(damus_state.contacts.mutelist) )) {
-                        Label(NSLocalizedString("Blocked", comment: "Sidebar menu label for Profile view."), systemImage: "exclamationmark.octagon")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    
-                    NavigationLink(destination: RelayConfigView(state: damus_state)) {
-                        Label(NSLocalizedString("Relays", comment: "Sidebar menu label for Relays view."), systemImage: "network")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    
-                    NavigationLink(destination: ConfigView(state: damus_state)) {
-                        Label(NSLocalizedString("Settings", comment: "Sidebar menu label for accessing the app settings"), systemImage: "gear")
-                            .font(.title2)
-                            .foregroundColor(textColor())
-                    }
-                    .simultaneousGesture(TapGesture().onEnded {
-                        isSidebarVisible = false
-                    })
-                    
-                    Spacer()
-                    
-                    HStack(alignment: .center) {
+                    HStack() {
                        Button(action: {
                            //ConfigView(state: damus_state)
                            if damus_state.keypair.privkey == nil {
@@ -142,6 +125,7 @@ struct SideMenuView: View {
                            Label(NSLocalizedString("Sign out", comment: "Sidebar menu label to sign out of the account."), systemImage: "pip.exit")
                                .font(.title3)
                                .foregroundColor(textColor())
+                                .frame(maxWidth: .infinity, alignment: .leading)
                        })
                        
                        Spacer()
@@ -152,22 +136,18 @@ struct SideMenuView: View {
                            Label(NSLocalizedString("", comment: "Sidebar menu label for accessing QRCode view"), systemImage: "qrcode")
                                .font(.title)
                                .foregroundColor(textColor())
-                                .padding(.trailing, 20)
                        }).fullScreenCover(isPresented: $showQRCode) {
                            QRCodeView(damus_state: damus_state)
                        }
                    }
+                    .padding(.top, verticalSpacing)
                }
-                .padding(.top, 60)
-                .padding(.bottom, 40)
-                .padding(.leading, 40)
+                .padding(.top, -15)
+                .padding([.leading, .trailing, .bottom], 30)
            }
            .frame(width: sideBarWidth)
            .offset(x: isSidebarVisible ? 0 : -sideBarWidth)
            .animation(.default, value: isSidebarVisible)
-            .onTapGesture {
-                isSidebarVisible.toggle()
-            }
            .alert("Logout", isPresented: $confirm_logout) {
                Button(NSLocalizedString("Cancel", comment: "Cancel out of logging out the user."), role: .cancel) {
                    confirm_logout = false
@@ -182,6 +162,15 @@ struct SideMenuView: View {
            Spacer()
        }
    }
+    
+    
+    @ViewBuilder
+    func navLabel(title: String, systemImage: String) -> some View {
+        Label(title, systemImage: systemImage)
+            .font(.title2)
+            .foregroundColor(textColor())
+            .frame(maxWidth: .infinity, alignment: .leading)
+    }
 }

 struct Previews_SideMenuView_Previews: PreviewProvider {
@@ -47,6 +47,7 @@ struct BuildThreadV2View: View {
    @State var thread: ThreadV2? = nil
    
    @State var current_events_uuid: String = ""
+    @State var extra_events_uuid: String = ""
    @State var childs_events_uuid: String = ""
    @State var parents_events_uuids: [String] = []
    
@@ -197,13 +198,15 @@ struct BuildThreadV2View: View {
        self.unsubscribe_all()
        print("ThreadV2View: Reload!")
        
+        var extra = NostrFilter.filter_kinds([9735, 6, 7])
+        extra.referenced_ids = [ self.event_id ]
+        
        // Get the current event
        current_events_uuid = subscribe(filters: [
-            NostrFilter(
-                ids: [self.event_id],
-                limit: 1
-            )
+            NostrFilter(ids: [self.event_id], limit: 1)
        ])
+        
+        extra_events_uuid = subscribe(filters: [extra])
        print("subscribing to threadV2 \(event_id) with sub_id \(current_events_uuid)")
    }
    
@@ -1,99 +0,0 @@
-//
-//  ThreadView.swift
-//  damus
-//
-//  Created by William Casarin on 2022-04-19.
-//
-
-import SwiftUI
-
-
-struct ThreadView: View {
-    @StateObject var thread: ThreadModel
-    let damus: DamusState
-    @State var is_chatroom: Bool
-    @State var metadata: ChatroomMetadata? = nil
-    @State var seen_first: Bool = false
-    
-    @Environment(\.dismiss) var dismiss
-    
-    var body: some View {
-        Group {
-            if is_chatroom {
-                ChatroomView(damus: damus)
-                    .navigationBarTitle(metadata?.name ?? NSLocalizedString("Chat", comment: "Navigation bar title for Chatroom view."))
-                    .environmentObject(thread)
-            } else {
-                EventDetailView(damus: damus, thread: thread)
-                    .navigationBarTitle(metadata?.name ?? NSLocalizedString("Thread", comment: "Navigation bar title for threaded event detail view."))
-                    .environmentObject(thread)
-            }
-            
-            /*
-            NavigationLink(destination: edv, isActive: $is_chatroom) {
-                EmptyView()
-            }
-             */
-        }
-        .onReceive(handle_notify(.switched_timeline)) { n in
-            dismiss()
-        }
-        .onReceive(handle_notify(.toggle_thread_view)) { _ in
-            is_chatroom = !is_chatroom
-            //print("is_chatroom: \(is_chatroom)")
-        }
-        .onReceive(handle_notify(.chatroom_meta)) { n in
-            let meta = n.object as! ChatroomMetadata
-            self.metadata = meta
-        }
-        .onChange(of: thread.events) { val in
-            if seen_first {
-                return
-            }
-            if let ev = thread.events.first {
-                guard ev.is_root_event() else {
-                    return
-                }
-                seen_first = true
-                is_chatroom = should_show_chatroom(ev) 
-            }
-        }
-        .onAppear() {
-            thread.subscribe()
-        }
-        .onDisappear() {
-            thread.unsubscribe()
-        }
-    }
-}
-
-/*
-struct ThreadView_Previews: PreviewProvider {
-    static var previews: some View {
-        ThreadView()
-    }
-}
-*/
-
-func should_show_chatroom(_ ev: NostrEvent) -> Bool {
-    if ev.known_kind == .chat || ev.known_kind == .channel_create {
-        return true
-    }
-    
-    return has_hashtag(ev.tags, hashtag: "chat")
-}
-
-func tag_is_hashtag(_ tag: [String]) -> Bool {
-    // "hashtag" is deprecated, will remove in the future
-    return tag.count >= 2 && (tag[0] == "hashtag" || tag[0] == "t")
-}
-
-func has_hashtag(_ tags: [[String]], hashtag: String) -> Bool {
-    for tag in tags {
-        if tag_is_hashtag(tag) && tag[1] == hashtag {
-            return true
-        }
-    }
-    
-    return false
-}
@@ -0,0 +1,42 @@
+//
+//  ZapsView.swift
+//  damus
+//
+//  Created by William Casarin on 2023-02-10.
+//
+
+import SwiftUI
+
+struct ZapsView: View {
+    let state: DamusState
+    @StateObject var model: ZapsModel
+    
+    init(state: DamusState, target: ZapTarget) {
+        self.state = state
+        self._model = StateObject(wrappedValue: ZapsModel(state: state, target: target))
+    }
+    
+    var body: some View {
+        ScrollView {
+            LazyVStack {
+                ForEach(model.zaps, id: \.event.id) { zap in
+                    ZapEvent(damus: state, zap: zap)
+                        .padding()
+                }
+            }
+        }
+        .navigationBarTitle(NSLocalizedString("Zaps", comment: "Navigation bar title for the Zaps view."))
+        .onAppear {
+            model.subscribe()
+        }
+        .onDisappear {
+            model.unsubscribe()
+        }
+    }
+}
+
+struct ZapsView_Previews: PreviewProvider {
+    static var previews: some View {
+        ZapsView(state: test_damus_state(), target: .profile("pk"))
+    }
+}
@@ -4,6 +4,9 @@
 /* Bundle name */
 "CFBundleName" = "دامُس";

+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "التحقق للوصول للمفتاح الخاص";
+
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "السماح لدامُس بالوصول إلى الصور يتيح لك حفظ الصور";

@@ -19,8 +19,8 @@
 /* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
@@ -35,8 +35,8 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
 /* 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. */
 "%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. بسهولة مطلقة، أرسل و استقبل برقيات البتكوين ⚡️عملة الانترنت العالمية.";

-/* Number of zap payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -45,7 +45,7 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

-/* No comment provided by engineer. */
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
 "⚡️ %@" = "⚡️ %@";

 /* Label to prompt for about text entry for user to describe about themself. */
@@ -76,12 +76,18 @@ Number of profiles a user is following. */
 /* Label for section for adding a relay server. */
 "Add Relay" = "اضافة موصّل";

-/* Any amount of sats */
-"Any" = "كم";
+/* Label to display relay contact user. */
+"Admin" = "المدير";

-/* Example URL to LibreTranslate server */
+/* Any amount of sats */
+"Any" = "أي شيء";
+
+/* Prompt for optional entry of API Key to use translation server. */
 "API Key (optional)" = "مفتاح API (اختياري)";

+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "مفتاح API (مطلوب)";
+
 /* Alert message to ask if user wants to repost a post. */
 "Are you sure you want to repost this?" = "هل أنت متأكد من اعادة النشر؟";

@@ -120,6 +126,9 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Blue Wallet. */
 "Blue Wallet" = "Blue Wallet";

+/* Accessibility label for boosts button */
+"Boosts" = "تعزيز";
+
 /* Dropdown option label for Lightning wallet, Breez. */
 "Breez" = "Breez";

@@ -138,15 +147,15 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "المحادثة";
-
 /* Button for clearing cached data. */
 "Clear" = "مسح";

 /* Section title for clearing cached data. */
 "Clear Cache" = "مسح البيانات المؤقتة";

+/* Label to display relay contact information. */
+"Contact" = "تواصل";
+
 /* Label indicating that a user's key was copied. */
 "Copied" = "تم النسخ";

@@ -205,6 +214,9 @@ Number of profiles a user is following. */
 /* Name of the app, shown on the first screen when user is not logged in. */
 "Damus" = "دامُس";

+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (دقة أعلى، ملكية خاصة)";
+
 /* Button to pay a Lightning invoice with the user's default Lightning wallet. */
 "Default Wallet" = "المحفظة الافتراضية";

@@ -214,6 +226,15 @@ Number of profiles a user is following. */
   Section title for deleting the user */
 "Delete" = "حذف";

+/* Button to delete the user's account. */
+"Delete Account" = "حذف الحساب";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "حذف الحساب";
+
+/* Label to display relay description. */
+"Description" = "الوصف";
+
 /* Button to dismiss a text field alert. */
 "Dismiss" = "اغلاق";

@@ -248,9 +269,21 @@ Number of profiles a user is following. */
 /* Label indicating that the below text is the EULA, an acronym for End User License Agreement. */
 "EULA" = "اتفاقية الاستخدام";

+/* No comment provided by engineer. */
+"EventDetailView" = "EventDetailView";
+
+/* No comment provided by engineer. */
+"Filter" = "تصفية";
+
 /* Button to follow a user. */
 "Follow" = "متابعة";

+/* Button to follow a user back. */
+"Follow Back" = "رد المتابعة";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "تابعني على نوستر";
+
 /* Label describing followers of a user. */
 "Followers" = "المتابعون";

@@ -264,6 +297,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
 "Follows" = "تابع";

+/* Text to indicate that a user is following your profile. */
+"Follows you" = "متابع لك";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "مجاني";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "احصل على مفتاح API";
+
 /* Navigation bar title for Global view where posts from all connected relay servers appear. */
 "Global" = "عام";

@@ -276,7 +318,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to hide a post from a user who has been blocked. */
 "Hide" = "اخفاء";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
 "Hide API Key" = "اخفاء مفتاح API";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
@@ -306,8 +349,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to complete account creation and start using the app. */
 "Let's go!" = "هيا بنا!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "ترجمة LibreTranslate";
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (مفتوح المصدر)";

 /* Placeholder text for entry of Lightning Address or LNURL. */
 "Lightning Address or LNURL" = "عنوان البرق أو LNURL";
@@ -315,9 +358,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Indicates that the view is for paying a Lightning invoice. */
 "Lightning Invoice" = "برقية";

+/* Accessibility Label for Like button */
+"Like" = "اعجاب";
+
 /* Dropdown option label for Lightning wallet, LNLink. */
 "LNLink" = "LNLink";

+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "التحقق للوصول للمفتاح الخاص";
+
 /* Dropdown option label for system default for Lightning wallet. */
 "Local default" = "الاختيار";

@@ -339,19 +388,25 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label for NIP-05 Verification section of user profile form. */
 "NIP-05 Verification" = "تحقق NIP-05";

+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "لا";
+
 /* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
 "No block list found, create a new one? This will overwrite any previous block lists." = "لم نعثر على قائمة حظر. هل تريد انشاء قائمة جديدة؟ سيتم استبدال أي قوائم سابقة ان وجدت";

 /* No search results. */
 "none" = "لا شيء";

-/* Dropdown option for selecting no translation server. */
+/* Dropdown option for selecting no translation service. */
 "None" = "لا اختيار";

+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "يحتوي المنشور على مفتاح خاص \"nsec1\". هل أنت متأكد؟";
+
 /* Indicates that there are no notes in the timeline to view. */
 "Nothing to see here. Check back later!" = "لا جديد في هذه اللحظة. يرجى المعاودة لاحقا!";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "التنبيهات";

 /* String indicating that a given timestamp just occurred */
@@ -366,15 +421,24 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label indicating that a form input is optional. */
 "optional" = "غير الزامي";

+/* No comment provided by engineer. */
+"Paid Relay" = "موصل مدفوع";
+
 /* Button to pay a Lightning invoice. */
 "Pay" = "ادفع";

 /* Navigation bar title for view to pay Lightning invoice. */
 "Pay the Lightning invoice" = "ادفع البرقية";

+/* Alert for deleting the users account. */
+"Permanently Delete Account" = "حذف الحساب للأبد";
+
 /* Dropdown option label for Lightning wallet, Phoenix. */
 "Phoenix" = "Phoenix";

+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "الخطة";
+
 /* Button to post a note. */
 "Post" = "انشر";

@@ -393,6 +457,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Title of the secure field that holds the user's private key. */
 "Private Key" = "المفتاح السري";

+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "برو";
+
 /* Sidebar menu label for Profile view. */
 "Profile" = "الملف الشخصي";

@@ -420,11 +487,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
 "Reject" = "رفض";

-/* Text field for relay server. Used for testing purposes. */
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
 "Relay" = "موصّل";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
+/* Sidebar menu label for Relays view. */
 "Relays" = "موصّلات";

 /* Description of what was done as a result of sending a report to relay servers. */
@@ -433,6 +500,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button label to remove all participants from a note reply. */
 "Remove all" = "حذف المشاركين";

+/* Accessibility label for reply button */
+"Reply" = "رد";
+
 /* Label to indicate that the user is replying to themself. */
 "Reply to self" = "رد على منشوره السابق";

@@ -483,6 +553,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Context menu option to save an image. */
 "Save Image" = "حفظ الصورة";

+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "امسح رمز الاستجابة السريع (QR)";
+
 /* Navigation link to search hashtag. */
 "Search hashtag: #%@" = "البحث عن وسم: #%@";

@@ -504,11 +577,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Prompt selection of LibreTranslate server to perform machine translations on notes */
 "Server" = "خادم";

+/* Prompt selection of translation service provider. */
+"Service" = "الخدمة";
+
 /* Navigation title for Settings view.
   Sidebar menu label for accessing the app settings */
 "Settings" = "الاعدادات";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
 "Share" = "مشاركة";

@@ -516,7 +593,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Toggle to show or hide user's secret account login key. */
 "Show" = "عرض";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
 "Show API Key" = "عرض مفتاح API";

 /* Toggle to show or hide selection of wallet. */
@@ -525,15 +603,24 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Sidebar menu label to sign out of the account. */
 "Sign out" = "خروج";

+/* Label to display relay software. */
+"Software" = "البرنامج";
+
 /* Dropdown option label for Lightning wallet, Strike. */
 "Strike" = "Strike";

+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "الـ NIPs المدعومة";
+
 /* Button to close out of alert that informs that the action to block a user was successful. */
 "Thanks!" = "شكرا!";

 /* Button for user to report that the account is impersonating someone. */
 "They are impersonating someone" = "انتحال صفة شخص آخر";

+/* No comment provided by engineer. */
+"This is a paid relay, you must pay for posts to be accepted." = "هذا موصل بمقابل، يجب الاشتراك للنشر فيه";
+
 /* Warning that the inputted account key is a public key and the result of what happens because of it. */
 "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." = "هذا مفتاح عام. لن تستطيع النشر أو التفاعل بهذا الحساب بأي طريقة. تستطيع فقط مشاهدة المحتوى العام من منظور صاحب الحساب.";

@@ -546,16 +633,27 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
 "This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "هذا مفتاح الحساب السري. تحتاجه للدخول إلى حسابك. لا تشاركه مع أي شخص! احتفظ به في مكان آمن مثل برنامج إدارة كلمات المرور السرية. ";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
+/* Navigation bar title for note thread. */
 "Thread" = "منشور";

+/* No comment provided by engineer. */
+"To filter your %@ feed, please choose applicable relays from the list below:" = "الرجاء اختيار موصلات معينة لتصفية محتوى %@";
+
 /* Button to translate note from different language. */
 "Translate Note" = "ترجم المنشور";

 /* Button to indicate that the note has been translated from a different language. */
 "Translated from (lang)" = "مُترجَم من (lang)";

+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "الترجمة من (lang)...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "الترجمة";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "اكتب DELETE لتأكيد الحذف";
+
 /* Text box prompt to ask user to type their post. */
 "Type your post here..." = "اكتب المنشور هنا...";

@@ -587,6 +685,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Label to prompt username entry. */
 "Username" = "اسم المستخدم";

+/* Label to display relay software version. */
+"Version" = "الاصدار";
+
 /* Sidebar menu label for Wallet view. */
 "Wallet" = "المحفظة";

@@ -614,6 +715,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text of button that confirms to overwrite the existing mutelist. */
 "Yes, Overwrite" = "نعم، استبدل";

+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private 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. */
 "you" = "أنت";

@@ -623,6 +727,12 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Footer text to inform user what will happen when the report is submitted. */
 "Your report will be sent to the relays you are connected to" = "سيتم ارسال بلاغك للموصّلات المتصلة بحسابك";

+/* Accessibility label for zap button */
+"Zap" = "ومضة";
+
+/* Navigation bar title for the Zaps view. */
+"Zaps" = "وميض";
+
 /* Dropdown option label for Lightning wallet, Zebedee. */
 "Zebedee" = "Zebedee";

@@ -89,7 +89,7 @@
 			<key>many</key>
 			<string>موصّلات</string>
 			<key>one</key>
-			<string> موصّل</string>
+			<string>  موصّل</string>
 			<key>other</key>
 			<string>موصّلات</string>
 			<key>two</key>
@@ -115,7 +115,7 @@
 			<key>one</key>
 			<string>&amp; %d آخر</string>
 			<key>other</key>
-			<string>&amp; %d آخرون</string>
+			<string>&amp; %d آخرين</string>
 			<key>two</key>
 			<string> &amp; %d آخران</string>
 			<key>zero</key>
@@ -139,7 +139,7 @@
 			<key>one</key>
 			<string>&amp; %d آخر</string>
 			<key>other</key>
-			<string>&amp; %d آخرون</string>
+			<string>&amp; %d آخرين</string>
 			<key>two</key>
 			<string> &amp; %d آخران</string>
 			<key>zero</key>
@@ -205,17 +205,17 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>few</key>
-			<string>Zaps</string>
+			<string>وميض</string>
 			<key>many</key>
-			<string>Zaps</string>
+			<string>وميض</string>
 			<key>one</key>
-			<string>Zap</string>
+			<string>ومضة</string>
 			<key>other</key>
-			<string>Zaps</string>
+			<string>وميض</string>
 			<key>two</key>
-			<string>Zaps</string>
+			<string>وميض</string>
 			<key>zero</key>
-			<string>Zaps</string>
+			<string>وميض</string>
 		</dict>
 	</dict>
 </dict>
@@ -7,6 +7,7 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:damus.io</string>
+		<string>webcredentials:damus.io</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array>
@@ -7,7 +7,6 @@

 import SwiftUI

-
@main
 struct damusApp: App {
    var body: some Scene {
@@ -4,6 +4,9 @@
 /* Bundle name */
 "CFBundleName" = "damus";

+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "Lokale Authentifizierung für den Zugriff auf den privaten Schlüssel";
+
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Zum Speichern von Bildern braucht Damus Zugriff auf deine Fotos.";

@@ -8,7 +8,7 @@
 "'%@' is an invalid NIP-05 identifier. It should look like an email." = "%@' ist kein gülter NIP-05 identifier. Dieser sollte wie eine email aussehen. ";

 /* Navigation bar title for view that shows who is following a user. */
-"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "(Profile.displayName(profile: profile, pubkey: whos)) Gefolgte";
+"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "Follower von (Profile.displayName(profile: profile, pubkey: whos))";

 /* Navigation bar title for view that shows who a user is following. */
 "(who) following" = "(who) folgt";
@@ -19,8 +19,8 @@
 /* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
@@ -35,8 +35,8 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
 /* 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. */
 "%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Belohne Beiträge deiner Freunde und sammle Sats mit Bitcoin⚡️, der eigenen Währung des Internets.";

-/* Number of zap payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -45,7 +45,7 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

-/* No comment provided by engineer. */
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
 "⚡️ %@" = "⚡️ %@";

 /* Label to prompt for about text entry for user to describe about themself. */
@@ -76,12 +76,18 @@ Number of profiles a user is following. */
 /* Label for section for adding a relay server. */
 "Add Relay" = "Relay hinzufügen";

+/* Label to display relay contact user. */
+"Admin" = "Admin";
+
 /* Any amount of sats */
 "Any" = "Beliebig";

-/* Example URL to LibreTranslate server */
+/* Prompt for optional entry of API Key to use translation server. */
 "API Key (optional)" = "API Schlüssel (optional)";

+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "API-Schlüssel (benötigt)";
+
 /* Alert message to ask if user wants to repost a post. */
 "Are you sure you want to repost this?" = "Bist du sicher, dass Du den Beitrag teilen möchtest?";

@@ -120,6 +126,9 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Blue Wallet. */
 "Blue Wallet" = "Blue Wallet";

+/* Accessibility label for boosts button */
+"Boosts" = "Boosts";
+
 /* Dropdown option label for Lightning wallet, Breez. */
 "Breez" = "Breez";

@@ -138,15 +147,15 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "Unterhaltungen";
-
 /* Button for clearing cached data. */
 "Clear" = "Löschen";

 /* Section title for clearing cached data. */
 "Clear Cache" = "Zwischenspeicher löschen";

+/* Label to display relay contact information. */
+"Contact" = "Kontakt";
+
 /* Label indicating that a user's key was copied. */
 "Copied" = "Kopiert";

@@ -205,6 +214,9 @@ Number of profiles a user is following. */
 /* Name of the app, shown on the first screen when user is not logged in. */
 "Damus" = "Damus";

+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (Proprietär, bessere Genauigkeit)";
+
 /* Button to pay a Lightning invoice with the user's default Lightning wallet. */
 "Default Wallet" = "Voreingestellte Wallet";

@@ -214,6 +226,15 @@ Number of profiles a user is following. */
   Section title for deleting the user */
 "Delete" = "Löschen";

+/* Button to delete the user's account. */
+"Delete Account" = "Konto löschen";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "Gelöschtes Konto";
+
+/* Label to display relay description. */
+"Description" = "Beschreibung";
+
 /* Button to dismiss a text field alert. */
 "Dismiss" = "Schließen";

@@ -251,6 +272,12 @@ Number of profiles a user is following. */
 /* Button to follow a user. */
 "Follow" = "Folgen";

+/* Button to follow a user back. */
+"Follow Back" = "Ebenfalls folgen";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "Folge mir auf Nostr";
+
 /* Label describing followers of a user. */
 "Followers" = "Follower";

@@ -264,6 +291,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
 "Follows" = "Folgt";

+/* Text to indicate that a user is following your profile. */
+"Follows you" = "Folgt dir";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "kostenlos";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "API-Schlüssel erhalten";
+
 /* Navigation bar title for Global view where posts from all connected relay servers appear. */
 "Global" = "Allgemein";

@@ -276,7 +312,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to hide a post from a user who has been blocked. */
 "Hide" = "Verstecken";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
 "Hide API Key" = "API Schlüssel verstecken";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
@@ -306,8 +343,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to complete account creation and start using the app. */
 "Let's go!" = "Los geht’s!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "LibreTranslate Übersetzungen";
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (Open Source)";

 /* Placeholder text for entry of Lightning Address or LNURL. */
 "Lightning Address or LNURL" = "Lightning-Adresse oder LNURL";
@@ -315,9 +352,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Indicates that the view is for paying a Lightning invoice. */
 "Lightning Invoice" = "Lightning-Rechnung";

+/* Accessibility Label for Like button */
+"Like" = "Like";
+
 /* Dropdown option label for Lightning wallet, LNLink. */
 "LNLink" = "LNLink";

+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "Lokale Authentifizierung für den Zugriff auf den privaten Schlüssel";
+
 /* Dropdown option label for system default for Lightning wallet. */
 "Local default" = "System-Standard";

@@ -339,19 +382,25 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label for NIP-05 Verification section of user profile form. */
 "NIP-05 Verification" = "NIP-05-Verifizierung";

+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "Nein";
+
 /* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
 "No block list found, create a new one? This will overwrite any previous block lists." = "Es wurde keine Blockier-Liste gefunden, soll eine neue erzeugt werden? Dies überschreibt eventuelle frühere Blockier-Listen.";

 /* No search results. */
 "none" = "keine";

-/* Dropdown option for selecting no translation server. */
+/* Dropdown option for selecting no translation service. */
 "None" = "Kein";

+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "Notiz enthält einen privaten \"nsec1\"-Schlüssel. Bist du sicher?";
+
 /* Indicates that there are no notes in the timeline to view. */
 "Nothing to see here. Check back later!" = "Hier gibt es nichts zu sehen. Schau später wieder vorbei!";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "Benachrichtigungen";

 /* String indicating that a given timestamp just occurred */
@@ -375,6 +424,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Phoenix. */
 "Phoenix" = "Phoenix";

+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "Paket";
+
 /* Button to post a note. */
 "Post" = "Teilen";

@@ -393,6 +445,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Title of the secure field that holds the user's private key. */
 "Private Key" = "Privater Schlüssel";

+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "Pro";
+
 /* Sidebar menu label for Profile view. */
 "Profile" = "Profil";

@@ -420,11 +475,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
 "Reject" = "Ablehnen";

-/* Text field for relay server. Used for testing purposes. */
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
 "Relay" = "Relay";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
+/* Sidebar menu label for Relays view. */
 "Relays" = "Relays";

 /* Description of what was done as a result of sending a report to relay servers. */
@@ -433,8 +488,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button label to remove all participants from a note reply. */
 "Remove all" = "Alle entfernen";

+/* Accessibility label for reply button */
+"Reply" = "Antworten";
+
 /* Label to indicate that the user is replying to themself. */
-"Reply to self" = "Antwort an dich selbst";
+"Reply to self" = "Antwort an sich selbst";

 /* Label to indicate that the user is replying to 2 users. */
 "Replying to %@ & %@" = "%1$@ & %2$@ antworten";
@@ -483,6 +541,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Context menu option to save an image. */
 "Save Image" = "Bild sichern";

+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "Code scannen";
+
 /* Navigation link to search hashtag. */
 "Search hashtag: #%@" = "Hashtag suchen: #%@";

@@ -504,11 +565,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Prompt selection of LibreTranslate server to perform machine translations on notes */
 "Server" = "Server";

+/* Prompt selection of translation service provider. */
+"Service" = "Dienst";
+
 /* Navigation title for Settings view.
   Sidebar menu label for accessing the app settings */
 "Settings" = "Einstellungen";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
 "Share" = "Teilen";

@@ -516,7 +581,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Toggle to show or hide user's secret account login key. */
 "Show" = "Anzeigen";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
 "Show API Key" = "API Schlüssel anzeigen";

 /* Toggle to show or hide selection of wallet. */
@@ -525,9 +591,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Sidebar menu label to sign out of the account. */
 "Sign out" = "Abmelden";

+/* Label to display relay software. */
+"Software" = "Software";
+
 /* Dropdown option label for Lightning wallet, Strike. */
 "Strike" = "Strike";

+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "Unterstützte NIPs";
+
 /* Button to close out of alert that informs that the action to block a user was successful. */
 "Thanks!" = "Danke!";

@@ -546,8 +618,7 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
 "This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Dies ist dein geheimer, privater Schlüssel. Du benötigst ihn, um auf dein Konto zuzugreifen. Gib den privaten Schlüssel an niemanden weiter! Speichere ihn in einem Passwort-Manager und bewahre ihn sicher auf!";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
+/* Navigation bar title for note thread. */
 "Thread" = "Thema";

 /* Button to translate note from different language. */
@@ -556,6 +627,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to indicate that the note has been translated from a different language. */
 "Translated from (lang)" = "Übersetzt aus (lang)";

+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "Übersetzung aus (lang)...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "Übersetzungen";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "Gib DELETE ein, um zu löschen";
+
 /* Text box prompt to ask user to type their post. */
 "Type your post here..." = "Schreibe deinen Beitrag hier...";

@@ -587,6 +667,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Label to prompt username entry. */
 "Username" = "Benutzername";

+/* Label to display relay software version. */
+"Version" = "Version";
+
 /* Sidebar menu label for Wallet view. */
 "Wallet" = "Wallet";

@@ -614,6 +697,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text of button that confirms to overwrite the existing mutelist. */
 "Yes, Overwrite" = "Ja, überschreiben";

+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private Key" = "Ja, teile mit privatem Schlüssel";
+
 /* 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. */
 "you" = "Du";

@@ -623,6 +709,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Footer text to inform user what will happen when the report is submitted. */
 "Your report will be sent to the relays you are connected to" = "Die Meldung wird an Relays versendet, mit denen du verbunden bist";

+/* Accessibility label for zap button */
+"Zap" = "Zap";
+
 /* Dropdown option label for Lightning wallet, Zebedee. */
 "Zebedee" = "Zebedee";

@@ -29,7 +29,7 @@
 			<key>one</key>
 			<string>Follower</string>
 			<key>other</key>
-			<string>Gefolgte</string>
+			<string>Follower</string>
 		</dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@FOLLOWERS@</string>
@@ -0,0 +1,12 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "Damus";
+
+/* Bundle name */
+"CFBundleName" = "damus";
+
+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "Τοπικά δικαιώματα για πρόσβαση στο ιδιωτικό κλειδί";
+
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "Δίνοντας στο Damus πρόσβαση στις φωτογραφίες σας επιτρέπετε την αποθήκευση εικόνων.";
+
@@ -0,0 +1,720 @@
+/* Blank space to separate profile picture from profile editor form. */
+"   " = "61b6edf1108e6f396680a33b02486a70_tr";
+
+/* Description of how the nip05 identifier would be used for verification. */
+"'%@' at '%@' will be used for verification" = "'%@' at '%@' θα χρησιμοποιηθεί για επαλήθευση";
+
+/* Description of why the nip05 identifier is invalid. */
+"'%@' is an invalid NIP-05 identifier. It should look like an email." = "'%@' είναι ένα λανθασμένο NIP-05 αναγνωριστικό. Θα πρέπει να έχει την μορφή email.";
+
+/* Navigation bar title for view that shows who is following a user. */
+"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "(Profile.displayName(profile: profile, pubkey: whos))'s Ακόλουθοι";
+
+/* Navigation bar title for view that shows who a user is following. */
+"(who) following" = "(ποίους) ακολουθεί";
+
+/* Prefix character to username. */
+"@" = "@";
+
+/* Abbreviated version of a nostr public key. */
+"%@" = "%@";
+
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
+"%@ %@" = "%@ %@";
+
+/* Alert message that informs a user was blocked. */
+"%@ has been blocked" = "%@ έχει μπλοκαριστεί";
+
+/* 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. */
+"%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." = "%@. Η δημιουργία λογαριασμού δεν απαιτεί τηλεφωνικό αριθμό, email ή όνομα. Ξεκινήστε αμέσως χωρίς προστιβές.";
+
+/* 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. */
+"%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" = "%@. End-to-End κρυπτογραφημένα προσωπικά μηνύματα. Κρατήστε τις μεγάλες εταιρείες τεχνολογίας μακριά από τα προσωπικά σας μηνύματα.";
+
+/* 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. */
+"%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Δώστε φιλοδώρημα στις δημοσιεύσεις των φίλων σας και μαζέψτε Bitcoin sats⚡️, το νόμισμα του ίντερνετ.";
+
+/* Number of reposts.
+Number of relay servers a user is connected. */
+"%lld" = "%lld";
+
+/* Fraction of how many of the user's relay servers that are operational. */
+"%lld/%lld" = "%lld/%lld";
+
+/* Placeholder for event mention. */
+"< e >" = "< e >";
+
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
+"⚡️ %@" = "⚡️ %@";
+
+/* Label to prompt for about text entry for user to describe about themself. */
+"About" = "Σχετικά";
+
+/* Label for About Me section of user profile form. */
+"About Me" = "Σχετικά με εμένα";
+
+/* Placeholder text for About Me description. */
+"Absolute Boss" = "Απόλυτο αφεντικό";
+
+/* Button to accept the end user license agreement before being allowed into the app. */
+"Accept" = "Αποδοχή";
+
+/* Label to indicate the public ID of the account. */
+"Account ID" = "ID Λογαρισμού";
+
+/* Title for confirmation dialog to either share, report, or block a profile. */
+"Actions" = "Ενέργειες";
+
+/* Button to add recommended relay server.
+   Button to confirm adding user inputted relay. */
+"Add" = "Προσθήκη";
+
+/* Button label to re-add all original participants as profiles to reply to in a note */
+"Add all" = "Προσθήκη όλων";
+
+/* Label for section for adding a relay server. */
+"Add Relay" = "Προσθήκη διακομιστή Relay";
+
+/* Label to display relay contact user. */
+"Admin" = "Διαχειριστής";
+
+/* Any amount of sats */
+"Any" = "Ποσό";
+
+/* Prompt for optional entry of API Key to use translation server. */
+"API Key (optional)" = "Κλειδί API (προαιρετικό)";
+
+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "Κλειδί API (απαιτείται)";
+
+/* Alert message to ask if user wants to repost a post. */
+"Are you sure you want to repost this?" = "Είστε βέβαιοι ότι θέλετε να το αναδημοσιεύσετε;";
+
+/* Label for Banner Image section of user profile form. */
+"Banner Image" = "Φωτογραφία εξωφύλλου";
+
+/* Reminder to user that they should save their account information. */
+"Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." = "Πριν ξεκινήσουμε, θα χρειαστεί να αποθηκεύσετε τις πληροφορίες του λογαριασμού σας, διαφορετικά θα χάσετε την πρόσβαση σας αν ποτέ απεγκαταστήσετε το Damus.";
+
+/* Dropdown option label for Lightning wallet, Bitcoin Beach. */
+"Bitcoin Beach" = "Bitcoin Beach";
+
+/* Label for Bitcoin Lightning Tips section of user profile form. */
+"Bitcoin Lightning Tips" = "Bitcoin Lightning Tips";
+
+/* Dropdown option label for Lightning wallet, Blixt Wallet */
+"Blixt Wallet" = "Blixt Wallet";
+
+/* Alert button to block a user.
+   Button to block a profile.
+   Context menu option for blocking users. */
+"Block" = "Μπλοκάρισμα";
+
+/* Alert message prompt to ask if a user should be blocked. */
+"Block %@?" = "Μπλοκάρισμα %@;";
+
+/* Title of alert for blocking a user. */
+"Block User" = "Μπλοκάρισμα χρήστη";
+
+/* Sidebar menu label for Profile view. */
+"Blocked" = "Μπλοκαρισμένοι";
+
+/* Navigation title of view to see list of blocked users. */
+"Blocked Users" = "Μπλοκαρισμένοι χρήστες";
+
+/* Dropdown option label for Lightning wallet, Blue Wallet. */
+"Blue Wallet" = "Blue Wallet";
+
+/* Accessibility label for boosts button */
+"Boosts" = "Boosts";
+
+/* Dropdown option label for Lightning wallet, Breez. */
+"Breez" = "Breez";
+
+/* Context menu option for broadcasting the user's note to all of the user's connected relay servers. */
+"Broadcast" = "Αναμετάδοση";
+
+/* Alert button to cancel out of alert for blocking a user.
+   Button to cancel out of alert that creates a new mutelist.
+   Button to cancel out of posting a note.
+   Button to cancel out of reposting a post.
+   Button to cancel out of view adding user inputted relay.
+   Cancel deleting the user.
+   Cancel out of logging out the user. */
+"Cancel" = "Άκυρο";
+
+/* Dropdown option label for Lightning wallet, Cash App. */
+"Cash App" = "Cash App";
+
+/* Button for clearing cached data. */
+"Clear" = "Καθαρισμός";
+
+/* Section title for clearing cached data. */
+"Clear Cache" = "Καθαρισμός προσωρινής μνήμης";
+
+/* Label to display relay contact information. */
+"Contact" = "Επικοινωνία";
+
+/* Label indicating that a user's key was copied. */
+"Copied" = "Αντιγράφηκε";
+
+/* Button to copy a relay server address. */
+"Copy" = "Αντιγραφή";
+
+/* Context menu option for copying the ID of the account that created the note. */
+"Copy Account ID" = "Αντιγραφή ID λογαριασμού";
+
+/* Context menu option to copy an image into clipboard.
+   Context menu option to copy an image to clipboard. */
+"Copy Image" = "Αντιγραφή εικόνας";
+
+/* Context menu option to copy the URL of an image into clipboard. */
+"Copy Image URL" = "Αντιγραφή URL εικόνας";
+
+/* Title of section for copying a Lightning invoice identifier. */
+"Copy invoice" = "Αντιγραφή ποσού";
+
+/* Context menu option for copying a user's Lightning URL. */
+"Copy LNURL" = "Αντιγραφή LNURL";
+
+/* Context menu option for copying the ID of the note. */
+"Copy Note ID" = "Αντιγραφή ID σημείωσης";
+
+/* Context menu option for copying the JSON text from the note. */
+"Copy Note JSON" = "Αντιγραφή JSON σημείωσης";
+
+/* Button to copy report ID. */
+"Copy Report ID" = "Αντιγραφή ID αναφοράς";
+
+/* Context menu option for copying the text from an note. */
+"Copy Text" = "Αντιγραφή κειμένου";
+
+/* Context menu option for copying the ID of the user who created the note. */
+"Copy User Pubkey" = "Αντιγραφή δημόσιου κλειδιού χρήστη";
+
+/* Alert message to indicate that the blocked user could not be found. */
+"Could not find user to block..." = "Ο χρήστης για μπλοκάρισμα δεν βρέθηκε...";
+
+/* Button to create account. */
+"Create" = "Δημιουργία";
+
+/* Button to create an account. */
+"Create Account" = "Δημιουργία λογαριασμού";
+
+/* Title of alert prompting the user to create a new mutelist. */
+"Create new mutelist" = "Δημιουργία νέας λίστας αποκλεισμού";
+
+/* Example description about Bitcoin creator(s), Satoshi Nakamoto. */
+"Creator(s) of Bitcoin. Absolute legend." = "Δημιουργός(οί) του Bitcoin. Απόλυτος θρύλος.";
+
+/* Dropdown option for selecting a custom translation server. */
+"Custom" = "Προσαρμογή";
+
+/* Name of the app, shown on the first screen when user is not logged in. */
+"Damus" = "Damus";
+
+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (Υπηρεσία, Υψηλότερη Ακρίβεια)";
+
+/* Button to pay a Lightning invoice with the user's default Lightning wallet. */
+"Default Wallet" = "Προεπιλεγμένο πορτοφόλι";
+
+/* Button for deleting the users account.
+   Button to delete a relay server that the user connects to.
+   Button to remove a user from their blocklist.
+   Section title for deleting the user */
+"Delete" = "Διαγραφή";
+
+/* Button to delete the user's account. */
+"Delete Account" = "Διαγραφή λογαριασμού";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "Διεγραμμένος λογαριασμός";
+
+/* Label to display relay description. */
+"Description" = "Περιγραφή";
+
+/* Button to dismiss a text field alert. */
+"Dismiss" = "Απόρριψη";
+
+/* Label to prompt display name entry. */
+"Display Name" = "Εμφανιζόμενο όνομα";
+
+/* Navigation title for DMs view, where DM is the English abbreviation for Direct Message.
+   Navigation title for view of DMs, where DM is an English abbreviation for Direct Message. */
+"DMs" = "Προσωπικά Μηνύματα";
+
+/* Button to dismiss wallet selection view for paying Lightning invoice. */
+"Done" = "Ολοκλήρωση";
+
+/* Heading indicating that this application allows users to earn money. */
+"Earn Money" = "Βγάλτε χρήματα";
+
+/* Button to edit user's profile. */
+"Edit" = "Επεξεργασία";
+
+/* Text indicating that the view is used for editing which participants are replied to in a note. */
+"Edit participants" = "Επεξεργασία συμμετεχόντων";
+
+/* Heading indicating that this application keeps private messaging end-to-end encrypted. */
+"Encrypted" = "Κρυπτογραφημένα";
+
+/* Prompt for user to enter an account key to login. */
+"Enter your account key to login:" = "Εισάγετε το κλειδί του λογαριασμού σας για είσοδο:";
+
+/* Error message indicating why saving keys failed. */
+"Error: %@" = "Σφάλμα: %@";
+
+/* Label indicating that the below text is the EULA, an acronym for End User License Agreement. */
+"EULA" = "EULA";
+
+/* Button to follow a user. */
+"Follow" = "Ακολουθήστε";
+
+/* Button to follow a user back. */
+"Follow Back" = "Ακολουθήστε";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "Ακολουθήστε με στο nostr";
+
+/* Label describing followers of a user. */
+"Followers" = "Ακόλουθοι";
+
+/* Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile.
+Part of a larger sentence to describe how many profiles a user is following. */
+"Following" = "Ακολουθεί";
+
+/* Label to indicate that the user is in the process of following another user. */
+"Following..." = "Ακολουθεί...";
+
+/* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
+"Follows" = "Ακολουθήστε";
+
+/* Text to indicate that a user is following your profile. */
+"Follows you" = "Σας ακολουθούν";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "Δωρεάν";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "Λάβετε κλειδί API";
+
+/* Navigation bar title for Global view where posts from all connected relay servers appear. */
+"Global" = "Κεντρική";
+
+/* Navigation link to go to post referenced by hex code. */
+"Goto post %@" = "Πήγαινε στη δημοσίευση %@";
+
+/* Navigation link to go to profile. */
+"Goto profile %@" = "Πήγαινε στο προφίλ %@";
+
+/* Button to hide a post from a user who has been blocked. */
+"Hide" = "Απόκρυψη";
+
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
+"Hide API Key" = "Απόκρυψη κλειδιού API";
+
+/* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
+"Home" = "Αρχική";
+
+/* Placeholder example text for profile picture URL. */
+"https://example.com/pic.jpg" = "https://example.com/pic.jpg";
+
+/* Placeholder example text for website URL for user profile. */
+"https://jb55.com" = "https://jb55.com";
+
+/* Button for user to report that the account or content has illegal content. */
+"Illegal content" = "Παράνομο περιεχόμενο";
+
+/* Error message indicating that an invalid account key was entered for login. */
+"Invalid key" = "Λανθασμένο κλειδί";
+
+/* Button for user to report that the account or content has spam. */
+"It's spam" = "Είναι ανεπιθύμητο";
+
+/* Placeholder example text for identifier used for NIP-05 verification. */
+"jb55@jb55.com" = "jb55@jb55.com";
+
+/* Moves the post button to the left side of the screen */
+"Left Handed" = "Για αριστερόχειρες";
+
+/* Button to complete account creation and start using the app. */
+"Let's go!" = "Φύγαμε!";
+
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (Ανοιχτού κώδικα)";
+
+/* Placeholder text for entry of Lightning Address or LNURL. */
+"Lightning Address or LNURL" = "Διεύθυνση Lightning ή LNURL";
+
+/* Indicates that the view is for paying a Lightning invoice. */
+"Lightning Invoice" = "Lightning ποσό";
+
+/* Accessibility Label for Like button */
+"Like" = "Μου αρέσει";
+
+/* Dropdown option label for Lightning wallet, LNLink. */
+"LNLink" = "LNLink";
+
+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "Τοπικά δικαιώματα για πρόσβαση στο ιδιωτικό κλειδί";
+
+/* Dropdown option label for system default for Lightning wallet. */
+"Local default" = "Προεπιλογή";
+
+/* Button to log into account.
+   Button to log into an account. */
+"Login" = "Σύνδεση";
+
+/* Alert for logging out the user.
+   Button for logging out the user.
+   Button to close the alert that informs that the current account has been deleted. */
+"Logout" = "Αποσύνδεση";
+
+/* Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out. */
+"Make sure your nsec account key is saved before you logout or you will lose access to this account" = "Βεβαιωθείτε ότι έχετε αποθηκεύσει το ιδιωτικό κλειδί nsec του λογαριασμού σας πριν αποσυνδεθείτε, διαφορετικά θα χάσετε την πρόσβαση στο λογαριασμό σας";
+
+/* Dropdown option label for Lightning wallet, Muun. */
+"Muun" = "Muun";
+
+/* Label for NIP-05 Verification section of user profile form. */
+"NIP-05 Verification" = "Πιστοποιητικό NIP-05";
+
+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "Όχι";
+
+/* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
+"No block list found, create a new one? This will overwrite any previous block lists." = "Δεν βρέθηκε λίστα αποκλεισμού, να δημιουργηθεί μια νέα; Αυτό θα αντικαταστήσει κάθε προηγούμενη λίστα αποκλεισμού.";
+
+/* No search results. */
+"none" = "κανένα";
+
+/* Dropdown option for selecting no translation service. */
+"None" = "Κανένας";
+
+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "Το σχόλιο περιέχει \"nsec1\" ιδωτικό κλειδί. Είστε σίγουροι;";
+
+/* Indicates that there are no notes in the timeline to view. */
+"Nothing to see here. Check back later!" = "Δεν βρέθηκε κάτι. Δοκιμάστε αργότερα!";
+
+/* Toolbar label for Notifications view. */
+"Notifications" = "Ειδοποιήσεις";
+
+/* String indicating that a given timestamp just occurred */
+"now" = "τώρα";
+
+/* Prompt for user to enter in an account key to login. This text shows the characters the key could start with if it was a private key. */
+"nsec1..." = "nsec1...";
+
+/* Button for user to report that the account or content has nudity or explicit content. */
+"Nudity or explicit content" = "Γυμνό ή ακατάλληλο περιεχόμενο";
+
+/* Label indicating that a form input is optional. */
+"optional" = "προαιρετικό";
+
+/* Button to pay a Lightning invoice. */
+"Pay" = "Πληρωμή";
+
+/* Navigation bar title for view to pay Lightning invoice. */
+"Pay the Lightning invoice" = "Πληρωμή Lightning ποσού";
+
+/* Dropdown option label for Lightning wallet, Phoenix. */
+"Phoenix" = "Phoenix";
+
+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "Συνδρομή";
+
+/* Button to post a note. */
+"Post" = "Δημοσίευση";
+
+/* Text to indicate that what is being shown is a post from a user who has been blocked. */
+"Post from a user you've blocked" = "Δημοσίευση μπλοκαρισμένου χρήστη";
+
+/* Label for filter for seeing only posts (instead of posts and replies). */
+"Posts" = "Δημοσιεύσεις";
+
+/* Label for filter for seeing posts and replies (instead of only posts). */
+"Posts & Replies" = "Δημοσιεύσεις & Απαντήσεις";
+
+/* Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading. */
+"Private" = "Προσωπικά δεδομένα";
+
+/* Title of the secure field that holds the user's private key. */
+"Private Key" = "Ιδιωτικό κλειδί";
+
+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "Pro";
+
+/* Sidebar menu label for Profile view. */
+"Profile" = "Προφίλ";
+
+/* Label for Profile Picture section of user profile form. */
+"Profile Picture" = "Εικόνα προφίλ";
+
+/* Section title for the user's public account ID. */
+"Public Account ID" = "Δημόσιο ID λογαριασμού";
+
+/* Label indicating that the text is a user's public account key. */
+"Public key" = "Δημόσιο κλειδί";
+
+/* Label indicating that the text is a user's public account key. */
+"Public Key" = "Δημόσιο κλειδί";
+
+/* Prompt to ask user if the key they entered is a public key. */
+"Public Key?" = "Δημόσιο κλειδί;";
+
+/* Navigation bar title for Reactions view. */
+"Reactions" = "Αντιδράσεις";
+
+/* Section title for recommend relay servers that could be added as part of configuration */
+"Recommended Relays" = "Προτεινόμενοι διακομιστές Relays";
+
+/* Button to reject the end user license agreement, which disallows the user from being let into the app. */
+"Reject" = "Απόρριψη";
+
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
+"Relay" = "Διακομιστής Relay";
+
+/* Sidebar menu label for Relays view. */
+"Relays" = "Διακομιστές Relays";
+
+/* Description of what was done as a result of sending a report to relay servers. */
+"Relays have been notified and clients will be able to use this information to filter content. Thank you!" = "Οι διακομιστές Relays έχουν ειδοποιηθεί και οι εφαρμογές θα μπορούν να φιλτράρουν το περιεχόμενο. Ευχαριστούμε!";
+
+/* Button label to remove all participants from a note reply. */
+"Remove all" = "Αφαίρεση όλων";
+
+/* Accessibility label for reply button */
+"Reply" = "Απάντηση";
+
+/* Label to indicate that the user is replying to themself. */
+"Reply to self" = "Απάντηση στον εαυτό μου";
+
+/* Label to indicate that the user is replying to 2 users. */
+"Replying to %@ & %@" = "Απάντηση σε %1$@ & %2$@";
+
+/* Indicating that the user is replying to the following listed people. */
+"Replying to:" = "Απάντηση σε:";
+
+/* Button to report a profile.
+   Context menu option for reporting content. */
+"Report" = "Αναφορά";
+
+/* Label indicating that the text underneath is the identifier of the report that was sent to relay servers. */
+"Report ID:" = "ID Αναφοράς:";
+
+/* Message indicating that a report was successfully sent to relay servers. */
+"Report sent!" = "Η αναφορά εστάλει!";
+
+/* Button to confirm reposting a post.
+   Title of alert for confirming to repost a post. */
+"Repost" = "Αναδημοσίευση";
+
+/* Text indicating that the post was reposted (i.e. re-shared). */
+"Reposted" = "Αναδημοσιεύθηκε";
+
+/* Navigation bar title for Reposts view. */
+"Reposts" = "Αναδημοσιεύσεις";
+
+/* Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message. */
+"Requests" = "Αιτήματα";
+
+/* Button to retry completing account creation after an error occurred. */
+"Retry" = "Δοκιμάστε ξανά";
+
+/* Dropdown option label for Lightning wallet, River */
+"River" = "River";
+
+/* Example username of Bitcoin creator(s), Satoshi Nakamoto. */
+"satoshi" = "satoshi";
+
+/* Name of Bitcoin creator(s). */
+"Satoshi Nakamoto" = "Satoshi Nakamoto";
+
+/* Button for saving profile. */
+"Save" = "Αποθήκευση";
+
+/* Context menu option to save an image. */
+"Save Image" = "Αποθήκευση εικόνας";
+
+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "Σκανάρισμα κωδικού";
+
+/* Navigation link to search hashtag. */
+"Search hashtag: #%@" = "Αναζήτηση ετικέτας: #%@";
+
+/* Placeholder text to prompt entry of search query. */
+"Search..." = "Αναζήτηση...";
+
+/* Section title for user's secret account login key. */
+"Secret Account Login Key" = "Μυστικό ιδιωτικό κλειδί λογαριασμού";
+
+/* Title of section for selecting a Lightning wallet to pay a Lightning invoice. */
+"Select a Lightning wallet" = "Επιλέξτε ένα Lightning πορτοφόλι";
+
+/* Prompt selection of user's default wallet */
+"Select default wallet" = "Προεπιλεγμένο πορτοφόλι";
+
+/* Text prompt for user to send a message to the other user. */
+"Send a message to start the conversation..." = "Στείλτε ένα μήνυμα για να ξεκινήσετε την συνομιλία...";
+
+/* Prompt selection of LibreTranslate server to perform machine translations on notes */
+"Server" = "Διακομιστής";
+
+/* Prompt selection of translation service provider. */
+"Service" = "Υπηρεσία";
+
+/* Navigation title for Settings view.
+   Sidebar menu label for accessing the app settings */
+"Settings" = "Ρυθμίσεις";
+
+/* Button to share a post
+   Button to share an image.
+   Button to share the link to a profile. */
+"Share" = "Κοινοποίηση";
+
+/* Button to show a post from a user who has been blocked.
+   Toggle to show or hide user's secret account login key. */
+"Show" = "Προβολή";
+
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
+"Show API Key" = "Προβολή κλειδιού API";
+
+/* Toggle to show or hide selection of wallet. */
+"Show wallet selector" = "Προβολή επιλογής πορτοφολιού";
+
+/* Sidebar menu label to sign out of the account. */
+"Sign out" = "Αποσύνδεση";
+
+/* Label to display relay software. */
+"Software" = "Λογισμικό";
+
+/* Dropdown option label for Lightning wallet, Strike. */
+"Strike" = "Strike";
+
+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "Υποστηριζόμενα NIPs";
+
+/* Button to close out of alert that informs that the action to block a user was successful. */
+"Thanks!" = "Ευχαριστούμε!";
+
+/* Button for user to report that the account is impersonating someone. */
+"They are impersonating someone" = "Προσποιείται κάποιον άλλο";
+
+/* Warning that the inputted account key is a public key and the result of what happens because of it. */
+"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." = "Αυτό είναι ένα δημόσιο κλειδί, δεν θα έχετε την δυνατότητα να κάνετε δημοσιεύσεις ή να αλληλεπιδράσετε με κάποιο τρόπο. Αυτό το κλειδί είναι μόνο για προβολή / εύρεση λογαριασμών.";
+
+/* Warning that the inputted account key for login is an old-style and asking user to verify if it is a public key. */
+"This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." = "Αυτό είναι ένα παλαιού τύπου κλειδί nostr. Δεν αναγνωρίζουμε αν είναι δημόσιο ή ιδιωτικό κλειδί. Παρακαλούμε πατήστε το παρακάτων κουμπί αν είναι ένα δημόσιο κλειδί.";
+
+/* Label to describe that a public key is the user's account ID and what they can do with it. */
+"This is your account ID, you can give this to your friends so that they can follow you. Click to copy." = "Αυτό είναι το ID του λογαριασμού σας, μπορείτε να το δώσετε στους φίλους σας ώστε να σας ακολουθήσουν. Κάντε κλικ για αντιγραφή.";
+
+/* Label to describe that a private key is the user's secret account key and what they should do with it. */
+"This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Αυτό είναι το κρυφό ιδιωτικό σας κλειδί. Το χρειάζεστε για να έχετε προσβαση στο λογαριασμό σας. Μη το δώσετε ποτέ σε κανέναν! Αποθηκεύστε το σε ένα ασφαλές μέρος!";
+
+/* Navigation bar title for note thread. */
+"Thread" = "Νήμα";
+
+/* Button to translate note from different language. */
+"Translate Note" = "Μεταφρασμένο σχόλιο";
+
+/* Button to indicate that the note has been translated from a different language. */
+"Translated from (lang)" = "Μεταφράστηκε από (lang)";
+
+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "Μεταφράζετε από (lang)...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "Μεταφράσεις";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "Πληκρολογίστε DELETE για διαγραφή";
+
+/* Text box prompt to ask user to type their post. */
+"Type your post here..." = "Πληκρολογίστε την δημοσίευσή σας εδώ...";
+
+/* Non-breaking space character to fill in blank space next to event action button icons. */
+"u{00A0}" = "u{00A0}";
+
+/* Button to unfollow a user. */
+"Unfollow" = "Διακοπή";
+
+/* Text to indicate that the button next to it is in  a state that indicates that it is in the process of unfollowing a profile. */
+"Unfollowing" = "Παύση ακολούθησης";
+
+/* Label to indicate that the user is in the process of unfollowing another user. */
+"Unfollowing..." = "Παύση ακολούθησης...";
+
+/* Text to indicate that the button next to it is in a state that will unfollow a profile when tapped. */
+"Unfollows" = "Διακοπή ακολούθησης";
+
+/* Example URL to LibreTranslate server */
+"URL" = "URL";
+
+/* Alert message to indicate the user has been blocked */
+"User blocked" = "Ο χρήστης αποκλείστηκε";
+
+/* Alert message that informs a user was blocked. */
+"User has been blocked" = "Ο χρήστης έχει αποκλειστεί";
+
+/* Label for Username section of user profile form.
+   Label to prompt username entry. */
+"Username" = "Όνομα χρήστη";
+
+/* Label to display relay software version. */
+"Version" = "Έκδοση";
+
+/* Sidebar menu label for Wallet view. */
+"Wallet" = "Πορτοφόλι";
+
+/* Dropdown option label for Lightning wallet, Wallet of Satoshi. */
+"Wallet of Satoshi" = "Wallet of Satoshi";
+
+/* Section title for selection of wallet. */
+"Wallet Selector" = "Επιλογή πορτοφολιού";
+
+/* Label for Website section of user profile form. */
+"Website" = "Ιστοσελίδα";
+
+/* Welcoming message to the reader. The variable is 'you', the reader. */
+"Welcome to the social network %@ control." = "Καλώς ήρθες στο κοινωνικό δίκτυο %@ που ελέγχεις.";
+
+/* Text to welcome user. */
+"Welcome, %@!" = "Καλώς ήρθες, %@!";
+
+/* Header text to prompt user what issue they want to report. */
+"What do you want to report?" = "Τι θα ήθελες να αναφέρεις;";
+
+/* Placeholder example for relay server address. */
+"wss://some.relay.com" = "wss://some.relay.com";
+
+/* Text of button that confirms to overwrite the existing mutelist. */
+"Yes, Overwrite" = "Ναι, αντικατάσταση";
+
+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private 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. */
+"you" = "εσείς";
+
+/* Label for Your Name section of user profile form. */
+"Your Name" = "Το όνομά σας";
+
+/* Footer text to inform user what will happen when the report is submitted. */
+"Your report will be sent to the relays you are connected to" = "Η αναφορά σας θα αποσταλεί στους διακομιστές relays που είστε συνδεδεμένοι";
+
+/* Accessibility label for zap button */
+"Zap" = "Zap";
+
+/* Dropdown option label for Lightning wallet, Zebedee. */
+"Zebedee" = "Zebedee";
+
+/* Dropdown option label for Lightning wallet, Zeus LN. */
+"Zeus LN" = "Zeus LN";
+
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>collapsed_event_view_other_notes</key>
+	<dict>
+		<key>NOTES</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>%d άλλη σημείωση</string>
+			<key>other</key>
+			<string>%d άλλες σημειώσεις</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>··· %#@NOTES@ ···</string>
+	</dict>
+	<key>followers_count</key>
+	<dict>
+		<key>FOLLOWERS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Ακόλουθος</string>
+			<key>other</key>
+			<string>Ακόλουθοι</string>
+		</dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@FOLLOWERS@</string>
+	</dict>
+	<key>reactions_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REACTIONS@</string>
+		<key>REACTIONS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Αντίδραση</string>
+			<key>other</key>
+			<string>Αντιδράσεις</string>
+		</dict>
+	</dict>
+	<key>relays_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@RELAYS@</string>
+		<key>RELAYS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Διακομιστής Relay</string>
+			<key>other</key>
+			<string>Διακομιστές Relays</string>
+		</dict>
+	</dict>
+	<key>replying_to_one_and_others</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>Απάντηση προς %@%#@OTHERS@</string>
+		<key>OTHERS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string> &amp; %d άλλον</string>
+			<key>other</key>
+			<string> &amp; %d άλλους</string>
+			<key>zero</key>
+			<string></string>
+		</dict>
+	</dict>
+	<key>replying_to_two_and_others</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>Απάντηση προς %@, %@%#@OTHERS@</string>
+		<key>OTHERS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string> &amp; %d άλλον</string>
+			<key>other</key>
+			<string> &amp; %d άλλους</string>
+			<key>zero</key>
+			<string></string>
+		</dict>
+	</dict>
+	<key>reposts_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@REPOSTS@</string>
+		<key>REPOSTS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Αναδημοσίευση</string>
+			<key>other</key>
+			<string>Αναδημοσιεύσεις</string>
+		</dict>
+	</dict>
+	<key>sats_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%1$#@SATS@</string>
+		<key>SATS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>@</string>
+			<key>one</key>
+			<string>%2$@ sat</string>
+			<key>other</key>
+			<string>%2$@ sats</string>
+		</dict>
+	</dict>
+	<key>zaps_count</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@ZAPS@</string>
+		<key>ZAPS</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>d</string>
+			<key>one</key>
+			<string>Zap</string>
+			<key>other</key>
+			<string>Zaps</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
@@ -4,6 +4,9 @@
 /* Bundle name */
 "CFBundleName" = "damus";

+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "Autenticación local para acceder a la clave privada";
+
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Si le concedes acceso a Damus a tus fotos, podrás guardar imágenes.";

@@ -19,8 +19,8 @@
 /* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
@@ -35,8 +35,8 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
 /* 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. */
 "%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Deja propinas en las publicaciones de tus amigos y acumula sats con Bitcoin⚡️, la moneda nativa de internet.";

-/* Number of zap payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -45,7 +45,7 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

-/* No comment provided by engineer. */
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
 "⚡️ %@" = "⚡️ %@";

 /* Label to prompt for about text entry for user to describe about themself. */
@@ -76,12 +76,18 @@ Number of profiles a user is following. */
 /* Label for section for adding a relay server. */
 "Add Relay" = "Agregar relé";

+/* Label to display relay contact user. */
+"Admin" = "Administrador";
+
 /* Any amount of sats */
 "Any" = "Cualquiera";

-/* Example URL to LibreTranslate server */
+/* Prompt for optional entry of API Key to use translation server. */
 "API Key (optional)" = "Clave de API (opcional)";

+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "Clave de API (obligatorio)";
+
 /* Alert message to ask if user wants to repost a post. */
 "Are you sure you want to repost this?" = "¿Seguro quieres volver a publicar esto?";

@@ -120,6 +126,9 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Blue Wallet. */
 "Blue Wallet" = "Blue Wallet";

+/* Accessibility label for boosts button */
+"Boosts" = "Boosts";
+
 /* Dropdown option label for Lightning wallet, Breez. */
 "Breez" = "Breez";

@@ -138,15 +147,15 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "Chat";
-
 /* Button for clearing cached data. */
 "Clear" = "Borrar";

 /* Section title for clearing cached data. */
 "Clear Cache" = "Borrar caché";

+/* Label to display relay contact information. */
+"Contact" = "Contacto";
+
 /* Label indicating that a user's key was copied. */
 "Copied" = "Copiada";

@@ -205,6 +214,9 @@ Number of profiles a user is following. */
 /* Name of the app, shown on the first screen when user is not logged in. */
 "Damus" = "Damus";

+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (Propietario, Mayor precisión)";
+
 /* Button to pay a Lightning invoice with the user's default Lightning wallet. */
 "Default Wallet" = "Billetera predeterminada";

@@ -214,6 +226,15 @@ Number of profiles a user is following. */
   Section title for deleting the user */
 "Delete" = "Borrar";

+/* Button to delete the user's account. */
+"Delete Account" = "Eliminar cuenta";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "Cuenta eliminada";
+
+/* Label to display relay description. */
+"Description" = "Descripción";
+
 /* Button to dismiss a text field alert. */
 "Dismiss" = "Descartar";

@@ -251,6 +272,12 @@ Number of profiles a user is following. */
 /* Button to follow a user. */
 "Follow" = "Seguir";

+/* Button to follow a user back. */
+"Follow Back" = "Seguir";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "Sigueme en nostr";
+
 /* Label describing followers of a user. */
 "Followers" = "Seguidores";

@@ -264,6 +291,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
 "Follows" = "Sigue";

+/* Text to indicate that a user is following your profile. */
+"Follows you" = "Te sigue";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "Gratuito";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "Obtener clave de API";
+
 /* Navigation bar title for Global view where posts from all connected relay servers appear. */
 "Global" = "Global";

@@ -276,7 +312,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to hide a post from a user who has been blocked. */
 "Hide" = "Ocultar";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
 "Hide API Key" = "Ocultar clave de API";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
@@ -306,8 +343,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to complete account creation and start using the app. */
 "Let's go!" = "¡Vamos!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "Traducciones de LibreTranslate";
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (Código abierto)";

 /* Placeholder text for entry of Lightning Address or LNURL. */
 "Lightning Address or LNURL" = "Dirección de Lightning o LNURL";
@@ -315,9 +352,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Indicates that the view is for paying a Lightning invoice. */
 "Lightning Invoice" = "Factura de Lightning";

+/* Accessibility Label for Like button */
+"Like" = "Me gusta";
+
 /* Dropdown option label for Lightning wallet, LNLink. */
 "LNLink" = "LNLink";

+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "Autenticación local para acceder a la clave privada";
+
 /* Dropdown option label for system default for Lightning wallet. */
 "Local default" = "Predeterminada del sistema";

@@ -339,19 +382,25 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label for NIP-05 Verification section of user profile form. */
 "NIP-05 Verification" = "Verificación NIP-05";

+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "No";
+
 /* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
 "No block list found, create a new one? This will overwrite any previous block lists." = "No se encontró una lista de bloqueo. ¿Crear una nueva? Esto sobrescribirá las listas de bloqueo anteriores.";

 /* No search results. */
 "none" = "ninguno";

-/* Dropdown option for selecting no translation server. */
+/* Dropdown option for selecting no translation service. */
 "None" = "Ninguno";

+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "La nota incluye una clave privada \"nsec1\". ¿Estas seguro?";
+
 /* Indicates that there are no notes in the timeline to view. */
 "Nothing to see here. Check back later!" = "Nada para ver aquí. ¡Vuelve a consultar luego!";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "Notificaciones";

 /* String indicating that a given timestamp just occurred */
@@ -375,6 +424,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Phoenix. */
 "Phoenix" = "Phoenix";

+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "Plan";
+
 /* Button to post a note. */
 "Post" = "Publicar";

@@ -393,6 +445,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Title of the secure field that holds the user's private key. */
 "Private Key" = "Clave privada";

+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "Pro";
+
 /* Sidebar menu label for Profile view. */
 "Profile" = "Perfil";

@@ -420,11 +475,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
 "Reject" = "Rechazar";

-/* Text field for relay server. Used for testing purposes. */
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
 "Relay" = "Relé";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
+/* Sidebar menu label for Relays view. */
 "Relays" = "Relés";

 /* Description of what was done as a result of sending a report to relay servers. */
@@ -433,6 +488,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button label to remove all participants from a note reply. */
 "Remove all" = "Eliminar todo";

+/* Accessibility label for reply button */
+"Reply" = "Responder";
+
 /* Label to indicate that the user is replying to themself. */
 "Reply to self" = "Respuesta a sí mismo";

@@ -483,6 +541,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Context menu option to save an image. */
 "Save Image" = "Guardar imagen";

+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "Escanea el código";
+
 /* Navigation link to search hashtag. */
 "Search hashtag: #%@" = "Buscar hashtag: #%@";

@@ -504,11 +565,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Prompt selection of LibreTranslate server to perform machine translations on notes */
 "Server" = "Servidor";

+/* Prompt selection of translation service provider. */
+"Service" = "Servicio";
+
 /* Navigation title for Settings view.
   Sidebar menu label for accessing the app settings */
 "Settings" = "Configuración";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
 "Share" = "Compartir";

@@ -516,7 +581,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Toggle to show or hide user's secret account login key. */
 "Show" = "Mostrar";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
 "Show API Key" = "Mostrar clave de API";

 /* Toggle to show or hide selection of wallet. */
@@ -525,9 +591,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Sidebar menu label to sign out of the account. */
 "Sign out" = "Cerrar sesión";

+/* Label to display relay software. */
+"Software" = "Software";
+
 /* Dropdown option label for Lightning wallet, Strike. */
 "Strike" = "Strike";

+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "NIPs soportados";
+
 /* Button to close out of alert that informs that the action to block a user was successful. */
 "Thanks!" = "¡Gracias!";

@@ -546,8 +618,7 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
 "This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Esta es tu clave de cuenta secreta, que necesitas para acceder a tu cuenta. ¡No la compartas con nadie! Guárdala en un administrador de contraseñas y protégela.";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
+/* Navigation bar title for note thread. */
 "Thread" = "Hilo";

 /* Button to translate note from different language. */
@@ -556,6 +627,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to indicate that the note has been translated from a different language. */
 "Translated from (lang)" = "Traducida del (lang)";

+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "Traduciendo del (lang)...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "Traducciones";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "Escriba \"DELETE\" para eliminar";
+
 /* Text box prompt to ask user to type their post. */
 "Type your post here..." = "Escribe tu publicación aquí...";

@@ -587,6 +667,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Label to prompt username entry. */
 "Username" = "Nombre de usuario";

+/* Label to display relay software version. */
+"Version" = "Versión";
+
 /* Sidebar menu label for Wallet view. */
 "Wallet" = "Billetera";

@@ -614,6 +697,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text of button that confirms to overwrite the existing mutelist. */
 "Yes, Overwrite" = "Sí, sobrescribir";

+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private Key" = "Sí, publicar con clave privada";
+
 /* 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. */
 "you" = "tú";

@@ -623,6 +709,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Footer text to inform user what will happen when the report is submitted. */
 "Your report will be sent to the relays you are connected to" = "El reporte se enviará a los relés con los que tengas conexión";

+/* Accessibility label for zap button */
+"Zap" = "Zap";
+
 /* Dropdown option label for Lightning wallet, Zebedee. */
 "Zebedee" = "Zebedee";

@@ -4,6 +4,9 @@
 /* Bundle name */
 "CFBundleName" = "damus";

+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "Authentification pour accès à la clé privée";
+
 /* Privacy - Photo Library Additions Usage Description */
 "NSPhotoLibraryAddUsageDescription" = "Accorder à Damus l'accès à vos photos vous permet d'enregistrer des images.";

@@ -19,8 +19,8 @@
 /* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
@@ -35,8 +35,8 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
 /* 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. */
 "%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Donnez un pourboire aux publications de vos amis et accumulez les sats avec Bitcoin⚡️, la monnaie native d'Internet.";

-/* Number of zap payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -45,7 +45,7 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

-/* No comment provided by engineer. */
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
 "⚡️ %@" = "⚡️ %@";

 /* Label to prompt for about text entry for user to describe about themself. */
@@ -76,12 +76,18 @@ Number of profiles a user is following. */
 /* Label for section for adding a relay server. */
 "Add Relay" = "Ajouter un relais";

+/* Label to display relay contact user. */
+"Admin" = "Admin";
+
 /* Any amount of sats */
 "Any" = "Montant au choix";

-/* Example URL to LibreTranslate server */
+/* Prompt for optional entry of API Key to use translation server. */
 "API Key (optional)" = "Clé d'API (optionnelle)";

+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "Clé d'API (requise)";
+
 /* Alert message to ask if user wants to repost a post. */
 "Are you sure you want to repost this?" = "Êtes-vous sûr de vouloir republier ceci ?";

@@ -120,6 +126,9 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Blue Wallet. */
 "Blue Wallet" = "Blue Wallet";

+/* Accessibility label for boosts button */
+"Boosts" = "Promouvoir";
+
 /* Dropdown option label for Lightning wallet, Breez. */
 "Breez" = "Breez";

@@ -138,15 +147,15 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "Chatter";
-
 /* Button for clearing cached data. */
 "Clear" = "Vider";

 /* Section title for clearing cached data. */
 "Clear Cache" = "Vider le cache";

+/* Label to display relay contact information. */
+"Contact" = "Contact";
+
 /* Label indicating that a user's key was copied. */
 "Copied" = "Copié";

@@ -205,6 +214,9 @@ Number of profiles a user is following. */
 /* Name of the app, shown on the first screen when user is not logged in. */
 "Damus" = "Damus";

+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (Propriétaire, haute précision)";
+
 /* Button to pay a Lightning invoice with the user's default Lightning wallet. */
 "Default Wallet" = "Portefeuille par défaut";

@@ -214,6 +226,15 @@ Number of profiles a user is following. */
   Section title for deleting the user */
 "Delete" = "Effacer";

+/* Button to delete the user's account. */
+"Delete Account" = "Supprimer votre compte";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "Compte supprimé";
+
+/* Label to display relay description. */
+"Description" = "Description";
+
 /* Button to dismiss a text field alert. */
 "Dismiss" = "Rejeter";

@@ -225,10 +246,10 @@ Number of profiles a user is following. */
 "DMs" = "Messages privés";

 /* Button to dismiss wallet selection view for paying Lightning invoice. */
-"Done" = "Fini";
+"Done" = "Terminé";

 /* Heading indicating that this application allows users to earn money. */
-"Earn Money" = "Gagne de l'argent";
+"Earn Money" = "Gagner de l'argent";

 /* Button to edit user's profile. */
 "Edit" = "Modifier";
@@ -248,9 +269,21 @@ Number of profiles a user is following. */
 /* Label indicating that the below text is the EULA, an acronym for End User License Agreement. */
 "EULA" = "CLUF";

+/* No comment provided by engineer. */
+"EventDetailView" = "EventDetailView";
+
+/* No comment provided by engineer. */
+"Filter" = "Filtre";
+
 /* Button to follow a user. */
 "Follow" = "S'abonner";

+/* Button to follow a user back. */
+"Follow Back" = "Suivre en retour";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "Me suivre sur nostr";
+
 /* Label describing followers of a user. */
 "Followers" = "Abonnés";

@@ -264,6 +297,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
 "Follows" = "S'abonner";

+/* Text to indicate that a user is following your profile. */
+"Follows you" = "Vous suit";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "Gratuit";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "Obtenir une clé d'API";
+
 /* Navigation bar title for Global view where posts from all connected relay servers appear. */
 "Global" = "Global";

@@ -276,7 +318,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to hide a post from a user who has been blocked. */
 "Hide" = "Cacher";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
 "Hide API Key" = "Cacher la clé d'API";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
@@ -306,8 +349,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to complete account creation and start using the app. */
 "Let's go!" = "Allons-y!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "Traductions LibreTranslate";
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (Logiciel Libre)";

 /* Placeholder text for entry of Lightning Address or LNURL. */
 "Lightning Address or LNURL" = "Adresse Lightning ou LNURL";
@@ -315,9 +358,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Indicates that the view is for paying a Lightning invoice. */
 "Lightning Invoice" = "Facture Lightning";

+/* Accessibility Label for Like button */
+"Like" = "J'aime";
+
 /* Dropdown option label for Lightning wallet, LNLink. */
 "LNLink" = "LNLink";

+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "Authentification locale pour l'accès à la clé privée";
+
 /* Dropdown option label for system default for Lightning wallet. */
 "Local default" = "Valeur locale par défaut";

@@ -339,19 +388,25 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label for NIP-05 Verification section of user profile form. */
 "NIP-05 Verification" = "Vérification NIP-05";

+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "Non";
+
 /* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
 "No block list found, create a new one? This will overwrite any previous block lists." = "Aucune liste de blocage trouvée, voulez-vous en créer une nouvelle?  Cela va écraser votre liste de blocage existante.";

 /* No search results. */
 "none" = "aucun";

-/* Dropdown option for selecting no translation server. */
+/* Dropdown option for selecting no translation service. */
 "None" = "Aucun";

+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "La note contient une clé privée \"nsec1\".  Êtes-vous certain?";
+
 /* Indicates that there are no notes in the timeline to view. */
 "Nothing to see here. Check back later!" = "Rien à voir ici. Revenez plus tard!";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "Notifications";

 /* String indicating that a given timestamp just occurred */
@@ -366,15 +421,24 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label indicating that a form input is optional. */
 "optional" = "optionnel";

+/* No comment provided by engineer. */
+"Paid Relay" = "Relai payant";
+
 /* Button to pay a Lightning invoice. */
 "Pay" = "Payer";

 /* Navigation bar title for view to pay Lightning invoice. */
 "Pay the Lightning invoice" = "Payer la facture Lightning";

+/* Alert for deleting the users account. */
+"Permanently Delete Account" = "Supprimer le compte définitivement ";
+
 /* Dropdown option label for Lightning wallet, Phoenix. */
 "Phoenix" = "Phoenix";

+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "Plan";
+
 /* Button to post a note. */
 "Post" = "Publication";

@@ -393,6 +457,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Title of the secure field that holds the user's private key. */
 "Private Key" = "Clé Privée";

+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "Pro";
+
 /* Sidebar menu label for Profile view. */
 "Profile" = "Profil";

@@ -420,11 +487,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
 "Reject" = "Refuser";

-/* Text field for relay server. Used for testing purposes. */
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
 "Relay" = "Relais";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
+/* Sidebar menu label for Relays view. */
 "Relays" = "Relais";

 /* Description of what was done as a result of sending a report to relay servers. */
@@ -433,6 +500,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button label to remove all participants from a note reply. */
 "Remove all" = "Tout supprimer";

+/* Accessibility label for reply button */
+"Reply" = "Répondre";
+
 /* Label to indicate that the user is replying to themself. */
 "Reply to self" = "Réponse à soi-même";

@@ -483,6 +553,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Context menu option to save an image. */
 "Save Image" = "Enregistrer l'image";

+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "Scanner le code";
+
 /* Navigation link to search hashtag. */
 "Search hashtag: #%@" = "Rechercher hashtag: #%@";

@@ -504,11 +577,15 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Prompt selection of LibreTranslate server to perform machine translations on notes */
 "Server" = "Serveur";

+/* Prompt selection of translation service provider. */
+"Service" = "Service";
+
 /* Navigation title for Settings view.
   Sidebar menu label for accessing the app settings */
 "Settings" = "Paramètres";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
 "Share" = "Partager";

@@ -516,7 +593,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Toggle to show or hide user's secret account login key. */
 "Show" = "Afficher";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
 "Show API Key" = "Montrer la clé d'API";

 /* Toggle to show or hide selection of wallet. */
@@ -525,15 +603,24 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Sidebar menu label to sign out of the account. */
 "Sign out" = "Se déconnecter";

+/* Label to display relay software. */
+"Software" = "Logiciel";
+
 /* Dropdown option label for Lightning wallet, Strike. */
 "Strike" = "Strike";

+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "NIPs supportés";
+
 /* Button to close out of alert that informs that the action to block a user was successful. */
 "Thanks!" = "Merci!";

 /* Button for user to report that the account is impersonating someone. */
 "They are impersonating someone" = "Ils personnifient quelqu'un";

+/* No comment provided by engineer. */
+"This is a paid relay, you must pay for posts to be accepted." = "C’est un relai payant, vous devez payer pour que vos publications soient acceptées.";
+
 /* Warning that the inputted account key is a public key and the result of what happens because of it. */
 "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." = "Il s'agit d'une clé publique, vous ne pourrez pas publier de messages ou interagir de quelque manière que ce soit. Ceci est utilisé pour visualiser les comptes de leur point de vue.";

@@ -546,16 +633,27 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
 "This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Il s'agit de votre clé de compte secrète. Vous en aurez besoin pour accéder à votre compte. Ne le partagez avec personne ! Enregistrez-la dans un gestionnaire de mots de passe et gardez-la en sécurité!";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
+/* Navigation bar title for note thread. */
 "Thread" = "Fil de discussion";

+/* No comment provided by engineer. */
+"To filter your %@ feed, please choose applicable relays from the list below:" = "Pour filtrer votre fil %@, veuillez choisir les relais applicables dans la liste ci-dessous:";
+
 /* Button to translate note from different language. */
 "Translate Note" = "Traduire la note";

 /* Button to indicate that the note has been translated from a different language. */
 "Translated from (lang)" = "Traduit de (lang)";

+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "Traduction de (lang)...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "Traductions";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "Appuyez sur SUPPRIMER pour supprimer";
+
 /* Text box prompt to ask user to type their post. */
 "Type your post here..." = "Tapez votre message ici...";

@@ -587,6 +685,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Label to prompt username entry. */
 "Username" = "Nom d'utilisateur";

+/* Label to display relay software version. */
+"Version" = "Version";
+
 /* Sidebar menu label for Wallet view. */
 "Wallet" = "Portefeuille";

@@ -614,6 +715,9 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Text of button that confirms to overwrite the existing mutelist. */
 "Yes, Overwrite" = "Oui, écraser";

+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private Key" = "Oui, publier avec clé privée";
+
 /* 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. */
 "you" = "vous";

@@ -623,6 +727,12 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Footer text to inform user what will happen when the report is submitted. */
 "Your report will be sent to the relays you are connected to" = "Votre signalement sera envoyé aux relais auxquels vous êtes connectés";

+/* Accessibility label for zap button */
+"Zap" = "Zap";
+
+/* Navigation bar title for the Zaps view. */
+"Zaps" = "Zaps";
+
 /* Dropdown option label for Lightning wallet, Zebedee. */
 "Zebedee" = "Zebedee";

@@ -19,8 +19,8 @@
 /* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many zap payments there are on a post. In source English, the first variable is the number of zap payments, and the second variable is 'Zap' or 'Zaps'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
@@ -35,8 +35,8 @@ Sentence composed of 2 variables to describe how many profiles a user is followi
 /* 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. */
 "%@. Tip your friend's posts and stack sats with Bitcoin⚡️, the native currency of the internet." = "%@. Paga i tuoi amici e accumula sats con Bitcoin⚡️, la moneta di internet.";

-/* Number of zap payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -45,7 +45,7 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

-/* No comment provided by engineer. */
+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
 "⚡️ %@" = "⚡️ %@";

 /* Label to prompt for about text entry for user to describe about themself. */
@@ -79,7 +79,7 @@ Number of profiles a user is following. */
 /* Any amount of sats */
 "Any" = "Qualsiasi";

-/* Example URL to LibreTranslate server */
+/* Prompt for optional entry of API Key to use translation server. */
 "API Key (optional)" = "API Key (facoltativo)";

 /* Alert message to ask if user wants to repost a post. */
@@ -138,9 +138,6 @@ Number of profiles a user is following. */
 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "Chat";
-
 /* Button for clearing cached data. */
 "Clear" = "Cancella";

@@ -276,7 +273,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to hide a post from a user who has been blocked. */
 "Hide" = "Nascondi";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
 "Hide API Key" = "Nascondi la chiave dell' API";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
@@ -306,9 +304,6 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to complete account creation and start using the app. */
 "Let's go!" = "Andiamo!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "Traduzioni LibreTranslate";
-
 /* Placeholder text for entry of Lightning Address or LNURL. */
 "Lightning Address or LNURL" = "Indirizzo Lightning o LNURL";

@@ -345,13 +340,13 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* No search results. */
 "none" = "Nessun risultato";

-/* Dropdown option for selecting no translation server. */
+/* Dropdown option for selecting no translation service. */
 "None" = "Nessuno";

 /* Indicates that there are no notes in the timeline to view. */
 "Nothing to see here. Check back later!" = "Niente da vedere qui. Controlla dopo!";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "Notifiche";

 /* String indicating that a given timestamp just occurred */
@@ -420,11 +415,11 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
 "Reject" = "Rifiuta";

-/* Text field for relay server. Used for testing purposes. */
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
 "Relay" = "Relay";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
+/* Sidebar menu label for Relays view. */
 "Relays" = "Relays";

 /* Description of what was done as a result of sending a report to relay servers. */
@@ -508,7 +503,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Sidebar menu label for accessing the app settings */
 "Settings" = "Impostazioni";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
 "Share" = "Condividi";

@@ -516,7 +512,8 @@ Part of a larger sentence to describe how many profiles a user is following. */
   Toggle to show or hide user's secret account login key. */
 "Show" = "Mostra";

-/* Button to hide the LibreTranslate server API key. */
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
 "Show API Key" = "Mostra la chiave dell'API";

 /* Toggle to show or hide selection of wallet. */
@@ -546,8 +543,7 @@ Part of a larger sentence to describe how many profiles a user is following. */
 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
 "This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "Questa è la tua chiave privata. Ti serve ad accedere al tuo account. Non condividerla mai con nessuno! Salvala in un gestore password e tienila al sicuro";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
+/* Navigation bar title for note thread. */
 "Thread" = "Thread";

 /* Button to translate note from different language. */
@@ -0,0 +1,12 @@
+/* Bundle display name */
+"CFBundleDisplayName" = "Damus";
+
+/* Bundle name */
+"CFBundleName" = "damus";
+
+/* Privacy - Face ID Usage Description */
+"NSFaceIDUsageDescription" = "秘密鍵にアクセスするためのローカル認証";
+
+/* Privacy - Photo Library Additions Usage Description */
+"NSPhotoLibraryAddUsageDescription" = "Damusが画像を保存するためにあなたの写真にアクセスすることを許可する";
+
@@ -2,42 +2,41 @@
 "   " = "61b6edf1108e6f396680a33b02486a70_tr";

 /* Description of how the nip05 identifier would be used for verification. */
-"'%@' at '%@' will be used for verification" = "'%@' at '%@' 将被用于认证";
+"'%@' at '%@' will be used for verification" = "'%@' at '%@' は認証に使用されています";

 /* Description of why the nip05 identifier is invalid. */
-"'%@' is an invalid NIP-05 identifier. It should look like an email." = "输入的内容 '%@' 是无效NIP-05标识符。有效输入应当为email格式。";
+"'%@' is an invalid NIP-05 identifier. It should look like an email." = "'%@' は無効なNIP-05識別子です。emailのような見た目であるべきです。";

 /* Navigation bar title for view that shows who is following a user. */
-"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "(Profile.displayName(profile: profile, pubkey: whos))的粉丝";
+"(Profile.displayName(profile: profile, pubkey: whos))'s Followers" = "(Profile.displayName(profile: profile, pubkey: whos))のフォロワー";

 /* Navigation bar title for view that shows who a user is following. */
-"(who) following" = "(who)关注";
+"(who) following" = "(who) がフォロー中";

 /* Prefix character to username. */
 "@" = "@";

-/* Amount of time that has passed since reply quote event occurred.
-Abbreviated version of a nostr public key. */
+/* Abbreviated version of a nostr public key. */
 "%@" = "%@";

-/* Sentence composed of 2 variables to describe how many tip payments there are on a post. In source English, the first variable is the number of tip payments, and the second variable is 'Tip' or 'Tips'.
-Sentence composed of 2 variables to describe how many profiles a user is following. In source English, the first variable is the number of profiles being followed, and the second variable is 'Following'. */
+/* Sentence composed of 2 variables to describe how many reposts. In source English, the first variable is the number of reposts, and the second variable is 'Repost' or 'Reposts'.
+Sentence composed of 2 variables to describe how many relay servers a user is connected. In source English, the first variable is the number of relay servers, and the second variable is 'Relay' or 'Relays'. */
 "%@ %@" = "%@ %@";

 /* Alert message that informs a user was blocked. */
-"%@ has been blocked" = "%@被拉黑了";
+"%@ has been blocked" = "%@ はブロックされています";

 /* 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. */
-"%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." = "%@. 创建账户无需电话号码、电子邮箱或者姓名。立刻开启丝滑之旅。";
+"%@. Creating an account doesn't require a phone number, email or name. Get started right away with zero friction." = "%@. アカウントの作成には、電話番号もメールアドレスも名前も必要ありません。すぐに始められます。";

 /* 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. */
-"%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" = "%@. 端到端加密信息，保护你的私信不被科技巨头公司窥视";
+"%@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs" = "%@. End-to-Endで暗号化されたプライベートなメッセージ。 あなたのDMに巨大IT企業を近づけません。";

 /* 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. */
-"%@. 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." = "%@. 友達の投稿にチップを送ろう。インターネットのネイティブ通貨:ビットコイン⚡️で。";

-/* Number of tip payments on a post.
-Number of profiles a user is following. */
+/* Number of reposts.
+Number of relay servers a user is connected. */
 "%lld" = "%lld";

 /* Fraction of how many of the user's relay servers that are operational. */
@@ -46,83 +45,95 @@ Number of profiles a user is following. */
 /* Placeholder for event mention. */
 "< e >" = "< e >";

+/* Text indicating the zap amount. i.e. number of satoshis that were tipped to a user */
+"⚡️ %@" = "⚡️ %@";
+
 /* Label to prompt for about text entry for user to describe about themself. */
-"About" = "关于";
+"About" = "自己紹介";

 /* Label for About Me section of user profile form. */
-"About Me" = "关于我";
+"About Me" = "自己紹介";

 /* Placeholder text for About Me description. */
-"Absolute Boss" = "三界一哥";
+"Absolute Boss" = "絶対的なボス";

 /* Button to accept the end user license agreement before being allowed into the app. */
-"Accept" = "接受";
+"Accept" = "許可";

 /* Label to indicate the public ID of the account. */
-"Account ID" = "账号ID";
+"Account ID" = "アカウントID";

 /* Title for confirmation dialog to either share, report, or block a profile. */
-"Actions" = "动态";
+"Actions" = "アクション";

 /* Button to add recommended relay server.
   Button to confirm adding user inputted relay. */
-"Add" = "添加";
+"Add" = "追加";

 /* Button label to re-add all original participants as profiles to reply to in a note */
-"Add all" = "添加全部";
+"Add all" = "全て追加";

 /* Label for section for adding a relay server. */
-"Add Relay" = "添加中继器";
+"Add Relay" = "Relayを追加";
+
+/* Label to display relay contact user. */
+"Admin" = "管理者";

 /* Any amount of sats */
-"Any" = "任意";
+"Any" = "Any";

-/* Example URL to LibreTranslate server */
-"API Key (optional)" = "API Key (可选)";
+/* Prompt for optional entry of API Key to use translation server. */
+"API Key (optional)" = "APIキー (任意)";
+
+/* Prompt for required entry of API Key to use translation server. */
+"API Key (required)" = "APIキー (必須)";

 /* Alert message to ask if user wants to repost a post. */
-"Are you sure you want to repost this?" = "确定转发吗？";
+"Are you sure you want to repost this?" = "本当にリポストしますか？";

 /* Label for Banner Image section of user profile form. */
-"Banner Image" = "主页背景图片";
+"Banner Image" = "バナー画像";

 /* Reminder to user that they should save their account information. */
-"Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." = "请先保存您的账户信息！否则您将在登出或卸载后无法重新登陆大麦子。";
+"Before we get started, you'll need to save your account info, otherwise you won't be able to login in the future if you ever uninstall Damus." = "始める前に、あなたのアカウント情報を保存しておく必要があります。もし保存しなかった場合、Damusをアンインストールすると今後ログインできなくなります。";

 /* Dropdown option label for Lightning wallet, Bitcoin Beach. */
 "Bitcoin Beach" = "Bitcoin Beach";

 /* Label for Bitcoin Lightning Tips section of user profile form. */
-"Bitcoin Lightning Tips" = "Bitcoin Lightning Tips";
+"Bitcoin Lightning Tips" = "Bitcoin Lightning チップ";

 /* Dropdown option label for Lightning wallet, Blixt Wallet */
-"Blixt Wallet" = "Blixt钱包";
+"Blixt Wallet" = "Blixt Wallet";

 /* Alert button to block a user.
   Button to block a profile.
   Context menu option for blocking users. */
-"Block" = "拉黑";
+"Block" = "ブロック";

 /* Alert message prompt to ask if a user should be blocked. */
-"Block %@?" = "拉黑%@?";
+"Block %@?" = "%@をブロックしますか?";

 /* Title of alert for blocking a user. */
-"Block User" = "拉黑用户";
+"Block User" = "ユーザーをブロック";

 /* Sidebar menu label for Profile view. */
-"Blocked" = "已拉黑";
+"Blocked" = "ブロック中";

 /* Navigation title of view to see list of blocked users. */
-"Blocked Users" = "拉黑用户";
+"Blocked Users" = "ブロックしたユーザー";

 /* Dropdown option label for Lightning wallet, Blue Wallet. */
 "Blue Wallet" = "Blue Wallet";

+/* Accessibility label for boosts button */
+"Boosts" = "ブースト";
+
 /* Dropdown option label for Lightning wallet, Breez. */
 "Breez" = "Breez";

 /* Context menu option for broadcasting the user's note to all of the user's connected relay servers. */
-"Broadcast" = "广播";
+"Broadcast" = "ブロードキャスト";

 /* Alert button to cancel out of alert for blocking a user.
   Button to cancel out of alert that creates a new mutelist.
@@ -131,154 +142,182 @@ Number of profiles a user is following. */
   Button to cancel out of view adding user inputted relay.
   Cancel deleting the user.
   Cancel out of logging out the user. */
-"Cancel" = "取消";
+"Cancel" = "キャンセル";

 /* Dropdown option label for Lightning wallet, Cash App. */
 "Cash App" = "Cash App";

-/* Navigation bar title for Chatroom view. */
-"Chat" = "聊天";
-
 /* Button for clearing cached data. */
-"Clear" = "清除";
+"Clear" = "削除";

 /* Section title for clearing cached data. */
-"Clear Cache" = "清除缓存";
+"Clear Cache" = "キャッシュを削除";
+
+/* Label to display relay contact information. */
+"Contact" = "連絡先";

 /* Label indicating that a user's key was copied. */
-"Copied" = "已复制";
+"Copied" = "コピー完了";

 /* Button to copy a relay server address. */
-"Copy" = "复制";
+"Copy" = "コピー";

 /* Context menu option for copying the ID of the account that created the note. */
-"Copy Account ID" = "复制账户ID";
+"Copy Account ID" = "アカウントIDをコピー";

 /* Context menu option to copy an image into clipboard.
   Context menu option to copy an image to clipboard. */
-"Copy Image" = "复制图片";
+"Copy Image" = "画像をコピー";

 /* Context menu option to copy the URL of an image into clipboard. */
-"Copy Image URL" = "复制图片URL地址";
+"Copy Image URL" = "画像URLをコピー";

 /* Title of section for copying a Lightning invoice identifier. */
-"Copy invoice" = "复制发票";
+"Copy invoice" = "インボイスをコピー";

 /* Context menu option for copying a user's Lightning URL. */
-"Copy LNURL" = "复制LNURL";
+"Copy LNURL" = "LNURLをコピー";

 /* Context menu option for copying the ID of the note. */
-"Copy Note ID" = "复制此条推文ID";
+"Copy Note ID" = "Note IDをコピー";

 /* Context menu option for copying the JSON text from the note. */
-"Copy Note JSON" = "复制此条推文JSON";
+"Copy Note JSON" = "Note JSONをコピー";

 /* Button to copy report ID. */
-"Copy Report ID" = "复制举报记录ID";
+"Copy Report ID" = "通報IDをコピー";

 /* Context menu option for copying the text from an note. */
-"Copy Text" = "复制文本";
+"Copy Text" = "テキストをコピー";

 /* Context menu option for copying the ID of the user who created the note. */
-"Copy User Pubkey" = "复制用户公钥Pubkey";
+"Copy User Pubkey" = "ユーザーの公開鍵をコピー";

 /* Alert message to indicate that the blocked user could not be found. */
-"Could not find user to block..." = "找不到可拉黑用户";
+"Could not find user to block..." = "ブロック対象のユーザーが見つかりませんでした...";

 /* Button to create account. */
-"Create" = "创建";
+"Create" = "作成";

 /* Button to create an account. */
-"Create Account" = "创建账户";
+"Create Account" = "アカウントを作成";

 /* Title of alert prompting the user to create a new mutelist. */
-"Create new mutelist" = "创建新的屏蔽列表";
+"Create new mutelist" = "新しいミュートリストを作成する";

 /* Example description about Bitcoin creator(s), Satoshi Nakamoto. */
-"Creator(s) of Bitcoin. Absolute legend." = "传奇的比特币创始人";
+"Creator(s) of Bitcoin. Absolute legend." = "ビットコインの発明者(達)。紛れもないレジェンド。";

 /* Dropdown option for selecting a custom translation server. */
-"Custom" = "自定义";
+"Custom" = "カスタム";

 /* Name of the app, shown on the first screen when user is not logged in. */
-"Damus" = "大麦子";
+"Damus" = "Damus";
+
+/* Dropdown option for selecting DeepL as the translation service. */
+"DeepL (Proprietary, Higher Accuracy)" = "DeepL (プロプライエタリ, より高精度)";

 /* Button to pay a Lightning invoice with the user's default Lightning wallet. */
-"Default Wallet" = "默认钱包";
+"Default Wallet" = "デフォルトウォレット";

 /* Button for deleting the users account.
   Button to delete a relay server that the user connects to.
   Button to remove a user from their blocklist.
   Section title for deleting the user */
-"Delete" = "删除";
+"Delete" = "削除";
+
+/* Button to delete the user's account. */
+"Delete Account" = "アカウントを削除";
+
+/* Alert message to indicate this is a deleted account */
+"Deleted Account" = "削除されたアカウント";
+
+/* Label to display relay description. */
+"Description" = "詳細";

 /* Button to dismiss a text field alert. */
-"Dismiss" = "忽略";
+"Dismiss" = "却下";

 /* Label to prompt display name entry. */
-"Display Name" = "昵称";
+"Display Name" = "表示名";

 /* Navigation title for DMs view, where DM is the English abbreviation for Direct Message.
   Navigation title for view of DMs, where DM is an English abbreviation for Direct Message. */
-"DMs" = "私信";
+"DMs" = "メッセージ";

 /* Button to dismiss wallet selection view for paying Lightning invoice. */
-"Done" = "完成";
+"Done" = "完了";

 /* Heading indicating that this application allows users to earn money. */
-"Earn Money" = "赚钱";
+"Earn Money" = "Earn Money";

 /* Button to edit user's profile. */
-"Edit" = "编辑";
+"Edit" = "編集";

 /* Text indicating that the view is used for editing which participants are replied to in a note. */
-"Edit participants" = "编辑参加者列表";
+"Edit participants" = "参加者を編集";

 /* Heading indicating that this application keeps private messaging end-to-end encrypted. */
-"Encrypted" = "已加密";
+"Encrypted" = "暗号化されています";

 /* Prompt for user to enter an account key to login. */
-"Enter your account key to login:" = "输入您的账户key以登陆：";
+"Enter your account key to login:" = "ログイン用のアカウントキーを入力してください:";

 /* Error message indicating why saving keys failed. */
-"Error: %@" = "错误：%@";
+"Error: %@" = "エラー: %@";

 /* Label indicating that the below text is the EULA, an acronym for End User License Agreement. */
-"EULA" = "用户条款";
+"EULA" = "EULA";

 /* Button to follow a user. */
-"Follow" = "关注";
+"Follow" = "フォローする";
+
+/* Button to follow a user back. */
+"Follow Back" = "フォローバックする";
+
+/* Text on QR code view to prompt viewer looking at screen to follow the user. */
+"Follow me on nostr" = "nostrでフォローしてね";

 /* Label describing followers of a user. */
-"Followers" = "粉丝";
+"Followers" = "フォロワー";

 /* Text to indicate that the button next to it is in a state that indicates that it is in the process of following a profile.
 Part of a larger sentence to describe how many profiles a user is following. */
-"Following" = "已关注";
+"Following" = "フォロー中";

 /* Label to indicate that the user is in the process of following another user. */
-"Following..." = "关注中...";
+"Following..." = "フォローしています...";

 /* Text to indicate that button next to it is in a state that will follow a profile when tapped. */
-"Follows" = "关注";
+"Follows" = "フォロー";
+
+/* Text to indicate that a user is following your profile. */
+"Follows you" = "フォローされています";
+
+/* Dropdown option for selecting Free plan for DeepL translation service. */
+"Free" = "Free";
+
+/* Button to navigate to DeepL website to get a translation API key. */
+"Get API Key" = "APIキーを取得";

 /* Navigation bar title for Global view where posts from all connected relay servers appear. */
-"Global" = "广场";
+"Global" = "グローバル";

 /* Navigation link to go to post referenced by hex code. */
-"Goto post %@" = "查看推文%@";
+"Goto post %@" = "投稿へ %@";

 /* Navigation link to go to profile. */
-"Goto profile %@" = "查看用户%@";
+"Goto profile %@" = "プロフィールへ %@";

 /* Button to hide a post from a user who has been blocked. */
-"Hide" = "隐藏";
+"Hide" = "非表示";

-/* Button to hide the LibreTranslate server API key. */
-"Hide API Key" = "隐藏API Key";
+/* Button to hide the DeepL translation API key.
+   Button to hide the LibreTranslate server API key. */
+"Hide API Key" = "APIキーを非表示にする";

 /* Navigation bar title for Home view where posts and replies appear from those who the user is following. */
-"Home" = "主页";
+"Home" = "ホーム";

 /* Placeholder example text for profile picture URL. */
 "https://example.com/pic.jpg" = "https://example.com/pic.jpg";
@@ -287,339 +326,391 @@ Part of a larger sentence to describe how many profiles a user is following. */
 "https://jb55.com" = "https://jb55.com";

 /* Button for user to report that the account or content has illegal content. */
-"Illegal content" = "违规内容";
+"Illegal content" = "違法なコンテンツ";

 /* Error message indicating that an invalid account key was entered for login. */
-"Invalid key" = "无效的key";
+"Invalid key" = "無効なキー";

 /* Button for user to report that the account or content has spam. */
-"It's spam" = "这是垃圾信息";
+"It's spam" = "これはスパムです";

 /* Placeholder example text for identifier used for NIP-05 verification. */
 "jb55@jb55.com" = "jb55@jb55.com";

 /* Moves the post button to the left side of the screen */
-"Left Handed" = "左撇子界面";
+"Left Handed" = "左利きモード";

 /* Button to complete account creation and start using the app. */
-"Let's go!" = "开启旅程！";
+"Let's go!" = "Let's go!";

-/* Section title for selecting the server that hosts the LibreTranslate machine translation API. */
-"LibreTranslate Translations" = "LibreTranslate Translations";
+/* Dropdown option for selecting LibreTranslate as the translation service. */
+"LibreTranslate (Open Source)" = "LibreTranslate (オープンソース)";

 /* Placeholder text for entry of Lightning Address or LNURL. */
-"Lightning Address or LNURL" = "闪电地址或LNURL";
+"Lightning Address or LNURL" = "Lightning Address または LNURL";

 /* Indicates that the view is for paying a Lightning invoice. */
-"Lightning Invoice" = "闪电发票";
+"Lightning Invoice" = "Lightning Invoice";
+
+/* Accessibility Label for Like button */
+"Like" = "いいね";

 /* Dropdown option label for Lightning wallet, LNLink. */
 "LNLink" = "LNLink";

+/* Face ID usage description shown when trying to access private key */
+"Local authentication to access private key" = "秘密鍵にアクセスするためのローカル認証";
+
 /* Dropdown option label for system default for Lightning wallet. */
-"Local default" = "本地默认";
+"Local default" = "ローカルのデフォルト";

 /* Button to log into account.
   Button to log into an account. */
-"Login" = "登陆";
+"Login" = "ログイン";

 /* Alert for logging out the user.
   Button for logging out the user.
   Button to close the alert that informs that the current account has been deleted. */
-"Logout" = "登出";
+"Logout" = "ログアウト";

 /* Reminder message in alert to get customer to verify that their private security account key is saved saved before logging out. */
-"Make sure your nsec account key is saved before you logout or you will lose access to this account" = "请确保您已经保存好nsec account key账户私钥！否则登出后您将无法重新访问您的账户。";
+"Make sure your nsec account key is saved before you logout or you will lose access to this account" = "ログアウト前にあなたのnsec秘密鍵を保存していることを確認してください。保存していない場合、アカウントへのアクセスを失うことになります。";

 /* Dropdown option label for Lightning wallet, Muun. */
 "Muun" = "Muun";

 /* Label for NIP-05 Verification section of user profile form. */
-"NIP-05 Verification" = "NIP-05认证";
+"NIP-05 Verification" = "NIP-05検証";
+
+/* Button to cancel out of posting a note after being alerted that it looks like they might be posting a private key. */
+"No" = "中断する";

 /* Alert message prompt that asks if the user wants to create a new block list, overwriting previous block lists. */
-"No block list found, create a new one? This will overwrite any previous block lists." = "没有找到黑名单，是否创建新黑名单？先前的黑名单将被覆盖。";
+"No block list found, create a new one? This will overwrite any previous block lists." = "ブロックリストが見つかりませんでした。新しく作成しますか？これは以前のブロックリストを上書きします。";

 /* No search results. */
-"none" = "无结果";
+"none" = "該当なし";

-/* Dropdown option for selecting no translation server. */
-"None" = "无";
+/* Dropdown option for selecting no translation service. */
+"None" = "利用しない";
+
+/* Alert user that they might be attempting to paste a private key and ask them to confirm. */
+"Note contains \"nsec1\" private key. Are you sure?" = "投稿に \"nsec1\" 秘密鍵が含まれています。本当に続けますか？";

 /* Indicates that there are no notes in the timeline to view. */
-"Nothing to see here. Check back later!" = "暂无内容，请稍后重试。";
+"Nothing to see here. Check back later!" = "まだ何もないようです。また後で見に来てね！";

-/* Navigation title for notifications. */
+/* Toolbar label for Notifications view. */
 "Notifications" = "通知";

 /* String indicating that a given timestamp just occurred */
-"now" = "现在";
+"now" = "たった今";

 /* Prompt for user to enter in an account key to login. This text shows the characters the key could start with if it was a private key. */
 "nsec1..." = "nsec1...";

 /* Button for user to report that the account or content has nudity or explicit content. */
-"Nudity or explicit content" = "裸体或暴露的内容";
+"Nudity or explicit content" = "ヌードまたは露骨なコンテンツ";

 /* Label indicating that a form input is optional. */
-"optional" = "选填";
+"optional" = "任意";

 /* Button to pay a Lightning invoice. */
-"Pay" = "支付";
+"Pay" = "支払う";

 /* Navigation bar title for view to pay Lightning invoice. */
-"Pay the Lightning invoice" = "支付闪电发票";
+"Pay the Lightning invoice" = "Lightning invoiceを支払う";

 /* Dropdown option label for Lightning wallet, Phoenix. */
 "Phoenix" = "Phoenix";

+/* Prompt selection of DeepL subscription plan to perform machine translations on notes */
+"Plan" = "プラン";
+
 /* Button to post a note. */
-"Post" = "发布";
+"Post" = "投稿する";

 /* Text to indicate that what is being shown is a post from a user who has been blocked. */
-"Post from a user you've blocked" = "该推文来自已拉黑用户";
+"Post from a user you've blocked" = "あなたがブロックしたユーザーの投稿";

 /* Label for filter for seeing only posts (instead of posts and replies). */
-"Posts" = "推文";
+"Posts" = "投稿";

 /* Label for filter for seeing posts and replies (instead of only posts). */
-"Posts & Replies" = "推文与回复";
+"Posts & Replies" = "投稿とリプライ";

 /* Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading. */
-"Private" = "私密";
+"Private" = "プライベート";

 /* Title of the secure field that holds the user's private key. */
-"Private Key" = "私钥";
+"Private Key" = "秘密鍵";
+
+/* Dropdown option for selecting Pro plan for DeepL translation service. */
+"Pro" = "Pro";

 /* Sidebar menu label for Profile view. */
-"Profile" = "我的档案";
+"Profile" = "プロフィール";

 /* Label for Profile Picture section of user profile form. */
-"Profile Picture" = "头像";
+"Profile Picture" = "プロフィール画像";

 /* Section title for the user's public account ID. */
-"Public Account ID" = "公开账号ID";
+"Public Account ID" = "パブリックアカウントID";

 /* Label indicating that the text is a user's public account key. */
-"Public key" = "公钥Public Key";
+"Public key" = "公開鍵";

 /* Label indicating that the text is a user's public account key. */
-"Public Key" = "公钥Public Key";
+"Public Key" = "公開鍵";

 /* Prompt to ask user if the key they entered is a public key. */
-"Public Key?" = "输入的是公钥Public Key吗？";
+"Public Key?" = "公開鍵ですか？";

 /* Navigation bar title for Reactions view. */
-"Reactions" = "回应";
+"Reactions" = "リアクション";

 /* Section title for recommend relay servers that could be added as part of configuration */
-"Recommended Relays" = "推荐的中继器";
+"Recommended Relays" = "推奨のリレーサーバー";

 /* Button to reject the end user license agreement, which disallows the user from being let into the app. */
-"Reject" = "拒绝";
+"Reject" = "却下";

-/* Text field for relay server. Used for testing purposes. */
-"Relay" = "中继器";
+/* Label to display relay address.
+   Text field for relay server. Used for testing purposes. */
+"Relay" = "リレー";

-/* Sidebar menu label for Relay servers view
-   Sidebar menu label for Relays view. */
-"Relays" = "中继器";
+/* Sidebar menu label for Relays view. */
+"Relays" = "リレー";

 /* Description of what was done as a result of sending a report to relay servers. */
-"Relays have been notified and clients will be able to use this information to filter content. Thank you!" = "已通知中继器。其他用户将可以使用该信息过滤内容。谢谢！";
+"Relays have been notified and clients will be able to use this information to filter content. Thank you!" = "リレーに通報が通知され、クライアントはこの情報を使ってコンテンツをフィルタリングすることができるようになります。ありがとうございます！";

 /* Button label to remove all participants from a note reply. */
-"Remove all" = "移除全部";
+"Remove all" = "全て削除";
+
+/* Accessibility label for reply button */
+"Reply" = "リプライ";

 /* Label to indicate that the user is replying to themself. */
-"Reply to self" = "自回复";
+"Reply to self" = "自分にリプライ";

 /* Label to indicate that the user is replying to 2 users. */
-"Replying to %@ & %@" = "正在回复%1$@ & %2$@";
+"Replying to %@ & %@" = "%1$@ と %2$@ にリプライ";

 /* Indicating that the user is replying to the following listed people. */
-"Replying to:" = "正在回复：";
+"Replying to:" = "リプライ先:";

 /* Button to report a profile.
   Context menu option for reporting content. */
-"Report" = "举报";
+"Report" = "通報";

 /* Label indicating that the text underneath is the identifier of the report that was sent to relay servers. */
-"Report ID:" = "举报记录ID：";
+"Report ID:" = "通報ID:";

 /* Message indicating that a report was successfully sent to relay servers. */
-"Report sent!" = "举报成功！";
+"Report sent!" = "通報が送信されました！";

 /* Button to confirm reposting a post.
   Title of alert for confirming to repost a post. */
-"Repost" = "转发";
+"Repost" = "リポスト";

 /* Text indicating that the post was reposted (i.e. re-shared). */
-"Reposted" = "已转发";
+"Reposted" = "リポストされました";

 /* Navigation bar title for Reposts view. */
-"Reposts" = "转发";
+"Reposts" = "リポスト";

 /* Picker option for DM selector for seeing only message requests (DMs that someone else sent the user which has not been responded to yet). DM is the English abbreviation for Direct Message. */
-"Requests" = "请求";
+"Requests" = "リクエスト";

 /* Button to retry completing account creation after an error occurred. */
-"Retry" = "重试";
+"Retry" = "リトライ";

 /* Dropdown option label for Lightning wallet, River */
 "River" = "River";

 /* Example username of Bitcoin creator(s), Satoshi Nakamoto. */
-"satoshi" = "satoshi";
+"satoshi" = "サトシ";

 /* Name of Bitcoin creator(s). */
-"Satoshi Nakamoto" = "Satoshi Nakamoto";
+"Satoshi Nakamoto" = "サトシ・ナカモト";

 /* Button for saving profile. */
 "Save" = "保存";

 /* Context menu option to save an image. */
-"Save Image" = "保存图片";
+"Save Image" = "画像を保存する";
+
+/* Text on QR code view to prompt viewer to scan the QR code on screen with their device camera. */
+"Scan the code" = "QRコードをスキャン";

 /* Navigation link to search hashtag. */
-"Search hashtag: #%@" = "热搜词：#%@";
+"Search hashtag: #%@" = "ハッシュタグを検索: #%@";

 /* Placeholder text to prompt entry of search query. */
-"Search..." = "搜索...";
+"Search..." = "検索する...";

 /* Section title for user's secret account login key. */
-"Secret Account Login Key" = "账户私钥";
+"Secret Account Login Key" = "ログイン用秘密鍵";

 /* Title of section for selecting a Lightning wallet to pay a Lightning invoice. */
-"Select a Lightning wallet" = "选择一个闪电钱包";
+"Select a Lightning wallet" = "Lightningウォレットを選択";

 /* Prompt selection of user's default wallet */
-"Select default wallet" = "选择默认钱包";
+"Select default wallet" = "デフォルトのウォレットを選択";

 /* Text prompt for user to send a message to the other user. */
-"Send a message to start the conversation..." = "发送信息来开启聊天吧...";
+"Send a message to start the conversation..." = "会話を開始するにはメッセージを送信してください...";

 /* Prompt selection of LibreTranslate server to perform machine translations on notes */
-"Server" = "服务器";
+"Server" = "サーバー";
+
+/* Prompt selection of translation service provider. */
+"Service" = "サービス";

 /* Navigation title for Settings view.
   Sidebar menu label for accessing the app settings */
-"Settings" = "设置";
+"Settings" = "設定";

-/* Button to share an image.
+/* Button to share a post
+   Button to share an image.
   Button to share the link to a profile. */
-"Share" = "分享";
+"Share" = "共有";

 /* Button to show a post from a user who has been blocked.
   Toggle to show or hide user's secret account login key. */
-"Show" = "显示";
+"Show" = "表示";

-/* Button to hide the LibreTranslate server API key. */
-"Show API Key" = "显示API Key";
+/* Button to show the DeepL translation API key.
+   Button to show the LibreTranslate server API key. */
+"Show API Key" = "APIキーを表示";

 /* Toggle to show or hide selection of wallet. */
-"Show wallet selector" = "显示钱包选择";
+"Show wallet selector" = "ウォレット選択を表示";

 /* Sidebar menu label to sign out of the account. */
-"Sign out" = "登出";
+"Sign out" = "サインアウト";
+
+/* Label to display relay software. */
+"Software" = "ソフトウェア";

 /* Dropdown option label for Lightning wallet, Strike. */
 "Strike" = "Strike";

+/* Label to display relay's supported NIPs. */
+"Supported NIPs" = "対応しているNIP";
+
 /* Button to close out of alert that informs that the action to block a user was successful. */
-"Thanks!" = "谢谢！";
+"Thanks!" = "ありがとう!";

 /* Button for user to report that the account is impersonating someone. */
-"They are impersonating someone" = "抄袭模仿他人";
+"They are impersonating someone" = "誰かになりすましています";

 /* Warning that the inputted account key is a public key and the result of what happens because of it. */
-"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 posts or interact in any way. This is used for viewing accounts from their perspective." = "これは公開鍵で、投稿などの操作は一切できません。入力された公開鍵の視点で投稿を見るために使用します。";

 /* Warning that the inputted account key for login is an old-style and asking user to verify if it is a public key. */
-"This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." = "这是一个老式nostr key。系统无法确定这是公钥还是私钥。如果是公钥，请点击下面的按钮切换。";
+"This is an old-style nostr key. We're not sure if it's a pubkey or private key. Please toggle the button below if this a public key." = "これは古い形式のnostrキーです。公開鍵または秘密鍵かどうかの判別が出来ません。公開鍵の場合は下のボタンをトグルしてください。";

 /* Label to describe that a public key is the user's account ID and what they can do with it. */
-"This is your account ID, you can give this to your friends so that they can follow you. Click to copy." = "这是您的账号ID。您可以把账号ID分享给朋友来邀请他们关注您。点击复制";
+"This is your account ID, you can give this to your friends so that they can follow you. Click to copy." = "これはあなたのアカウントIDで、これを友達に共有すれば、友達はあなたをフォローできます。クリックしてコピー。";

 /* Label to describe that a private key is the user's secret account key and what they should do with it. */
-"This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "这是您的秘密私钥。您需要用这个私钥来访问您的账户。您可以用密码管理器或者其他安全的方式保管您的私钥。切记不要把私钥透露给任何人！";
+"This is your secret account key. You need this to access your account. Don't share this with anyone! Save it in a password manager and keep it safe!" = "これがあなたの秘密鍵です。アカウントにアクセスするにはこれが必要になります。誰にも共有しないでください！パスワードマネージャーに保存して、安全に管理してください！";

-/* Navigation bar title for note thread.
-   Navigation bar title for threaded event detail view. */
-"Thread" = "推文链";
+/* Navigation bar title for note thread. */
+"Thread" = "スレッド";

 /* Button to translate note from different language. */
-"Translate Note" = "翻译推文";
+"Translate Note" = "翻訳する";

 /* Button to indicate that the note has been translated from a different language. */
-"Translated from (languageName!)" = "翻译自 (languageName!)";
+"Translated from (lang)" = "(lang) からの翻訳";
+
+/* Button to indicate that the note is in the process of being translated from a different language. */
+"Translating from (lang)..." = "(lang) から翻訳しています...";
+
+/* Section title for selecting the translation service. */
+"Translations" = "翻訳サービス";
+
+/* Text field prompt asking user to type the word DELETE to confirm that they want to proceed with deleting their account. The all caps lock DELETE word should not be translated. Everything else should. */
+"Type DELETE to delete" = "削除するには DELETE と入力してください";

 /* Text box prompt to ask user to type their post. */
-"Type your post here..." = "说点什么呢...";
+"Type your post here..." = "投稿をここに入力...";

 /* Non-breaking space character to fill in blank space next to event action button icons. */
 "u{00A0}" = "u{00A0}";

 /* Button to unfollow a user. */
-"Unfollow" = "取消关注";
+"Unfollow" = "フォロー解除";

 /* Text to indicate that the button next to it is in  a state that indicates that it is in the process of unfollowing a profile. */
-"Unfollowing" = "取消关注";
+"Unfollowing" = "フォロー解除中";

 /* Label to indicate that the user is in the process of unfollowing another user. */
-"Unfollowing..." = "取消关注...";
+"Unfollowing..." = "フォローを解除しています...";

 /* Text to indicate that the button next to it is in a state that will unfollow a profile when tapped. */
-"Unfollows" = "取消关注";
+"Unfollows" = "フォロー解除";

 /* Example URL to LibreTranslate server */
 "URL" = "URL";

 /* Alert message to indicate the user has been blocked */
-"User blocked" = "用户已被拉黑";
+"User blocked" = "ユーザーをブロックしました";

 /* Alert message that informs a user was blocked. */
-"User has been blocked" = "用户已被拉黑";
+"User has been blocked" = "ユーザーはブロックされています";

 /* Label for Username section of user profile form.
   Label to prompt username entry. */
-"Username" = "用户名";
+"Username" = "ユーザー名";
+
+/* Label to display relay software version. */
+"Version" = "バージョン";

 /* Sidebar menu label for Wallet view. */
-"Wallet" = "钱包";
+"Wallet" = "ウォレット";

 /* Dropdown option label for Lightning wallet, Wallet of Satoshi. */
 "Wallet of Satoshi" = "Wallet of Satoshi";

 /* Section title for selection of wallet. */
-"Wallet Selector" = "选择钱包";
+"Wallet Selector" = "ウォレットを選択";

 /* Label for Website section of user profile form. */
-"Website" = "网站";
+"Website" = "ウェブサイト";

 /* Welcoming message to the reader. The variable is 'you', the reader. */
-"Welcome to the social network %@ control." = "欢迎来到由%@控制的社交网络。";
+"Welcome to the social network %@ control." = "あなたがコントロールするSNSへようこそ。";

 /* Text to welcome user. */
-"Welcome, %@!" = "欢迎，%@！";
+"Welcome, %@!" = "ようこそ, %@!";

 /* Header text to prompt user what issue they want to report. */
-"What do you want to report?" = "您希望举报什么问题？";
+"What do you want to report?" = "通報したい項目は何ですか？";

 /* Placeholder example for relay server address. */
 "wss://some.relay.com" = "wss://some.relay.com";

 /* Text of button that confirms to overwrite the existing mutelist. */
-"Yes, Overwrite" = "确定覆盖";
+"Yes, Overwrite" = "はい、上書きします";
+
+/* Button to proceed with posting a note even though it looks like they might be posting a private key. */
+"Yes, Post with Private 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. */
-"you" = "你";
+"you" = "あなた";

 /* Label for Your Name section of user profile form. */
-"Your Name" = "名字";
+"Your Name" = "あなたの名前";

 /* Footer text to inform user what will happen when the report is submitted. */
-"Your report will be sent to the relays you are connected to" = "您的举报将被发送到您已连接的中继器上";
+"Your report will be sent to the relays you are connected to" = "あなたの通報は接続しているリレーに送信されました";
+
+/* Accessibility label for zap button */
+"Zap" = "Zap";

 /* Dropdown option label for Lightning wallet, Zebedee. */
 "Zebedee" = "Zebedee";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tyiu	2958cff218	Force default zap amount text field to accept only numbers	2023-02-13 23:57:28 -05:00
William Casarin	49cf56f4c2	Show other people's zaps Changelog-Fixed: Fix a bug where zaps on other people's posts weren't showing	2023-02-13 17:50:50 -08:00
William Casarin	98c7bf5afc	Revert "Sidebar Fixes" This reverts commit `6653798d27`.	2023-02-13 16:51:13 -08:00
tyiu	70a7239cfd	Show app version at bottom of ConfigView	2023-02-13 10:07:43 -08:00
William Casarin	0e83632896	Revert "Add the ability to unlike posts" This reverts commit `237c939639`.	2023-02-13 10:04:31 -08:00
Gert Goet	f0df4aa218	Strip common punctuations from URLs Changelog-Fixed: Fix punctuation getting included in some urls Closes: #575	2023-02-13 10:03:35 -08:00
Gert Goet	bb9fc6f905	Always stop at first whitespace	2023-02-13 10:03:17 -08:00
tyiu	f69e0c660a	Fix language detection to look at only text and not URLs or hashtags Changelog-Fixed: Improve language detection Closes: #577	2023-02-13 09:56:26 -08:00
William Casarin	9089246b6b	Merge translations	2023-02-13 09:55:25 -08:00
Oleg Gordiichuk	237c939639	Add the ability to unlike posts Changelog-Added: Add ability to unlike posts Closes: #580	2023-02-13 09:50:14 -08:00
William Casarin	4f86361b63	Revert "Improved blur on images, especially in dark mode" Can't open images anymore This reverts commit `47a6f7ff38`.	2023-02-13 09:46:45 -08:00
William Casarin	209ad71ff3	Update kingfisher to potentially fix some crashes Changelog-Fixed: Fix some animated image crashes	2023-02-13 09:40:02 -08:00
William Casarin	c728850524	Refactor drafts	2023-02-13 09:39:56 -08:00
tyiu	bc638f79f6	Add saved drafts to posts, replies, and DMs Changelog-Added: Save drafts to posts, replies and DMs Closes: #582	2023-02-13 09:39:47 -08:00
Bryan Montz	47a6f7ff38	Improved blur on images, especially in dark mode Changelog-Changed: Improve blur on images, especially in dark mode Closes: #583	2023-02-13 09:14:54 -08:00
Ben Weeks	6653798d27	Sidebar Fixes Closes: #587	2023-02-13 09:13:51 -08:00
William Casarin	e9ea96ffb6	Bump to v1.1.0	2023-02-13 09:13:45 -08:00
tyiu	59ccde9c38	Import translations	2023-02-13 11:43:06 -05:00
tyiu	f9be7b166c	Export source translations	2023-02-12 15:01:49 -05:00
William Casarin	4f2bacfaab	Configurable zap amount	2023-02-10 13:52:27 -08:00
William Casarin	5a8b29b5cc	Fix changelog	2023-02-10 13:20:38 -08:00
William Casarin	679c0ac424	v1.0.0-15 changelog	2023-02-10 12:55:36 -08:00
William Casarin	48050f5e69	build 15	2023-02-10 12:54:59 -08:00
William Casarin	b5c967e161	Use cached zap if we have it	2023-02-10 12:48:28 -08:00
William Casarin	715d4aa35d	List zaps on posts	2023-02-10 12:43:26 -08:00
William Casarin	4b54278378	dismiss relay config on timeline change	2023-02-10 11:28:30 -08:00
William Casarin	6e700e5726	Rename delete account to "permanently delete account"	2023-02-10 11:27:44 -08:00
William Casarin	18ad113198	ActionBarModel: StateObject -> ObservedObject	2023-02-10 11:27:12 -08:00
William Casarin	7415671900	Load zaps, likes and reposts when you open a thread Changelog-Fixed: Load zaps, likes and reposts when you open a thread	2023-02-10 11:09:13 -08:00
William Casarin	d5b6d935e8	fix tests	2023-02-10 11:08:28 -08:00
tyiu	543fd67f35	Import japanese translations Changelog-Added: Japanese translations	2023-02-10 10:52:28 -08:00
Brian Lee	c24689d3ef	Public relay name change Closes: #555	2023-02-10 10:24:49 -08:00
tyiu	bf7120dc08	Add password autofill on account login and creation Changelog-Added: Add password autofill on account login and creation Closes: #559	2023-02-10 10:14:44 -08:00
William Casarin	dbe938ad9b	Add paid relay details	2023-02-10 10:01:17 -08:00
William Casarin	289d55b918	Show paid or global relay type next to relay status Changelog-Added: Show if relay is paid	2023-02-10 09:37:26 -08:00
William Casarin	771fa845e3	Fix bug where sidebar navigation fails to pop when switching timelines Changelog-Fixed: Fix bug where sidebar navigation fails to pop when switching timelines	2023-02-10 09:37:26 -08:00
William Casarin	5f1545b86a	Paid relay detection	2023-02-10 08:27:54 -08:00
William Casarin	fe444228e6	Cached relay metadata	2023-02-09 15:56:26 -08:00
William Casarin	10596ddb09	Relay Filters wip	2023-02-09 14:23:18 -08:00
William Casarin	989684cd37	Use lnaddress before lnurl for tip addresses to avoid Anigma scamming Since anigma is scamming and setting people's lnurls Changelog-Fixed: Use lnaddress before lnurl for tip addresses to avoid Anigma scamming	2023-02-08 12:56:19 -08:00
OlegAba	9ab03034a2	Refactor side menu Changelog-Fixed: Fix sidebar navigation bugs Closes: #460	2023-02-08 09:56:16 -08:00
tyiu	c602c754f8	Import translations	2023-02-08 11:47:46 -05:00
tyiu	c5db887ab1	Export source translations	2023-02-07 23:23:51 -05:00
William Casarin	0563ec8bf8	Fix issue where navigation fails pop to root when switching timelines Sometimes the navigation stack fails to pop, fix this Changelog-Fixed: Fix issue where navigation fails pop to root when switching timelines	2023-02-07 14:09:07 -08:00
William Casarin	29c4170833	Make @ mentions case insensitive Changelog-Fixed: Make @ mentions case insensitive	2023-02-07 12:07:59 -08:00
William Casarin	3c629621eb	Add "Follows You" to profile Changelog-Added: Add "Follows You" indicator on profile	2023-02-07 10:51:08 -08:00
William Casarin	09f12845c0	FollowButton: show "Follows You" if they follow you Changelog-Changed: Show "Follow Back" button on profile page	2023-02-07 10:22:19 -08:00
William Casarin	b882a96206	profile/refactor: break name section into its own function	2023-02-07 10:22:19 -08:00
William Casarin	fb82cc0531	ProfileModel: add follows helper This will be used for "Follows You" logic	2023-02-07 10:20:12 -08:00
William Casarin	90cd48ead7	Merge remote-tracking branch 'tyiu/tyiu/export-translations'	2023-02-07 09:57:17 -08:00
William Casarin	f71b67f036	relays: refactor	2023-02-07 09:56:46 -08:00
tyiu	4406e44424	Export translations	2023-02-07 00:02:26 -05:00
William Casarin	ae6608cf7d	Revert "Add screen to select individual relays when posting/broadcasting" This reverts commit `04759107a2`.	2023-02-06 14:40:54 -08:00
Andrii Sievrikov	04759107a2	Add screen to select individual relays when posting/broadcasting Changelog-Added: Add screen to select individual relays when posting/broadcasting Closes: #525	2023-02-06 13:50:52 -08:00
Joel Klabo	552402f2b5	Add Relay Detail View Changelog-Added: Relay Detail View Closes: #479	2023-02-06 13:21:42 -08:00
tyiu	852609ee30	Add alert to warn against posting nsec1 private keys Changelog-Added: Warn when attempting to post an nsec key Closes: #498	2023-02-06 11:59:44 -08:00
William Casarin	1e44d97a97	refactor: pk_settings_key will use this in the future I'm sure	2023-02-06 11:55:20 -08:00
tyiu	567303e680	Add DeepL translation integration Changelog-Added: DeepL translation integration Closes: #522	2023-02-06 11:51:50 -08:00
tyiu	7d1bac4028	Import translations Closes: #523	2023-02-06 11:31:40 -08:00
William Casarin	eae844e081	Fix event encoding issue	2023-02-06 11:10:23 -08:00
William Casarin	140b0e4fc4	Fix bech32 decoding bug Changelog-Fixed: Fix some lnurls not getting decoded properly	2023-02-06 10:47:13 -08:00
tyiu	0b476faff7	Fix pluralization of Zaps	2023-02-06 10:13:29 -08:00
Andrii Sievrikov	53ec89551b	Add local authentication when accessing private key Changelog-Added: Use local authentication (faceid) to access private key	2023-02-06 10:10:59 -08:00
Bryan Montz	638052492d	Add accessibility labels to EventActionBar Changelog-Added: Add accessibility labels to action bar Closes: #530	2023-02-06 10:06:50 -08:00
William Casarin	45f8c37498	build 14	2023-02-06 10:05:14 -08:00
William Casarin	f96ad99790	zaps: initial configuration for default zap amount	2023-02-06 10:05:02 -08:00
Joel Klabo	1f79c20973	Add Missing Contacts Parameter Closes: #533	2023-02-06 10:04:44 -08:00
tyiu	e8b23daa3d	Fix UX to open relay config view when navigating from personal profile Changelog-Changed: When on your profile page, open relay view instead for your own relays Closes: #541	2023-02-06 10:02:18 -08:00
William Casarin	a2eb77a5e9	Hide incoming dms from blocked users Changelog-Fixed: Hide incoming DMs from blocked users	2023-02-05 10:49:51 -08:00
William Casarin	29a8206586	Hide blocked users from search results Changelog-Fixed: Hide blocked users from search results	2023-02-05 10:49:18 -08:00
William Casarin	07676a1f95	refactor: should_hide_event -> should_show_event	2023-02-05 10:45:02 -08:00
William Casarin	79ca3b2262	remove orangepill from bootstrap relay list	2023-02-05 10:38:54 -08:00
William Casarin	ba8425dedb	Revert "Add remote image loading policy settings" We still want to blur images from stranges if we set the everyone policy. This is a regression. This reverts commit `ced5b4974f`, reversing changes made to `9be55b08fd`.	2023-02-05 00:24:03 -08:00
Andrii Sievrikov	4faf63f29d	Update localization	2023-02-04 23:45:14 -05:00
Andrii Sievrikov	84ad0e03d0	Add local authentication when accessing private key	2023-02-04 23:45:13 -05:00