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

# Conflicts:
#	.env.sample

2 files changed, 54 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",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 7ae6896b..9b2c767b 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -24,6 +24,29 @@
 			}
 		}
 	},
+	"dm": {
+		"chatHeader": "Discussions",
+		"newChatHeader": "Nouveau Discussion",
+		"header": "Messages directs",
+		"searchPrompt": "nom, nip-05 ou clé",
+		"findByUsername": "Trouvez par nom d'utilisateur",
+		"findByNIP05": "Trouvez par NIP-05",
+		"findByPubkey": "Trouvez par clé",
+		"noChats": "Vous avez aucun discussion.",
+		"selectChat": "Chossisez un discussion de la liste à la gauche.",
+		"recipientMsg": "Vous envoyez messages nostr à [R].",
+		"sendMessage": "Envoyez Message",
+		"mute": "Silencez",
+		"unmute": "Réactivez",
+		"expiry": "Expirez messages",
+		"cantSendExpiring": "Aucun des relais de [R] expirent les messages expirants.  Vous ne pouvez pas leur envoyer des messages expirants.",
+		"fadedWarning": "Pour protéger vos métadonées, vos messages expirent à un temps randomée au maximum 2 jours après la date que vous spécifiez; chaque message a son propre temps d’expiration randomée.  Les messages qui semble faibles sont proche à expirer; les autres messages autours pouvait avoir déjà disparu.",
+		"days": "jours",
+		"relaysNotFound": "Ne pouvait pas trouvez les relais MD de [R].",
+		"noRelaysSet": "AVERTISSEMENT: Vous n’avez pas specifié vos relais préferés pour messages directs.  Vous ne pouvez pas reçevoir des messages ou voir les messages que vous avez envoyé.",
+		"nostrSettingsLink": "Spécifiez vos relais en vos préférences Nostr.",
+		"anonymous": "Anonyme"
+	},
 	"error": {
 		"header": "Erreur",
 		"message": "S'il vous plait réessayez ou contactez l'assistance.",
@@ -138,6 +161,7 @@
 		"merch": "Marchandise",
 		"about": "À Propos",
 		"docs": "Documents",
+		"dm": "Messages Nostr",
 		"messages": "Messages",
 		"funds": "Fonds",
 		"dark": "Sombre",
@@ -236,6 +260,9 @@
 			"hours": "heures",
 			"hideSeed": "Cacher la phrase mnémotechnique",
 			"revealSeed": "Montrer la phrase mnémotechnique",
+			"preferredDM": "Relais MD Préferés",
+			"preferredDMDescription": "Messages directs destinés à vous seront publiés à ces relais.  Pour obtiendre des messages sur plusieurs relais, met chaque URL sur son propre ligne.",
+			"noDMURLsWarning": "Vous n'avez pas specifié aucun URL valide.  Vous ne pourrez pas utiliser les messages directs.",
 			"notifications": "Notifications de paiement",
 			"notificationsDesc": "Reçevez un email quand un paiement arrive à votre compte",
 			"seedPhrase": "Phrase mnémotechnique",