From fef5292a123b86fc8e4d098be38b300113aa028c Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 13 Apr 2020 14:45:41 +0200
Subject: [PATCH] Replace JID with 'XMPP Address'

---
 Makefile                             |  3 +++
 locale/af/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/ar/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/bg/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/ca/LC_MESSAGES/converse.po    |  8 ++++----
 locale/converse.pot                  |  8 ++++----
 locale/cs/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/de/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/eo/LC_MESSAGES/converse.po    |  8 ++++----
 locale/es/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/eu/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/fi/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/fr/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/gl/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/he/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/hi/LC_MESSAGES/converse.po    |  8 ++++----
 locale/hu/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/id/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/it/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/ja/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/lt/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/mr/LC_MESSAGES/converse.po    |  8 ++++----
 locale/nb/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/nl/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/nl_BE/LC_MESSAGES/converse.po | 10 +++++-----
 locale/oc/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/pl/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/pt/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/pt_BR/LC_MESSAGES/converse.po |  8 ++++----
 locale/ro/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/ru/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/th/LC_MESSAGES/converse.po    |  8 ++++----
 locale/tr/LC_MESSAGES/converse.po    | 10 +++++-----
 locale/uk/LC_MESSAGES/converse.po    |  8 ++++----
 locale/vi/LC_MESSAGES/converse.po    |  8 ++++----
 locale/zh_CN/LC_MESSAGES/converse.po |  8 ++++----
 locale/zh_TW/LC_MESSAGES/converse.po |  8 ++++----
 src/converse-muc-views.js            |  5 ++++-
 src/converse-rosterview.js           |  2 +-
 39 files changed, 177 insertions(+), 171 deletions(-)

diff --git a/Makefile b/Makefile
index 13abb35c6..5a74c356e 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,9 @@ locale/converse.pot: dist/converse-no-dependencies.js
 	$(GETTEXT) 2>&1 > /dev/null; exit $$?;
 	rm dist/converse-no-dependencies.js
 
+.PHONY: pot
+pot: locale/converse.pot
+
 .PHONY: po
 po:
 	find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \;
diff --git a/locale/af/LC_MESSAGES/converse.po b/locale/af/LC_MESSAGES/converse.po
index 56cad23cd..9c50db138 100644
--- a/locale/af/LC_MESSAGES/converse.po
+++ b/locale/af/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-07 11:23+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/conversejs/"
@@ -1606,8 +1606,8 @@ msgstr "Fout: verskeie gesprek-deelnemers gevind gebaseer op die kriteria"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2219,8 +2219,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om die kontakversoek van %1$s te verwyder"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klik om te klets met %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/ar/LC_MESSAGES/converse.po b/locale/ar/LC_MESSAGES/converse.po
index e389f8f47..637167b66 100644
--- a/locale/ar/LC_MESSAGES/converse.po
+++ b/locale/ar/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-10 10:09+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/conversejs/"
@@ -1585,8 +1585,8 @@ msgstr "يُمكن لكافة المشارِكين في فريق المحادث
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2183,8 +2183,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "أنقر لرفض طلب التراسل مع %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "أنقر للتحدث مع %1$s (JID : %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/bg/LC_MESSAGES/converse.po b/locale/bg/LC_MESSAGES/converse.po
index 19355849a..6ce6d45b0 100644
--- a/locale/bg/LC_MESSAGES/converse.po
+++ b/locale/bg/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-11-08 17:04+0000\n"
 "Last-Translator: Guybrush Threepwood <weblate.oleg@buda.cloud>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/conversejs/"
@@ -1665,8 +1665,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2291,8 +2291,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Натиснете за отказване на заявката за познанство от %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Натиснете за разговор с %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/ca/LC_MESSAGES/converse.po b/locale/ca/LC_MESSAGES/converse.po
index 54e56d8b5..a4b45c0de 100644
--- a/locale/ca/LC_MESSAGES/converse.po
+++ b/locale/ca/LC_MESSAGES/converse.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2018-03-26 18:34+0000\n"
 "Last-Translator: Seve <seve@delape.net>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/conversejs/"
@@ -1665,8 +1665,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2290,7 +2290,7 @@ msgstr "Feu clic per rebutjar aquesta sol·licitud de contacte"
 
 #: dist/converse-no-dependencies.js:71027
 #, fuzzy, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Feu clic per conversar amb aquest contacte"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/converse.pot b/locale/converse.pot
index e10524a39..35e802881 100644
--- a/locale/converse.pot
+++ b/locale/converse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 6.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1516,8 +1516,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2103,7 +2103,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/cs/LC_MESSAGES/converse.po b/locale/cs/LC_MESSAGES/converse.po
index 876502080..6ba4e604a 100644
--- a/locale/cs/LC_MESSAGES/converse.po
+++ b/locale/cs/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-05-03 17:47+0000\n"
 "Last-Translator: Lorem Ipsum <aditoo@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/conversejs/"
@@ -1606,8 +1606,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2237,8 +2237,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Kliknutím odmítnete požadavek o kontakt od uživatele %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Kliknutím začnete chatovat s uživatelem %1$s (JSD: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/de/LC_MESSAGES/converse.po b/locale/de/LC_MESSAGES/converse.po
index 5872c2988..dd823f8a0 100644
--- a/locale/de/LC_MESSAGES/converse.po
+++ b/locale/de/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-03-07 19:33+0000\n"
 "Last-Translator: allo- <allo@laxu.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/conversejs/"
@@ -1622,8 +1622,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2254,8 +2254,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Hier klicken, um die Kontaktanfrage von %1$s abzulehnen"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Hier klicken, um mit %1$s (JID: %2$s) eine Unterhaltung zu beginnen"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/eo/LC_MESSAGES/converse.po b/locale/eo/LC_MESSAGES/converse.po
index b632db0c3..642419550 100644
--- a/locale/eo/LC_MESSAGES/converse.po
+++ b/locale/eo/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 4.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-01-31 14:33+0000\n"
 "Last-Translator: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/conversejs/"
@@ -1563,8 +1563,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2160,7 +2160,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/es/LC_MESSAGES/converse.po b/locale/es/LC_MESSAGES/converse.po
index aee898f85..2d92eaa85 100644
--- a/locale/es/LC_MESSAGES/converse.po
+++ b/locale/es/LC_MESSAGES/converse.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-16 06:50+0000\n"
 "Last-Translator: sergio <srg.dev@posteo.net>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/conversejs/"
@@ -1620,8 +1620,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2245,8 +2245,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Haz clic para rechazar la solicitud de contacto %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Haz clic para conversar con %1$s (JID:%2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/eu/LC_MESSAGES/converse.po b/locale/eu/LC_MESSAGES/converse.po
index dbe3f816c..3347cc659 100644
--- a/locale/eu/LC_MESSAGES/converse.po
+++ b/locale/eu/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-11-21 00:29+0000\n"
 "Last-Translator: aitzol berasategi <aitzol@disroot.org>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/conversejs/"
@@ -1605,8 +1605,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2226,8 +2226,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klikatu %1$s -(r)en kontaktu eskaera baztertzeko"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klikatu %1$s (JID: %2$s) -(r)ekin berriketan egiteko"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/fi/LC_MESSAGES/converse.po b/locale/fi/LC_MESSAGES/converse.po
index 2d175b233..9fbc0e701 100644
--- a/locale/fi/LC_MESSAGES/converse.po
+++ b/locale/fi/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 6.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-08 21:54+0000\n"
 "Last-Translator: anonymous <noreply@weblate.org>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/conversejs/"
@@ -1589,8 +1589,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2206,8 +2206,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Hylkää yhteystietopyyntö kohteesta %1$s napsauttamalla tätä"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Napsauttamalla tätä voit keskustella kohteen %1$s kanssa (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/fr/LC_MESSAGES/converse.po b/locale/fr/LC_MESSAGES/converse.po
index f3c9406de..e1e107ca9 100644
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-29 09:32+0000\n"
 "Last-Translator: Soren KIo <anerruption@disroot.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/conversejs/"
@@ -1617,8 +1617,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2244,8 +2244,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Cliquez pour décliner la demande d’ajout de contact de %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Cliquez pour discuter avec %1$s (JID : %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/gl/LC_MESSAGES/converse.po b/locale/gl/LC_MESSAGES/converse.po
index 808d73cbe..e762a29da 100644
--- a/locale/gl/LC_MESSAGES/converse.po
+++ b/locale/gl/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 4.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-01 14:53+0000\n"
 "Last-Translator: Xosé M <xosem@disroot.org>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/conversejs/"
@@ -1577,8 +1577,8 @@ msgstr "Fallo: atopáronse varios participantes con esos parámetros"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2193,8 +2193,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Pulse para rexeitar a solicitude de contacto de %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Pulse para conversar con %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/he/LC_MESSAGES/converse.po b/locale/he/LC_MESSAGES/converse.po
index 804699c8e..37a024231 100644
--- a/locale/he/LC_MESSAGES/converse.po
+++ b/locale/he/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-01-12 07:21+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/conversejs/"
@@ -1601,8 +1601,8 @@ msgstr "כל שאר המשתתפים בהתכתבות הקבוצתית יכול
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2218,8 +2218,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "יש ללחוץ כדי לסרב לבקשת הקשר שהגיעה מצד %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "יש ללחוץ כדי להתכתב עם %1$s ‏(JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/hi/LC_MESSAGES/converse.po b/locale/hi/LC_MESSAGES/converse.po
index 014b259e6..305b4bfc7 100644
--- a/locale/hi/LC_MESSAGES/converse.po
+++ b/locale/hi/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-01-24 10:04+0000\n"
 "Last-Translator: Chinmay Sharma <infy.chinmaysharma@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/conversejs/"
@@ -1549,8 +1549,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2143,7 +2143,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/hu/LC_MESSAGES/converse.po b/locale/hu/LC_MESSAGES/converse.po
index 2e2f0d921..a59caa525 100644
--- a/locale/hu/LC_MESSAGES/converse.po
+++ b/locale/hu/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-04 18:09+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/conversejs/"
@@ -1599,8 +1599,8 @@ msgstr "Minden konferencia-résztvevő láthatja az XMPP felhasználónevét"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2218,8 +2218,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Kattintson %1$s kapcsolatkérésének elutasításához"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Kattintson a csevegés megkezdéséhez %1$s partnerrel (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/id/LC_MESSAGES/converse.po b/locale/id/LC_MESSAGES/converse.po
index a39339224..1de7ebd7d 100644
--- a/locale/id/LC_MESSAGES/converse.po
+++ b/locale/id/LC_MESSAGES/converse.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-06 18:33+0000\n"
 "Last-Translator: DFI Indonesia <abp.itabp@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/conversejs/"
@@ -1561,8 +1561,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2184,8 +2184,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klik untuk menolak permintaan kontak dari %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klik untuk mengobrol dengan %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/it/LC_MESSAGES/converse.po b/locale/it/LC_MESSAGES/converse.po
index e09507a8f..e34d82c08 100644
--- a/locale/it/LC_MESSAGES/converse.po
+++ b/locale/it/LC_MESSAGES/converse.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-03-04 10:33+0000\n"
 "Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/conversejs/"
@@ -1622,8 +1622,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2251,8 +2251,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Clicca per rifiutare la richiesta di contatto da %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Clicca per conversare con %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/ja/LC_MESSAGES/converse.po b/locale/ja/LC_MESSAGES/converse.po
index 972b634fe..4174a6f10 100644
--- a/locale/ja/LC_MESSAGES/converse.po
+++ b/locale/ja/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-03-19 08:36+0000\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/conversejs/"
@@ -1566,8 +1566,8 @@ msgstr "エラー: 談話室の参加者が複数見つかりました"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2175,8 +2175,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "クリックして %1$s からの申込を拒否"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "クリックして %1$s (JID: %2$s) とチャット"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/lt/LC_MESSAGES/converse.po b/locale/lt/LC_MESSAGES/converse.po
index 43a286cab..793c984e2 100644
--- a/locale/lt/LC_MESSAGES/converse.po
+++ b/locale/lt/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-01-26 15:20+0000\n"
 "Last-Translator: Oleg Kazak <oleg@wroot.lt>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/conversejs/"
@@ -1657,8 +1657,8 @@ msgstr "Klaida: rasti keli grupinio pokalbio dalyviai pagal jūsų argumentą"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2291,8 +2291,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Spustelėkite, jei norite atmesti prašymą pridėti į kontaktus iš %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Spustelėkite, kad pradėtumėte pokalbį su %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/mr/LC_MESSAGES/converse.po b/locale/mr/LC_MESSAGES/converse.po
index f42ab324d..a51db78a8 100644
--- a/locale/mr/LC_MESSAGES/converse.po
+++ b/locale/mr/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-10 03:50+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/conversejs/"
@@ -1522,8 +1522,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2110,7 +2110,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/nb/LC_MESSAGES/converse.po b/locale/nb/LC_MESSAGES/converse.po
index 3babcc410..b6735973e 100644
--- a/locale/nb/LC_MESSAGES/converse.po
+++ b/locale/nb/LC_MESSAGES/converse.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse JS 0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-21 02:32+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -1663,8 +1663,8 @@ msgstr "Alle andre romdeltagere kan se ditt XMPP-brukernavn"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2309,8 +2309,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klikk for å avslå denne kontaktforespørselen fra %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klikk for å sludre med %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/nl/LC_MESSAGES/converse.po b/locale/nl/LC_MESSAGES/converse.po
index e9f582462..c227486c5 100644
--- a/locale/nl/LC_MESSAGES/converse.po
+++ b/locale/nl/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-09-11 15:35+0200\n"
 "Last-Translator: Ezra Zebra <ezra.zebra@protonmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/conversejs/"
@@ -1614,8 +1614,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2242,8 +2242,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om het contactverzoek van %1$s te weigeren"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klik om te chatten met %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/nl_BE/LC_MESSAGES/converse.po b/locale/nl_BE/LC_MESSAGES/converse.po
index b349c179f..6eb502002 100644
--- a/locale/nl_BE/LC_MESSAGES/converse.po
+++ b/locale/nl_BE/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-13 10:12+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/conversejs/"
@@ -1611,8 +1611,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2242,8 +2242,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Klikt voor het contactverzoek van %1$s te weigeren"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Klikt voor te babbelen met %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/oc/LC_MESSAGES/converse.po b/locale/oc/LC_MESSAGES/converse.po
index 6099ac07a..9cf9508b8 100644
--- a/locale/oc/LC_MESSAGES/converse.po
+++ b/locale/oc/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 4.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-04 18:09+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Occitan <https://hosted.weblate.org/projects/conversejs/"
@@ -1608,8 +1608,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2241,8 +2241,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Clicatz per regetar la demanda d’apondon de %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Clicatz per charrar amb %1$s (JID : %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/pl/LC_MESSAGES/converse.po b/locale/pl/LC_MESSAGES/converse.po
index bb16b5925..a9844306b 100644
--- a/locale/pl/LC_MESSAGES/converse.po
+++ b/locale/pl/LC_MESSAGES/converse.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-04 18:09+0000\n"
 "Last-Translator: Michal Biesiada <blade-14@o2.pl>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/conversejs/"
@@ -1606,8 +1606,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2231,8 +2231,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Kliknij, aby odrzucić wniosek o kontakt z %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Kliknij, aby porozmawiać z %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/pt/LC_MESSAGES/converse.po b/locale/pt/LC_MESSAGES/converse.po
index df1d61c5f..3c9b21e6c 100644
--- a/locale/pt/LC_MESSAGES/converse.po
+++ b/locale/pt/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 4.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-07 15:42+0000\n"
 "Last-Translator: Manuela Silva <mmsrs@sky.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/conversejs/"
@@ -1583,8 +1583,8 @@ msgstr "Todos os outros ocupantes da sala podem ver seu nome de usuário XMPP"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2216,8 +2216,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Clique para recusar a solicitação de contato de %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Clique para conversar com %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/pt_BR/LC_MESSAGES/converse.po b/locale/pt_BR/LC_MESSAGES/converse.po
index fd331ebaa..c2fa4299a 100644
--- a/locale/pt_BR/LC_MESSAGES/converse.po
+++ b/locale/pt_BR/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-01-09 14:46+0000\n"
 "Last-Translator: Antonio Morais <antoniomorais360@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -1624,8 +1624,8 @@ msgstr "Todos os outros ocupantes da sala podem ver seu nome de usuário XMPP"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2273,7 +2273,7 @@ msgstr "Clique para recusar a solicitação de contato de %1$s"
 
 #: dist/converse-no-dependencies.js:71027
 #, fuzzy, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Clique para conversar com o contato"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/ro/LC_MESSAGES/converse.po b/locale/ro/LC_MESSAGES/converse.po
index d40992042..c1cf1b413 100644
--- a/locale/ro/LC_MESSAGES/converse.po
+++ b/locale/ro/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-03 02:50+0000\n"
 "Last-Translator: Licaon Kter <licaon.kter@protonmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/conversejs/"
@@ -1599,8 +1599,8 @@ msgstr "Eroare: %1$s nu se găsește în acest grup de discuții"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2207,8 +2207,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Faceți click pentru a refuza solicitarea de contact de la %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Faceți click pentru a discuta cu %1$s (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/ru/LC_MESSAGES/converse.po b/locale/ru/LC_MESSAGES/converse.po
index 895f63fc6..af66d05c7 100644
--- a/locale/ru/LC_MESSAGES/converse.po
+++ b/locale/ru/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-04 18:09+0000\n"
 "Last-Translator: anonymous <noreply@weblate.org>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/conversejs/"
@@ -1607,8 +1607,8 @@ msgstr "Все участники группового чата могут ви
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2235,8 +2235,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "Кликни, что-бы отклонить запрос на добавление от %1$s"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Нажмите для чата с %1$s (Идентификатор Jabber: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/th/LC_MESSAGES/converse.po b/locale/th/LC_MESSAGES/converse.po
index ab719c1c2..576020608 100644
--- a/locale/th/LC_MESSAGES/converse.po
+++ b/locale/th/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 6.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-04 18:09+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/conversejs/"
@@ -1546,8 +1546,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2135,7 +2135,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/tr/LC_MESSAGES/converse.po b/locale/tr/LC_MESSAGES/converse.po
index 62a096309..f47cf9448 100644
--- a/locale/tr/LC_MESSAGES/converse.po
+++ b/locale/tr/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-11-06 14:43+0000\n"
 "Last-Translator: Ömer Çakmak <faruk.omer.cakmak@gmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/conversejs/"
@@ -1603,8 +1603,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2228,8 +2228,8 @@ msgid "Click to decline the contact request from %1$s"
 msgstr "%1$s içinden kişi isteğini reddetmek için tıklayın"
 
 #: dist/converse-no-dependencies.js:71027
-#, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+#, fuzzy, javascript-format
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "%1$s ile sohbet etmek için tıklayın (JID: %2$s)"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/uk/LC_MESSAGES/converse.po b/locale/uk/LC_MESSAGES/converse.po
index 953933872..93fea8d14 100644
--- a/locale/uk/LC_MESSAGES/converse.po
+++ b/locale/uk/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-02-13 23:50+0000\n"
 "Last-Translator: Tymofij Lytvynenko <till.svit@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/conversejs/"
@@ -1622,8 +1622,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2247,7 +2247,7 @@ msgstr "Клацніть, щоб відхилити цей запит конта
 
 #: dist/converse-no-dependencies.js:71027
 #, fuzzy, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "Клацніть, щоб почати розмову з цим контактом"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/vi/LC_MESSAGES/converse.po b/locale/vi/LC_MESSAGES/converse.po
index 2eadc8570..0ed3c5506 100644
--- a/locale/vi/LC_MESSAGES/converse.po
+++ b/locale/vi/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 5.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2019-10-06 11:04+0200\n"
 "Last-Translator: ltdangkhoa <luuthaidangkhoa@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/conversejs/"
@@ -1522,8 +1522,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2110,7 +2110,7 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:71027
 #, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr ""
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/zh_CN/LC_MESSAGES/converse.po b/locale/zh_CN/LC_MESSAGES/converse.po
index 0adc96349..fb71ce9fa 100644
--- a/locale/zh_CN/LC_MESSAGES/converse.po
+++ b/locale/zh_CN/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-12 04:11+0000\n"
 "Last-Translator: Michael Lu <yeskky@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -1598,8 +1598,8 @@ msgstr "错误：无法找到聊天室参与者“%1$s”"
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2209,7 +2209,7 @@ msgstr "按此拒绝%1$s的联系人请求"
 
 #: dist/converse-no-dependencies.js:71027
 #, fuzzy, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "按此与此联系人聊天"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/locale/zh_TW/LC_MESSAGES/converse.po b/locale/zh_TW/LC_MESSAGES/converse.po
index fe0bfae28..36e4866e7 100644
--- a/locale/zh_TW/LC_MESSAGES/converse.po
+++ b/locale/zh_TW/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-13 14:29+0200\n"
+"POT-Creation-Date: 2020-04-13 14:46+0200\n"
 "PO-Revision-Date: 2020-04-07 15:42+0000\n"
 "Last-Translator: Kenny Cheng <pupulight@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
@@ -1609,8 +1609,8 @@ msgstr ""
 
 #: dist/converse-no-dependencies.js:64075
 msgid ""
-"Couldn't find a participant with that nickname or JID. They might have left "
-"the groupchat."
+"Couldn't find a participant with that nickname or XMPP address. They might "
+"have left the groupchat."
 msgstr ""
 
 #: dist/converse-no-dependencies.js:64132
@@ -2248,7 +2248,7 @@ msgstr "点击移除联系人"
 
 #: dist/converse-no-dependencies.js:71027
 #, fuzzy, javascript-format
-msgid "Click to chat with %1$s (JID: %2$s)"
+msgid "Click to chat with %1$s (XMPP address: %2$s)"
 msgstr "点击与对方交谈"
 
 #: dist/converse-no-dependencies.js:71160
diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js
index a87479b65..2074582fc 100644
--- a/src/converse-muc-views.js
+++ b/src/converse-muc-views.js
@@ -1451,7 +1451,10 @@ converse.plugins.add('converse-muc-views', {
                 const reason = args.split(nick_or_jid, 2)[1].trim();
                 const occupant = this.model.getOccupant(nick_or_jid);
                 if (!occupant) {
-                    this.showErrorMessage(__("Couldn't find a participant with that nickname or JID. They might have left the groupchat."));
+                    this.showErrorMessage(__(
+                        "Couldn't find a participant with that nickname or XMPP address. "+
+                        "They might have left the groupchat."
+                    ));
                     return;
                 }
 
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index a656f6fb8..63848496a 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -418,7 +418,7 @@ converse.plugins.add('converse-rosterview', {
                         display_name,
                         status_icon,
                         'desc_status': STATUSES[show],
-                        'desc_chat': __('Click to chat with %1$s (JID: %2$s)', display_name, item.get('jid')),
+                        'desc_chat': __('Click to chat with %1$s (XMPP address: %2$s)', display_name, item.get('jid')),
                         'desc_remove': __('Click to remove %1$s as a contact', display_name),
                         'allow_contact_removal': api.settings.get('allow_contact_removal'),
                         'num_unread': item.get('num_unread') || 0,