From 1157320cba5b1b5eac284d1f7233c13a4515fbd3 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 20 Sep 2018 11:41:59 +0100
Subject: [PATCH] s/canonical address/main address/g for consistency

---
 src/TextForEvent.js         | 4 ++--
 src/i18n/strings/en_EN.json | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 6e119252f1..2b19216a52 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -246,13 +246,13 @@ function textForCanonicalAliasEvent(ev) {
     const newAlias = ev.getContent().alias;
 
     if (newAlias) {
-        return _t('%(senderName)s set the canonical address for this room to %(address)s.', {
+        return _t('%(senderName)s set the main address for this room to %(address)s.', {
             senderName: senderName,
             address: ev.getContent().alias,
         });
     }
     else if (oldAlias) {
-        return _t('%(senderName)s removed the canonical address for this room.', {
+        return _t('%(senderName)s removed the main address for this room.', {
             senderName: senderName,
         });
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 88fb201a1d..a29de76e69 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1251,8 +1251,8 @@
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s removed %(removedAddresses)s as an address for this room.",
     "%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|other": "%(senderName)s removed %(removedAddresses)s as addresses for this room.",
     "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.": "%(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.",
-    "%(senderName)s set the canonical address for this room to %(address)s.": "%(senderName)s set the canonical address for this room to %(address)s.",
-    "%(senderName)s removed the canonical address for this room.": "%(senderName)s removed the canonical address for this room.",
+    "%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s set the main address for this room to %(address)s.",
+    "%(senderName)s removed the main address for this room.": "%(senderName)s removed the main address for this room.",
     "File to import": "File to import",
     "Import": "Import",
     "Failed to set direct chat tag": "Failed to set direct chat tag",