Merge remote-tracking branch 'origin/nip17dm'nip17dm-fixes

# Conflicts:
#	.env.sample

1 files changed, 27 insertions, 0 deletions

diff --git a/src/locales/en.json b/src/locales/en.json
index 2d5ef646..229c107c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -92,6 +92,29 @@
 			"description": "Over 500 businesses worldwide are accepting bitcoin with Coinos. We hope that yours will be next!"
 		}
 	},
+	"dm": {
+		"chatHeader": "Chats",
+		"newChatHeader": "New Chat",
+		"header": "Direct Messages",
+		"searchPrompt": "username, nip-05 or pubkey",
+		"findByUsername": "Find by username",
+		"findByNIP05": "Find by NIP-05",
+		"findByPubkey": "Find by pubkey",
+		"noChats": "You don't have any chats yet.",
+		"selectChat": "Select a chat from the list to the left.",
+		"recipientMsg": "You are sending nostr messages to [R].",
+		"sendMessage": "Send Message",
+		"mute": "Mute",
+		"unmute": "Unmute",
+		"expiry": "Enable message expiry",
+		"cantSendExpiring": "None of [R]'s DM relays support message expiry.  You can't send expiring messages to them.",
+		"fadedWarning": "To avoid metadata leaks, messages expire at a random time up to 2 days after you specify; each message has its own random expiry time.  Messages which appear faded are close to expiring; nearby messages may be missing.",
+		"days": "days",
+		"relaysNotFound": "Could not find [R]’s DM relays.",
+		"noRelaysSet": "WARNING: You haven't set any preferred relays.  You won't be able to receive any messages or see the messages you've sent.",
+		"nostrSettingsLink": "Go to your Nostr settings to set your relays.",
+		"anonymous": "Anonymous"
+	},
 	"error": {
 		"header": "Error",
 		"message": "Please try again or contact support.",
@@ -215,6 +238,7 @@
 		"light": "Light",
 		"about": "About",
 		"docs": "Docs",
+		"dm": "Nostr Messages",
 		"messages": "Messages",
 		"funds": "Funds",
 		"map": "Map",
@@ -337,6 +361,9 @@
 			"revealNsec": "Reveal secret key",
 			"hideSeed": "Hide seed phrase",
 			"revealSeed": "Reveal seed phrase",
+			"preferredDM": "Preferred DM Relays",
+			"preferredDMDescription": "Direct Messages meant for you will be published to these relays.  To get DMs on multiple relays, put each relay URL on its own line.",
+			"noDMURLsWarning": "You haven't set any valid relay URLs.  You will not be able to use DMs.",
 			"saveSettings": "Save settings",
 			"bannerImage": "Banner Image",
 			"profileImage": "Profile Image",