diff --git a/.eslintrc.json b/.eslintrc.json
index 62fc37723..53765ff08 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -190,7 +190,7 @@
         "no-use-before-define": "off",
         "no-useless-call": "error",
         "no-useless-computed-key": "error",
-        "no-useless-concat": "error",
+        "no-useless-concat": "off",
         "no-useless-constructor": "error",
         "no-useless-escape": "off",
         "no-useless-rename": "error",
diff --git a/CHANGES.md b/CHANGES.md
index ca31ba8c5..785383f36 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.2.1 (Unreleased)
+
+### Bugfixes
+- Various IE11 fixes.
+- Translations written as template literals [aren't parsed properly by xgettext](https://savannah.gnu.org/bugs/?50920).
+
 ## 3.2.0 (2017-08-09)
 
 ### New Plugins
diff --git a/Makefile b/Makefile
index ea403a880..84689fdce 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,11 @@ serve_bg: dev
 ########################################################################
 ## Translation machinery
 
-GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.2.0-rc -c
+GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.2.0-rc -c
 
 .PHONY: pot
 pot:
-	$(GETTEXT) --language="javascript" 2>&1 > /dev/null; test $$? -eq 0 && exit 0 || $(GETTEXT) --language="python" && exit $$?;
+	$(GETTEXT) 2>&1 > /dev/null; exit $$?;
 
 .PHONY: po
 po:
diff --git a/locale/af/LC_MESSAGES/converse.po b/locale/af/LC_MESSAGES/converse.po
index 5260d8877..7301b7d31 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2017-04-23 16:53+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/conversejs/"
@@ -22,95 +22,95 @@ msgstr ""
 "lang: af\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr "Boekmerk hierdie kletskamer"
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr "Die naam vir hierdie boekmerk:"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr "Moet hierdie kletskamer outomaties betree word tydens aanmelding?"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr "Wat sal u bynaam vir hierdie kletskamer wees?"
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Stoor"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Kanseleer"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Is u seker u wil die boekmerk \"%1$s\" verwyder?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Jammer, 'n fout het voorgekom tydens storing van u boekmerk."
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik om die boekmerklys te skakel"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Kletskamerboekmerke"
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Sluit en verlaat hierdie kletskamer"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr "Verwyder hierdie boekmerk"
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Boekmerk hierdie kletskamer"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Wys meer inligting aangaande hierdie kletskamer"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Klik om hierdie kletskamer te open"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr "U het ongelese boodskappe"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Sluit hierdie kletskas"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Persoonlike boodskap"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "ek"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
@@ -119,193 +119,198 @@ msgstr ""
 "werkverrigting te ontwrig. Die boodskap word dus slegs in verkorte weergawe "
 "vertoon."
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "tik tans"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "het opgehou tik"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "het weggegaan"
 
 # The last three values are needed by Jed (a Javascript translations library)
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Vertoon hierdie keuselys"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Verwyder boodskappe"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Is u seker u wil die boodskappe in hierdie kletskas uitvee?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "is nou aflyn"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "is besig"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Vee alle boodskappe uit"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Voeg 'n emotikon by"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP Gebruikersnaam:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Klik hier om anoniem aan te meld"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Meld aan"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "gebruiker@bediener"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "wagwoord"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Teken in"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Ek is %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om jou eie statusboodskap te skryf"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Klik om jou klets-status te verander"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Doelgemaakte status"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "aangemeld"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "besig"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "vir lank afwesig"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "afwesig"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "afgemeld"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Aangemeld"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Besig"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Afwesig"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Afgemeld"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Meld af"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Klik om nuwe kletskontakte by te voeg"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Voeg 'n kontak by"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Kontaknaam"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Soek"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr "bv. gebruiker@voorbeeld.org"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Voeg by"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Geen gebruikers gevind"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Jammer, 'n ander fout het voorgekom tydens byvoeging. "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Klik om hierdie kontakte te verskuil"
 
@@ -313,71 +318,71 @@ msgstr "Klik om hierdie kontakte te verskuil"
 msgid "Close this box"
 msgstr "Maak hierdie kletskas toe"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Minimeer hierdie kletskas"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Klik om hierdie klets te herstel"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Geminimaliseer"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Hierdie vertrek is nie anoniem nie"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Hierdie vertrek wys nou onbeskikbare lede"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Hierdie vertrek wys nie onbeskikbare lede nie"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr "Die kamer instellings het verander"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Kamer log is nou aangeskakel"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Kamer log is nou afgeskakel"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 msgid "This room is now no longer anonymous"
 msgstr "Hiedie kamer is nie meer anoniem nie"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Hierdie kamer is nou gedeeltelik anoniem"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Hierdie kamer is nou ten volle anoniem"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "'n Nuwe kamer is geskep"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Jy is uit die kamer verban"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Jy is uit die kamer geskop"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Jy is vanuit die kamer verwyder a.g.v 'n verandering van affiliasie"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -385,7 +390,7 @@ msgstr ""
 "Jy is vanuit die kamer verwyder omdat die kamer nou slegs tot lede beperk "
 "word en jy nie 'n lid is nie"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -403,126 +408,129 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s is verban"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s se bynaam het verander"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s is uitgeskop"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s is verwyder a.g.v 'n verandering van affiliasie"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s is nie 'n lid nie, en dus verwyder"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "U bynaam is outomaties gestel na: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "U bynaam is verander na: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Boodskap"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 msgid "Close and leave this room"
 msgstr "Sluit en verlaat hierdie kletskamer"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 msgid "Configure this room"
 msgstr "Konfigureer hierdie kletskamer"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Verskuil die lys van deelnemers"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Is u seker dat u die boodskappe in hierdie kamer wil verwyder?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Fout: kon nie die opdrag uitvoer nie"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Verander die gebruiker se affiliasie na admin"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Verban gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Verander gebruiker se rol na lid"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Skop gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Verleen lidmaatskap aan 'n gebruiker"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Verwyder gebruiker se vermoë om boodskappe te plaas"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Verander u bynaam"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Verleen moderator rol aan gebruiker"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Verleen eienaarskap van hierdie kamer"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Herroep gebruiker se lidmaatskap"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 msgid "Set room subject"
 msgstr "Stel onderwerp vir kletskamer"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr "Verskaf kamer onderwerp (alias vir /subject)"
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
@@ -530,229 +538,235 @@ msgstr ""
 "Die bynaam wat u gekies het is gereserveer of tans in gebruik, kies asb. 'n "
 "ander een."
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr "Kies asb. u bynaam"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Bynaam"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Hiedie kletskamer benodig 'n wagwoord"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Wagwoord: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Dien in"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Hierdie aksie is uitgevoer deur: %1$s."
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Die gegewe rede is: \"%1$s\"."
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Die gegewe rede is: \"%1$s\"."
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr " het die kamer verlaat.\""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 msgid " has left the room"
 msgstr " het die kletskamer verlaat"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr " het die kamer binnegekom.\""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr " het die kamer bygetree."
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 msgid "You are not on the member list of this room."
 msgstr "Jy is nie op die ledelys van hierdie kamer nie."
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 msgid "You have been banned from this room."
 msgstr "Jy is uit die kamer verban."
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 msgid "No nickname was specified."
 msgstr "Geen bynaam verskaf nie."
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 msgid "You are not allowed to create new rooms."
 msgstr "Jy word nie toegelaat om nog kletskamers te skep nie."
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Jou bynaam voldoen nie aan die kamer se beleid nie."
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 msgid "This room does not (yet) exist."
 msgstr "Hierdie kamer bestaan tans (nog) nie."
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 msgid "This room has reached its maximum number of occupants."
 msgstr "Hierdie kletskamer het sy maksimum aantal deelnemers bereik."
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Onderwerp deur %1$s bygewerk na: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Klik om te noem "
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr "Hierdie gebruiker is 'n moderator."
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr "Hierdie gebruiker kan boodskappe na die kamer stuur."
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie."
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Deelnemers"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 msgid "Features"
 msgstr "Eienskappe"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Verskuil"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr "Boodskap-argivering"
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr "Slegs lede"
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Gemodereer"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Nie-anoniem"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 msgid "Open"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 msgid "Password protected"
 msgstr "Wagwoord"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr "Blywend"
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Deels anoniem"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 msgid "Temporary"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Ongemodereer"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr "Onversekerd"
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 msgid "This room is not publicly searchable"
 msgstr "Hierdie kletskamer is nie publiek opspoorbaar nie"
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr "Boodskappe word op die bediener gestoor"
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 msgid "This room is restricted to members only"
 msgstr "Hierdie kletskamer is slegs tot lede beperk"
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 msgid "This room is being moderated"
 msgstr "Hierdie kletskamer word gemodereer"
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 #, fuzzy
 msgid "All other room occupants can see your XMPP username"
 msgstr "Alle ander deelnemers can u Jabber ID sien"
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 msgid "Anyone can join this room"
 msgstr "Enige iemand kan hierdie kletskamer binnekom"
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 msgid "This room requires a password before entry"
 msgstr "Hierdie kletskamer benodig 'n wagwoord"
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr "Hierdie kletskamer bestaan voort selfs al is dit leeg"
 
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 msgid "This room is publicly searchable"
 msgstr "Hierdie kletskamer is publiek opspoorbaar"
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 #, fuzzy
 msgid "Only moderators can see your XMPP username"
 msgstr "Slegs moderators kan u Jabber ID sien"
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr "Hierdie kletskamer sal verdwyn sodra die laaste persoon dit verlaat"
 
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 msgid "This room is not being moderated"
 msgstr "Hierdie kletskamer word nie gemodereer nie"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 msgid "This room does not require a password upon entry"
 msgstr "Hiedie kletskamer benodig nie 'n wagwoord nie"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "U is op die punt om %1$s na die kletskamer \"%2$s\" uit te nooi. "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -760,78 +774,78 @@ msgstr ""
 "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te "
 "staaf."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Kamer naam"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Bediener"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Wys kletskamers"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Kletskamers"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Geen kletskamers op %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Beskrywing:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Eienskappe:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Benodig magtiging"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Benodig 'n uitnodiging"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Permanente kamer"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s het u uitgenooi om die kletskamer %2$s te besoek"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -860,19 +874,19 @@ msgstr "het aanlyn gekom"
 msgid "wants to be your contact"
 msgstr "wil jou kontak wees"
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Herstel versleutelde sessie"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Genereer private sleutel."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "U webblaaier mag tydelik onreageerbaar word."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -889,19 +903,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Kon nie hierdie gebruiker se identitied bevestig nie."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Sleutels word met gespreksmaat uitgeruil."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "U boodskappe is nie meer versleutel nie"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -909,28 +923,28 @@ msgstr ""
 "U boodskappe is nou versleutel maar u gespreksmaat se identiteit is nog "
 "onseker."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "U gespreksmaat se identiteit is bevestig."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "U gespreksmaat het versleuteling gestaak, u behoort nou dieselfde te doen."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "U boodskap kon nie gestuur word nie"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Ons het 'n onversleutelde boodskap ontvang"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Ons het 'n onleesbare versleutelde boodskap ontvang"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -953,7 +967,7 @@ msgstr ""
 "Indien u die vingerafdrukke bevestig het, klik OK, andersinds klik "
 "Kanselleer."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -968,61 +982,61 @@ msgstr ""
 "dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit "
 "bevestig wees."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Wat is u sekuriteitsvraag?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Wat is die antwoord tot die sekuriteitsvraag?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Ongeldige verifikasiemetode verskaf"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "U boodskappe is nie versleutel nie. Klik hier om OTR versleuteling te "
 "aktiveer."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "U boodskappe is versleutel, maar u gespreksmaat se identiteit is not onseker."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "U boodskappe is versleutel en u gespreksmaat se identiteit bevestig."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "U gespreksmaat het die private sessie gestaak. U behoort dieselfde te doen"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Beëindig versleutelde gesprek"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Verfris versleutelde gesprek"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Begin versleutelde gesprek"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Bevestig met vingerafdrukke"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Bevestig met SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Wat is hierdie?"
 
@@ -1032,47 +1046,47 @@ msgstr "Wat is hierdie?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "nie-privaat"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "onbevestig"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "privaat"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "afgesluit"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " bv. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "U XMPP-verskaffer se domein naam:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Haal die registrasie form"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Wenk: A lys van publieke XMPP-verskaffers is beskikbaar"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "hier"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Registreer"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1080,11 +1094,11 @@ msgstr ""
 "Jammer, die gekose verskaffer ondersteun nie in-band registrasie nie.Probeer "
 "weer met 'n ander verskaffer."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Vra tans die XMPP-bediener vir 'n registrasie vorm"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1093,15 +1107,15 @@ msgstr ""
 "Iets het fout geloop tydens koppeling met \"%1$s\". Is u seker dat dit "
 "bestaan?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "U word nou aangemeld"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Suksesvol geregistreer"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1109,7 +1123,7 @@ msgstr ""
 "Die verskaffer het u registrasieversoek verwerp. Kontrolleer asb. jou gegewe "
 "waardes vir korrektheid."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1128,102 +1142,107 @@ msgstr "Oop kletskamer"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Is u seker u wil die boekmerk \"%1$s\" verwyder?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Hierdie persoon is besig"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Hierdie persoon is aanlyn"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Hierdie persoon is aflyn"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Hierdie persoon is onbeskikbaar"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Hierdie persoon is vir lank afwesig"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Hierdie persoon is afwesig"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Groepe"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "My kontakte"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Hangende kontakte"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Kontak versoeke"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Ongegroepeer"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr "Filtreer"
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr "Kletsstand"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr "Enige"
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr "Geselserig"
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr "Weg vir langer"
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Klik om hierdie kontak te verwyder"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Klik om hierdie kontakversoek te aanvaar"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om hierdie kontakversoek te weier"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Klik om met hierdie kontak te klets"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Naam"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Is u seker u wil hierdie gespreksmaat verwyder?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Jammer, 'n fout het voorgekom tydens die verwydering van "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
 
@@ -1260,18 +1279,12 @@ msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "A fout het voorgekom tydens verbinding met die kletsbediener: "
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Jammer, 'n ander fout het voorgekom tydens byvoeging. "
-
 #~ msgid "Error: the \""
 #~ msgstr "Fout: die \""
 
 #~ msgid "The reason given is: \""
 #~ msgstr "Die gegewe rede is: \""
 
-#~ msgid "Click to mention "
-#~ msgstr "Klik om te noem "
-
 #~ msgid "Rooms on %1$s"
 #~ msgstr "Kletskamers op %1$s"
 
@@ -1280,6 +1293,3 @@ msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
 
 #~ msgid "Return"
 #~ msgstr "Terug"
-
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Jammer, 'n fout het voorgekom tydens die verwydering van "
diff --git a/locale/ca/LC_MESSAGES/converse.po b/locale/ca/LC_MESSAGES/converse.po
index 340ae7d85..c7fc7cebc 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-01-25 17:25+0100\n"
 "Last-Translator: Ruben Mansilla <ramansilla@gmail.com>\n"
 "Language-Team: CA <product@spamina.com>\n"
@@ -26,290 +26,295 @@ msgstr ""
 "gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Desa"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Segur que voleu eliminar aquest contacte?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "S'ha produït un error en intentar eliminar "
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Mostra més informació d'aquesta sala"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Elimina els missatges"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Tanca aquest quadre del xat"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Missatge personal"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "jo"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "està escrivint"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "ha deixat d'escriure"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "ha marxat"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Mostra aquest menú"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Segur que voleu esborrar els missatges d'aquest quadre del xat?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "s'ha desconnectat"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "està ocupat"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Esborra tots els missatges"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Insereix una cara somrient"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Inicia una trucada"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contactes"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Feu clic aquí per iniciar la sessió de manera anònima"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Inicia la sessió"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "usuari@servidor"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "contrasenya"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Inicia la sessió"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Estic %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Feu clic aquí per escriure un missatge d'estat personalitzat"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Feu clic per canviar l'estat del xat"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Estat personalitzat"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "en línia"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "ocupat"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "absent durant una estona"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "desconnectat"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "En línia"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Tanca la sessió"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Feu clic per afegir contactes nous al xat"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Afegeix un contacte"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nom del contacte"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "p. ex. usuari@exemple.com"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "No s'ha trobat cap usuari"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "S'ha produït un error en intentar afegir "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Aquest client no admet les subscripcions de presència"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Feu clic per amagar aquests contactes"
 
@@ -318,74 +323,74 @@ msgstr "Feu clic per amagar aquests contactes"
 msgid "Close this box"
 msgstr "Tanca aquest quadre del xat"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Minimitza aquest quadre del xat"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Feu clic per restaurar aquest xat"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimitzat"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Aquesta sala ara mostra membres no disponibles"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Aquesta sala no mostra membres no disponibles"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr ""
 "S'ha canviat la configuració de la sala no relacionada amb la privadesa"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "El registre de la sala està habilitat"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "El registre de la sala està deshabilitat"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Aquesta sala ara no és anònima"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Aquesta sala ara és parcialment anònima"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Aquesta sala ara és totalment anònima"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "S'ha creat una sala nova"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Se us ha eliminat d'aquesta sala a causa d'un canvi d'afiliació"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -393,7 +398,7 @@ msgstr ""
 "Se us ha eliminat d'aquesta sala perquè ara només permet membres i no en sou "
 "membre"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -411,459 +416,468 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "S'ha expulsat %1$s"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "L'àlies de %1$s ha canviat"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "S'ha expulsat %1$s"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "S'ha eliminat %1$s a causa d'un canvi d'afiliació"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "S'ha eliminat %1$s perquè no és membre"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "El vostre àlies ha canviat automàticament a: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "El vostre àlies ha canviat a: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Missatge"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Amaga la llista d'ocupants"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Segur que voleu esborrar els missatges d'aquesta sala?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Error: no s'ha pogut executar l'ordre"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Canvia l'afiliació de l'usuari a administrador"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Canvia el rol de l'usuari a ocupant"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Atorga una afiliació a un usuari"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Elimina la capacitat de l'usuari de publicar missatges"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Atorga el rol de moderador a l'usuari"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Atorga la propietat d'aquesta sala"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Revoca l'afiliació de l'usuari"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Defineix un tema per a la sala"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Permet que un usuari silenciat publiqui missatges"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Àlies"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Contrasenya:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Envia"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "El vostre àlies ha canviat a: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "El motiu indicat és: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "El motiu indicat és: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "No sou a la llista de membres d'aquesta sala"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "No s'ha especificat cap àlies"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "No teniu permís per crear sales noves"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Aquesta sala (encara) no existeix"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema definit per %1$s en: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Aquest usuari és un moderador"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Aquest usuari pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Aquest usuari NO pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Ocupants"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 #, fuzzy
 msgid "Invite"
 msgstr "Convida..."
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Amagat"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderada"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "No és anònima"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Contrasenya:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semianònima"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "No moderada"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Aquest usuari és un moderador"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Feu clic per obrir aquesta sala"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Aquesta sala de xat requereix una contrasenya"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Aquesta sala no és anònima"
+msgid "This room is restricted to members only"
+msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Aquest usuari és un moderador"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Aquesta sala de xat requereix una contrasenya"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Aquesta sala no és anònima"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Esteu a punt de convidar %1$s a la sala de xat \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nom de la sala"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Uneix-me a la sala"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Mostra les sales"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Sales"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "No hi ha cap sala a %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Ocupants:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Cal autenticar-se"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Cal tenir una invitació"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Sala permanent"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -893,19 +907,19 @@ msgstr "s'ha desconnectat"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "S'està tornant a establir la sessió xifrada"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "S'està generant la clau privada"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "És possible que el navegador no respongui."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -922,19 +936,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "No s'ha pogut verificar la identitat d'aquest usuari."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "S'està intercanviant la clau privada amb el contacte."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Els vostres missatges ja no estan xifrats"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -942,27 +956,27 @@ msgstr ""
 "Ara, els vostres missatges estan xifrats, però no s'ha verificat la "
 "identitat del contacte."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "S'ha verificat la identitat del contacte."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "El contacte ha conclòs el xifratge; cal que feu el mateix."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "No s'ha pogut enviar el missatge"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Hem rebut un missatge sense xifrar"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Hem rebut un missatge xifrat il·legible"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -984,7 +998,7 @@ msgstr ""
 "Si heu confirmat que les empremtes coincideixen, feu clic a D'acord; en cas "
 "contrari, feu clic a Cancel·la."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -999,61 +1013,61 @@ msgstr ""
 "mateixa resposta (es distingeix majúscules de minúscules), se'n verificarà "
 "la identitat."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Quina és la vostra pregunta de seguretat?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Quina és la resposta a la pregunta de seguretat?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "S'ha indicat un esquema d'autenticació no vàlid"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Els vostres missatges no estan xifrats. Feu clic aquí per habilitar el "
 "xifratge OTR."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Els vostres missatges estan xifrats, però no s'ha verificat el contacte."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Els vostres missatges estan xifrats i s'ha verificat el contacte."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "El vostre contacte ha tancat la seva sessió privada; cal que feu el mateix."
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Finalitza la conversa xifrada"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Actualitza la conversa xifrada"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Comença la conversa xifrada"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verifica amb empremtes"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verifica amb SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Què és això?"
 
@@ -1063,47 +1077,47 @@ msgstr "Què és això?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "sense xifrar"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "sense verificar"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verificat"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "acabat"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr "p. ex. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Nom de domini del vostre proveïdor XMPP:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Obtingues un formulari de registre"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Consell: hi ha disponible una llista de proveïdors XMPP públics"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "aquí"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Registre"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1111,11 +1125,11 @@ msgstr ""
 "El proveïdor indicat no admet el registre del compte. Proveu-ho amb un altre "
 "proveïdor."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "S'està sol·licitant un formulari de registre del servidor XMPP"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1124,15 +1138,15 @@ msgstr ""
 "Ha passat alguna cosa mentre s'establia la connexió amb \"%1$s\". Segur que "
 "existeix?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "S'està iniciant la vostra sessió"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Registre correcte"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1140,7 +1154,7 @@ msgstr ""
 "El proveïdor ha rebutjat l'intent de registre. Comproveu que els valors que "
 "heu introduït siguin correctes."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1159,102 +1173,107 @@ msgstr "Obre la sala"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Segur que voleu eliminar aquest contacte?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Aquest contacte està ocupat"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Aquest contacte està en línia"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Aquest contacte està desconnectat"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Aquest contacte no està disponible"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Aquest contacte està absent durant un període prolongat"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Aquest contacte està absent"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Grups"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Els meus contactes"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Contactes pendents"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Sol·licituds de contacte"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Sense agrupar"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Feu clic per eliminar aquest contacte"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Feu clic per acceptar aquesta sol·licitud de contacte"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Feu clic per rebutjar aquesta sol·licitud de contacte"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Feu clic per conversar amb aquest contacte"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Nom"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Segur que voleu eliminar aquest contacte?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "S'ha produït un error en intentar eliminar "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 
@@ -1293,9 +1312,6 @@ msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "S'ha produït un error en intentar desar el formulari."
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "S'ha produït un error en intentar afegir "
-
 #~ msgid "Error: the \""
 #~ msgstr "Error: el \""
 
@@ -1316,17 +1332,10 @@ msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 #~ msgid "Return"
 #~ msgstr "Torna"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "S'ha produït un error en intentar eliminar "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "El motiu indicat és: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Feu clic per obrir aquesta sala"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Error d'autenticació"
diff --git a/locale/converse.pot b/locale/converse.pot
index 95df581f1..6c4fb016e 100644
--- a/locale/converse.pot
+++ b/locale/converse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.2.0-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+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"
@@ -17,283 +17,288 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr ""
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr ""
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 msgid "Click to toggle the bookmarks list"
 msgstr ""
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 msgid "Leave this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 msgid "Unbookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr ""
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr ""
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr ""
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr ""
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr ""
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr ""
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr ""
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr ""
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr ""
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr ""
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr ""
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr ""
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr ""
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr ""
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr ""
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr ""
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr ""
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr ""
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr ""
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr ""
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr ""
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr ""
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr ""
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr ""
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr ""
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr ""
 
@@ -301,77 +306,77 @@ msgstr ""
 msgid "Close this box"
 msgstr ""
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr ""
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr ""
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 msgid "This room is now no longer anonymous"
 msgstr ""
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr ""
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr ""
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr ""
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -387,429 +392,438 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, javascript-format
 msgid "%1$s has been banned"
 msgstr ""
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr ""
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, javascript-format
 msgid "%1$s has been kicked out"
 msgstr ""
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr ""
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr ""
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr ""
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 msgid "Close and leave this room"
 msgstr ""
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 msgid "Configure this room"
 msgstr ""
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr ""
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr ""
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr ""
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 msgid "Set room subject"
 msgstr ""
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr ""
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr ""
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr ""
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr ""
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr ""
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, javascript-format
 msgid "This action was done by %1$s."
 msgstr ""
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 msgid " has left the room"
 msgstr ""
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 msgid "You are not on the member list of this room."
 msgstr ""
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 msgid "You have been banned from this room."
 msgstr ""
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 msgid "No nickname was specified."
 msgstr ""
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 msgid "You are not allowed to create new rooms."
 msgstr ""
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr ""
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 msgid "This room does not (yet) exist."
 msgstr ""
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 msgid "This room has reached its maximum number of occupants."
 msgstr ""
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr ""
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 msgid "Features"
 msgstr ""
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr ""
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr ""
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 msgid "Open"
 msgstr ""
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 msgid "Password protected"
 msgstr ""
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr ""
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 msgid "Temporary"
 msgstr ""
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr ""
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 msgid "This room is not publicly searchable"
 msgstr ""
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 msgid "This room is restricted to members only"
 msgstr ""
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 msgid "This room is being moderated"
 msgstr ""
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 msgid "Anyone can join this room"
 msgstr ""
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 msgid "This room requires a password before entry"
 msgstr ""
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 msgid "This room is publicly searchable"
 msgstr ""
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 msgid "Only moderators can see your XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 msgid "This room is not being moderated"
 msgstr ""
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 msgid "This room does not require a password upon entry"
 msgstr ""
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr ""
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr ""
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr ""
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr ""
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr ""
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr ""
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr ""
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr ""
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr ""
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr ""
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -836,19 +850,19 @@ msgstr ""
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr ""
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -859,45 +873,45 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr ""
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr ""
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr ""
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr ""
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr ""
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr ""
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -911,7 +925,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -920,57 +934,57 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr ""
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr ""
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr ""
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr ""
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr ""
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr ""
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr ""
 
@@ -980,78 +994,78 @@ msgstr ""
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr ""
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr ""
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr ""
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr ""
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1068,101 +1082,106 @@ msgstr ""
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr ""
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr ""
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr ""
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr ""
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr ""
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr ""
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr ""
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr ""
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr ""
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr ""
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr ""
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr ""
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr ""
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr ""
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr ""
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr ""
diff --git a/locale/de/LC_MESSAGES/converse.json b/locale/de/LC_MESSAGES/converse.json
index a614eb1a6..369e693f3 100644
--- a/locale/de/LC_MESSAGES/converse.json
+++ b/locale/de/LC_MESSAGES/converse.json
@@ -9,7 +9,7 @@
          },
          "Bookmark this room": [
             null,
-            "Lesezeichen setzen"
+            "Raum als Lesezeichen setzen"
          ],
          "The name for this bookmark:": [
             null,
@@ -17,7 +17,7 @@
          ],
          "Would you like this room to be automatically joined upon startup?": [
             null,
-            "Diesem Raum automatisch betreten?"
+            "Beim Anmelden diesem Raum automatisch betreten?"
          ],
          "What should your nickname for this room be?": [
             null,
@@ -33,20 +33,32 @@
          ],
          "Are you sure you want to remove the bookmark \"%1$s\"?": [
             null,
-            "Wollen Sie dieses Lesezeichen wirklich entfernen \"%1$s\"?"
+            "Wollen Sie dieses Lesezeichen \"%1$s\" wirklich entfernen?"
          ],
          "Sorry, something went wrong while trying to save your bookmark.": [
             null,
-            "Etwas ging beim Versuch des Abspeicherns des Lesezeichens schief."
+            "Entschuldigung! Beim Versuch das Lesezeichens zu speichern schlug etwas fehl."
          ],
          "Click to toggle the bookmarks list": [
             null,
-            "Zum Aus-/Einklappen klicken"
+            "Liste der Lesezeichen umschalten"
+         ],
+         "Bookmarks": [
+            null,
+            "Lesezeichen"
+         ],
+         "Leave this room": [
+            null,
+            "Diesen Raum verlassen"
          ],
          "Remove this bookmark": [
             null,
             "Dieses Lesezeichen entfernen"
          ],
+         "Unbookmark this room": [
+            null,
+            "Lesezeichen dieses Raums entfernen"
+         ],
          "Show more information on this room": [
             null,
             "Mehr Information über diesen Raum zeigen"
@@ -385,7 +397,7 @@
          ],
          "${command}": [
             null,
-            ""
+            "${command}"
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -489,7 +501,7 @@
          ],
          "${notification.reason}": [
             null,
-            ""
+            "${notification.reason}"
          ],
          " has left the room. \"": [
             null,
@@ -533,7 +545,7 @@
          ],
          "This room has reached its maximum number of occupants.": [
             null,
-            "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
+            "Maximale Anzahl an Mitgliedern für diesen Raum erreicht"
          ],
          "Topic set by %1$s to: %2$s": [
             null,
@@ -553,7 +565,7 @@
          ],
          "Occupants": [
             null,
-            "Teilnehmer"
+            "Teilnehmer/Innen"
          ],
          "Invite": [
             null,
@@ -631,6 +643,10 @@
             null,
             "Dieser Raum ist moderiert"
          ],
+         "All other room occupants can see your XMPP username": [
+            null,
+            "Jeder in dem Raum kann deine XMPP/ Jabber ID sehen"
+         ],
          "Anyone can join this room": [
             null,
             "Jeder kann diesen Raum betreten"
@@ -647,6 +663,10 @@
             null,
             "Dieser Raum ist per Suche auffindbar"
          ],
+         "Only moderators can see your XMPP username": [
+            null,
+            "Nur Moderatoren können deine XMPP/ Jabber ID sehen"
+         ],
          "This room will disappear once the last person leaves": [
             null,
             "Dieser Raum verschwindet sobald diesen die letzte Person verlassen hat"
@@ -669,7 +689,7 @@
          ],
          "Please enter a valid XMPP username": [
             null,
-            ""
+            "Bitte geben Sie eine gültige XMPP/ Jabber ID an"
          ],
          "Room name": [
             null,
@@ -701,7 +721,7 @@
          ],
          "Room Address (JID):": [
             null,
-            ""
+            "XMPP/ Jabber ID (JID) dieses Raumes:"
          ],
          "Occupants:": [
             null,
@@ -813,55 +833,55 @@
          ],
          "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
             null,
-            ""
+            "Sie werden im folgenden nach einer Sicherheitsfrage und dann nach dessen Antwort gefragt.\n\nIhr Kontakt wird dann die Sicherheitsfrage lesen und die Antwort korrekt beantworten müssen (Groß- und Kleinschreibung beachten!) um die Identitäten zu überprüfen."
          ],
          "What is your security question?": [
             null,
-            ""
+            "Wie lautet Ihre Sicherheitsfrage?"
          ],
          "What is the answer to the security question?": [
             null,
-            ""
+            "Wie lautet die Antwort Ihrer Sicherheitsfrage?"
          ],
          "Invalid authentication scheme provided": [
             null,
-            ""
+            "Ungültiges Authentifizierungsmuster wurde zur Verfügung gestellt"
          ],
          "Your messages are not encrypted. Click here to enable OTR encryption.": [
             null,
-            ""
+            "Ihre Nachricht ist unverschlüsselt. Klicken Sie hier um OTR Verschlüsselung zu aktivieren."
          ],
          "Your messages are encrypted, but your contact has not been verified.": [
             null,
-            ""
+            "Ihre Nachrichten werden verschlüsselt aber Ihr Kontakt wurde noch nicht verifiziert/ bestätigt."
          ],
          "Your messages are encrypted and your contact verified.": [
             null,
-            ""
+            "Ihre Nachrichten werden verschlüsselt und Ihr Kontakt wurde bestätigt."
          ],
          "Your contact has closed their end of the private session, you should do the same": [
             null,
-            ""
+            "Ihr Kontakt hat die private Sitzung geschlossen. Sie sollten das gleiche tun."
          ],
          "End encrypted conversation": [
             null,
-            ""
+            "Beende die verschlüsselte Unterhaltung"
          ],
          "Refresh encrypted conversation": [
             null,
-            ""
+            "Verschlüsselte Unterhaltung aktualisieren"
          ],
          "Start encrypted conversation": [
             null,
-            ""
+            "Beginn einer verschlüsselten Unterhaltung"
          ],
          "Verify with fingerprints": [
             null,
-            ""
+            "Überprüfung mit Fingerabdruck"
          ],
          "Verify with SMP": [
             null,
-            ""
+            "Überprüfung mit SMP"
          ],
          "What's this?": [
             null,
@@ -889,7 +909,7 @@
          ],
          "Your XMPP provider's domain name:": [
             null,
-            ""
+            "Ihr XMPP/ Jabber Provider Domain Name:"
          ],
          "Fetch registration form": [
             null,
@@ -897,19 +917,19 @@
          ],
          "Tip: A list of public XMPP providers is available": [
             null,
-            ""
+            "Tipp: Eine Liste öffentlicher Provider ist verfügbar"
          ],
          "here": [
             null,
-            ""
+            "hier"
          ],
          "Register": [
             null,
-            ""
+            "Registrierung"
          ],
          "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
             null,
-            ""
+            "Entschuldigung: Dieser Provider erlaubt keine direkte Benutzer- Registrierung. Versuchen Sie einen anderen Provider oder erstellen Sie einen Zugang beim Provider direkt."
          ],
          "Requesting a registration form from the XMPP server": [
             null,
@@ -917,23 +937,35 @@
          ],
          "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
             null,
-            ""
+            "Etwas schlägt fehl beim Versuch eine Verbindung mit \"%1$s\" her zu stellen. Sicher das \"%1$s\" existiert?"
          ],
          "Now logging you in": [
             null,
-            ""
+            "Sie werden angemeldet"
          ],
          "Registered successfully": [
             null,
-            ""
+            "Registrierung erfolgreich"
          ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
-            ""
+            "Der Provider hat die Registrierung abgelehnt. Bitte überprüfen Sie Ihre Angaben auf Richtigkeit."
          ],
          "Retry": [
             null,
-            ""
+            "Wiederholen"
+         ],
+         "Click to toggle the rooms list": [
+            null,
+            "Umschalten der Raum listen"
+         ],
+         "Open Rooms": [
+            null,
+            "Offene Räume"
+         ],
+         "Are you sure you want to leave the room \"%1$s\"?": [
+            null,
+            "Wollen Sie diesen Raum \"%1$s\" wirklich verlassen?"
          ],
          "This contact is busy": [
             null,
@@ -981,11 +1013,11 @@
          ],
          "Filter": [
             null,
-            ""
+            "Filter"
          ],
          "State": [
             null,
-            ""
+            "Staat"
          ],
          "Any": [
             null,
@@ -993,7 +1025,7 @@
          ],
          "Unread": [
             null,
-            ""
+            "Ungelesen"
          ],
          "Chatty": [
             null,
@@ -1001,7 +1033,19 @@
          ],
          "Extended Away": [
             null,
-            ""
+            "Länger nicht anwesend"
+         ],
+         "Click to remove %1$s as a contact": [
+            null,
+            "Hier klicken um %1$s zu entfernen"
+         ],
+         "Click to accept the contact request from %1$s": [
+            null,
+            "Hier klicken um die Kontaktanfrage von %1$s zu akzeptieren"
+         ],
+         "Click to decline the contact request from %1$s": [
+            null,
+            "Hier klicken um die Kontaktanfrage von %1$s abzulehnen"
          ],
          "Click to chat with this contact": [
             null,
@@ -1009,7 +1053,7 @@
          ],
          "Name": [
             null,
-            ""
+            "Name"
          ],
          "Are you sure you want to remove this contact?": [
             null,
diff --git a/locale/de/LC_MESSAGES/converse.po b/locale/de/LC_MESSAGES/converse.po
index 91b3f04c4..c94fffee7 100644
--- a/locale/de/LC_MESSAGES/converse.po
+++ b/locale/de/LC_MESSAGES/converse.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2017-08-12 18:11+0000\n"
 "Last-Translator: flobee <flobee.code@gmail.com>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/conversejs/translations/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/conversejs/"
+"translations/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,93 +22,93 @@ msgstr ""
 "lang: de\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr "Raum als Lesezeichen setzen"
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr "Der Name für das Lesezeichen:"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr "Beim Anmelden diesem Raum automatisch betreten?"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr "Wie soll dein Nickname in diesem Raum sein?"
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Speichern"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Wollen Sie dieses Lesezeichen \"%1$s\" wirklich entfernen?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 "Entschuldigung! Beim Versuch das Lesezeichens zu speichern schlug etwas fehl."
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 msgid "Click to toggle the bookmarks list"
 msgstr "Liste der Lesezeichen umschalten"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 msgid "Leave this room"
 msgstr "Diesen Raum verlassen"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr "Dieses Lesezeichen entfernen"
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 msgid "Unbookmark this room"
 msgstr "Lesezeichen dieses Raums entfernen"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Mehr Information über diesen Raum zeigen"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Das Chat-Fenster schließen"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Persönliche Nachricht"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr "Senden"
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "Ich"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
@@ -116,193 +116,198 @@ msgstr ""
 "Eine sehr lange Nachricht wurde empfangen. Dies könnte ein Angriff mit dem "
 "Ziel sein die Chat-Performanz zu reduzieren. Die Ausgabe wurde gekürzt."
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr "Schreibt von einem anderen Gerät"
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "tippt"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr "Schreibt nicht mehr auf dem anderen Gerät"
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "tippt nicht mehr"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "ist jetzt abwesend"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Dieses Menü anzeigen"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Nachrichten entfernen"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten dieses Chats löschen möchten?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "ist offline gegangen"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "ist beschäftigt"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Alle Nachrichten löschen"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Smiley einfügen"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Beginne ein Gespräch"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP Benutzername:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Hier klicken um anonym anzumelden"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Anmelden"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "Benutzer@Server"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "passwort"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Anmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Ich bin %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Hier klicken um Statusnachricht zu ändern"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Hier klicken um Status zu ändern"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Statusnachricht"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "beschäftigt"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "länger abwesend"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "abwesend"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "abgemeldet"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Hier klicken um neuen Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Kontakt hinzufügen"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Suche"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr "z.B. benutzer@example.org"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Keine Benutzer gefunden"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Entschuldige, es kam zu einem Fehler bei der Hinzufügung von "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Dieser Kontakt erlaubt die Abonnieren des Status nicht"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Hier klicken um diese Kontakte zu verstecken"
 
@@ -310,71 +315,71 @@ msgstr "Hier klicken um diese Kontakte zu verstecken"
 msgid "Close this box"
 msgstr "Schließen"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Minimiere dieses Gesprächsfenster"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Hier klicken um diesen Chat wiederherzustellen"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimiert"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder an"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder nicht an"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr "Die Raumkonfiguration hat sich geändert"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Nachrichten in diesem Raum werden ab jetzt protokolliert"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Nachrichten in diesem Raum werden nicht mehr protokolliert"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 msgid "This room is now no longer anonymous"
 msgstr "Dieses Zimmer ist jetzt nicht anonym"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Dieser Raum ist jetzt teils anonym"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Dieser Raum ist jetzt anonym"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Ein neuer Raum wurde erstellt"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Sie sind aus diesem Raum verbannt worden"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Sie wurden aus diesem Raum hinausgeworfen"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Sie wurden wegen einer Zugehörigkeitsänderung entfernt"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -382,7 +387,7 @@ msgstr ""
 "Du wurdest aus dem Raum entfernt, da der Raum jetzt nur noch Mitglieder "
 "erlaubt und du kein Mitglied bist"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -400,127 +405,130 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s ist verbannt worden"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s's Spitzname hat sich geändert"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s wurde hinausgeworfen"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s wurde wegen einer Zugehörigkeitsänderung entfernt"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s ist kein Mitglied und wurde daher entfernt"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ihr Spitzname wurde automatisiert geändert zu: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ihr Spitzname wurde geändert zu: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 msgid "Close and leave this room"
 msgstr "Schließe und verlasse diesen Raum"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 msgid "Configure this room"
 msgstr "Einstellungsänderungen an diesem Raum vornehmen"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Teilnehmerliste ausblenden"
 
-#: src/converse-muc.js:971
-msgid "${command}"
-msgstr "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
+msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten in diesem Raum löschen möchten?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Fehler: Konnte den Befehl nicht ausführen"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Ändere die Zugehörigkeit des Benutzers zu Administrator"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Verbanne einen Benutzer aus dem Raum"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Benutzerrolle zu Teilnehmer ändern"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Werfe Benutzer aus dem Raum"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Gewähre einem Benutzer Mitgliedschaft"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Entferne die Möglichkeit des Benutzers Nachrichten zu senden"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Spitznamen ändern"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Gebe Benutzer Moderatorrechte"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Besitzrechte an diesem Raum vergeben"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Widerrufe die Mitgliedschaft des Benutzers"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 msgid "Set room subject"
 msgstr "Chatraum Thema festlegen"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr "Setze Raumthema (alias für /subject)"
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Erlaube stummgeschaltetem Benutzer Nachrichten zu senden"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
@@ -528,305 +536,311 @@ msgstr ""
 "Der gewählte Spitzname ist reserviert oder derzeit in Gebrauch. Bitte wähle "
 "einen Anderen."
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr "Wähle deinen Spitznamen"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr "Betrete Raum"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Abschicken"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Diese Aktion wurde ausgeführt durch %1$s."
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Die angegebene Begründung lautet: \"%1$s\"."
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr "${notification.reason}"
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Die angegebene Begründung lautet: \"%1$s\"."
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr " hat den Raum verlassen. \""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 msgid " has left the room"
 msgstr " hat den Raum verlassen"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr " hat den Raum betreten. \""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr " ist dem Raum beigetreten."
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 msgid "You are not on the member list of this room."
 msgstr "Sie sind nicht auf der Mitgliederliste dieses Raums."
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 msgid "You have been banned from this room."
 msgstr "Sie sind aus diesem Raum verbannt worden."
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 msgid "No nickname was specified."
 msgstr "Kein Spitzname festgelegt."
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 msgid "You are not allowed to create new rooms."
 msgstr "Es ist Ihnen nicht erlaubt neue Räume anzulegen."
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Ungültiger Spitzname."
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 msgid "This room does not (yet) exist."
 msgstr "Dieser Raum existiert (noch) nicht."
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 msgid "This room has reached its maximum number of occupants."
 msgstr "Maximale Anzahl an Mitgliedern für diesen Raum erreicht"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s hat das Thema zu \"%2$s\" geändert"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Hier klicken um diesen Raum zu öffnen"
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr "Dieser Benutzer ist ein Moderator."
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr "Dieser Benutzer kann Nachrichten in diesem Raum verschicken."
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken."
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Teilnehmer/Innen"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 msgid "Features"
 msgstr "Funktionen"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr "Nachrichten Archivierung"
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr "Nur Mitglieder"
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderiert"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Nicht anonym"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 msgid "Open"
 msgstr "Offen"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 msgid "Password protected"
 msgstr "Passwort geschützt"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr "Dauerhaft"
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Öffentlich"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Teils anonym"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 msgid "Temporary"
 msgstr "Vorübergehend"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Unmoderiert"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr "Ungeschützt"
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 msgid "This room is not publicly searchable"
 msgstr "Dieser Raum ist nicht suchbar"
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr "Nachrichten werden auf dem Server archiviert"
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 msgid "This room is restricted to members only"
 msgstr "Dieser Raum ist nur für Mitglieder zugänglich"
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 msgid "This room is being moderated"
 msgstr "Dieser Raum ist moderiert"
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 msgid "All other room occupants can see your XMPP username"
 msgstr "Jeder in dem Raum kann deine XMPP/ Jabber ID sehen"
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 msgid "Anyone can join this room"
 msgstr "Jeder kann diesen Raum betreten"
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 msgid "This room requires a password before entry"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr "Dieser Raum bleibt auch wenn Niemand in ihm ist bestehen"
 
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 msgid "This room is publicly searchable"
 msgstr "Dieser Raum ist per Suche auffindbar"
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 msgid "Only moderators can see your XMPP username"
 msgstr "Nur Moderatoren können deine XMPP/ Jabber ID sehen"
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr "Dieser Raum verschwindet sobald diesen die letzte Person verlassen hat"
 
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 msgid "This room is not being moderated"
 msgstr "Dieser Raum ist unmoderiert"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 msgid "This room does not require a password upon entry"
 msgstr "Dieser Raum erfordert kein Passwort"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Du bist gerade dabei %1$s in den Raum \"%2$s\" einzuladen. "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Du kannst optional eine Nachricht mit den Gründen der Einladung mitsenden."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr "Bitte geben Sie eine gültige XMPP/ Jabber ID an"
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Raumname"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Raum betreten"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Räume anzeigen"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Räume"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Keine Räume auf %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr "XMPP/ Jabber ID (JID) dieses Raumes:"
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Teilnehmer:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Funktionen:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Authentifizierung erforderlich"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Einladung erforderlich"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Dauerhafter Raum"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Vorübergehender Raum"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s hat Sie in den Raum \"%2$s\" eingeladen"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -853,19 +867,19 @@ msgstr "kam online"
 msgid "wants to be your contact"
 msgstr "will dein Kontakt sein"
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Verschlüsselte Sitzung wiederherstellen"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Generiere privaten Schlüssel."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Ihr Browser könnte langsam reagieren."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -881,19 +895,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Die Identität des Benutzers konnte nicht verifiziert werden."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Tausche private Schlüssel mit Kontakt aus."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Deine Nachrichten sind nicht mehr verschlüsselt"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -901,29 +915,29 @@ msgstr ""
 "Deine Nachrichten sind ab jetzt verschlüsselt, aber die Identität des "
 "Kontaktes wurde noch nicht bestätigt."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "Die Identität des Kontakts wurde bestätigt."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Dein Kontakt hat die Verschlüsselung deaktiviert, du solltest das gleiche "
 "tun."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Ihre Nachricht konnte nicht gesendet werden"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Wir haben eine unverschlüsselte Nachricht empfangen"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Wir haben eine unlesbare Nachricht empfangen"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -946,7 +960,7 @@ msgstr ""
 "Wenn du überprüft hast, dass die Fingerabdrücke zusammenpassen, drücke OK, "
 "andernfalls Abbrechen."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -961,62 +975,62 @@ msgstr ""
 "beantworten müssen (Groß- und Kleinschreibung beachten!) um die Identitäten "
 "zu überprüfen."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Wie lautet Ihre Sicherheitsfrage?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Wie lautet die Antwort Ihrer Sicherheitsfrage?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Ungültiges Authentifizierungsmuster wurde zur Verfügung gestellt"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Ihre Nachricht ist unverschlüsselt. Klicken Sie hier um OTR Verschlüsselung "
 "zu aktivieren."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Ihre Nachrichten werden verschlüsselt aber Ihr Kontakt wurde noch nicht "
 "verifiziert/ bestätigt."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Ihre Nachrichten werden verschlüsselt und Ihr Kontakt wurde bestätigt."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "Ihr Kontakt hat die private Sitzung geschlossen. Sie sollten das gleiche tun."
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Beende die verschlüsselte Unterhaltung"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Verschlüsselte Unterhaltung aktualisieren"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Beginn einer verschlüsselten Unterhaltung"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Überprüfung mit Fingerabdruck"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Überprüfung mit SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Was ist das?"
 
@@ -1026,47 +1040,47 @@ msgstr "Was ist das?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "unverschlüsselt"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "nicht verifiziert"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verifiziert"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "erledigt"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " z. B. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Ihr XMPP/ Jabber Provider Domain Name:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tipp: Eine Liste öffentlicher Provider ist verfügbar"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "hier"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Registrierung"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1075,11 +1089,11 @@ msgstr ""
 "Registrierung. Versuchen Sie einen anderen Provider oder erstellen Sie einen "
 "Zugang beim Provider direkt."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1088,15 +1102,15 @@ msgstr ""
 "Etwas schlägt fehl beim Versuch eine Verbindung mit \"%1$s\" her zu stellen. "
 "Sicher das \"%1$s\" existiert?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Sie werden angemeldet"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Registrierung erfolgreich"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1104,7 +1118,7 @@ msgstr ""
 "Der Provider hat die Registrierung abgelehnt. Bitte überprüfen Sie Ihre "
 "Angaben auf Richtigkeit."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr "Wiederholen"
 
@@ -1121,105 +1135,116 @@ msgstr "Offene Räume"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Wollen Sie diesen Raum \"%1$s\" wirklich verlassen?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Dieser Kontakt ist beschäftigt"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Dieser Kontakt ist online"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Dieser Kontakt ist nicht verfügbar"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Dieser Kontakt ist für längere Zeit abwesend"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Dieser Kontakt ist abwesend"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Gruppen"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Meine Kontakte"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Unbestätigte Kontakte"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Kontaktanfragen"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Ungruppiert"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr "Filter"
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr "Staat"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr "Länger nicht anwesend"
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Hier klicken um %1$s zu entfernen"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Hier klicken um die Kontaktanfrage von %1$s zu akzeptieren"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Hier klicken um die Kontaktanfrage von %1$s abzulehnen"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Hier klicken um mit diesem Kontakt zu chatten"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Name"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Wollen Sie diesen Kontakt wirklich entfernen?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Entschuldige, es kam zu einem Fehler bei der Hinzufügung von "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 
+#~ msgid "${command}"
+#~ msgstr "${command}"
+
+#~ msgid "${notification.reason}"
+#~ msgstr "${notification.reason}"
+
 #~ msgid "Click to add as a chat contact"
 #~ msgstr "Hier klicken um als Kontakt hinzuzufügen"
 
@@ -1255,9 +1280,6 @@ msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 #~ "Es trat ein Fehler während des Verbindungsvorgangs mit dem Chat-Server "
 #~ "auf: "
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Entschuldige, es kam zu einem Fehler bei der Hinzufügung von "
-
 #~ msgid "Error: the \""
 #~ msgstr "Fehler: Das \""
 
@@ -1280,10 +1302,6 @@ msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Die angegebene Begründung lautet: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Hier klicken um diesen Raum zu öffnen"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Authentifizierung gescheitert"
diff --git a/locale/es/LC_MESSAGES/converse.po b/locale/es/LC_MESSAGES/converse.po
index af309259c..9032070f6 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Javier Lopez <m@javier.io>\n"
 "Language-Team: ES <LL@li.org>\n"
@@ -25,298 +25,303 @@ msgstr ""
 "X-Is-Fallback-For: es-ar es-bo es-cl es-co es-cr es-do es-ec es-es es-sv es-"
 "gt es-hn es-mx es-ni es-pa es-py es-pe es-pr es-us es-uy es-ve\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Guardar"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Mostrar más información en esta sala"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Eliminar mensajes"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "yo"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Mostrar este menú"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Eliminar mensajes"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "¿Está seguro de querer limpiar los mensajes de esta conversación?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Registrar"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Estoy %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Haga click para escribir un mensaje de estatus personalizado"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Haga click para cambiar su estatus de chat"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Personalizar estatus"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "en línea"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "ausente por mucho tiempo"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "En línea"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Haga click para agregar nuevos contactos al chat"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Agregar un contacto"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Agregar"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Sin usuarios encontrados"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Haga click para eliminar este contacto"
@@ -326,75 +331,75 @@ msgstr "Haga click para eliminar este contacto"
 msgid "Close this box"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Esta sala ahora muestra los miembros no disponibles"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Esta sala no muestra los miembros no disponibles"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr ""
 "Una configuración de la sala no relacionada con la privacidad ha sido "
 "cambiada"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "El registro de la sala ahora está habilitado"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "El registro de la sala ahora está deshabilitado"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Esta sala ahora es pública"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Esta sala ahora es semi-anónima"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Esta sala ahora es completamente anónima"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Una nueva sala ha sido creada"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Usted ha sido bloqueado de esta sala"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Usted ha sido expulsado de esta sala"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Usted ha sido eliminado de esta sala debido a un cambio de afiliación"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -402,7 +407,7 @@ msgstr ""
 "Usted ha sido eliminado de esta sala debido a que la sala cambio su "
 "configuración a solo-miembros y usted no es un miembro"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -420,461 +425,470 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s ha sido bloqueado"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s ha sido bloqueado"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s ha sido expulsado"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s ha sido eliminado debido a un cambio de afiliación"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s ha sido eliminado debido a que no es miembro"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "¿Está seguro de querer limpiar los mensajes de esta sala?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Prohibir usuario de sala de chat."
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "Expulsar usuario de sala de chat."
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "Escribir en tercera persona"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "Expulsar usuario de sala de chat."
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "Escribir en tercera persona"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Usted no está en la lista de miembros de esta sala"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Definir tema de sala de chat"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Usted no está en la lista de miembros de esta sala"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Usted ha sido bloqueado de esta sala"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Sin apodo especificado"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Usted no esta autorizado para crear nuevas salas"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Su apodo no se ajusta a la política de esta sala"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Esta sala (aún) no existe"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Esta sala ha alcanzado su número máximo de ocupantes"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema fijado por %1$s a: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Este usuario es un moderador"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Este usuario puede enviar mensajes en esta sala"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Este usuario NO puede enviar mensajes en esta"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Ocupantes"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Características:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "No anónimo"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Contraseña: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi anónimo"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Sin moderar"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Esta sala ha alcanzado su número máximo de ocupantes"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Este usuario es un moderador"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Haga click para abrir esta sala"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Esta sala de chat requiere una contraseña."
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Esta sala no es para usuarios anónimos"
+msgid "This room is restricted to members only"
+msgstr "Esta sala ha alcanzado su número máximo de ocupantes"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Este usuario es un moderador"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Esta sala de chat requiere una contraseña."
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Esta sala no es para usuarios anónimos"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nombre de sala"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "Unirse"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Mostrar salas"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Sin salas en %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Descripción"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Características:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Autenticación requerida"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Requiere una invitación"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -902,19 +916,19 @@ msgstr "Este contacto está desconectado"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Re-estableciendo sesión cifrada"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Generando llave privada"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Su navegador podría dejar de responder por un momento"
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -930,20 +944,20 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "No se pudo verificar la identidad de este usuario"
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "Intercambiando llaves privadas"
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Sus mensajes han dejado de cifrarse"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -952,29 +966,29 @@ msgstr ""
 "Sus mensajes están ahora cifrados pero la identidad de su contacto no ha "
 "sido verificada."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "La identidad de su contacto ha sido confirmada"
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Su contacto finalizó la sesión cifrada, debería hacer lo mismo"
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Su mensaje no se pudo enviar"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Se recibío un mensaje sin cifrar"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Se recibío un mensaje cifrado corrupto"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -996,7 +1010,7 @@ msgstr ""
 "Después de confirmar los identificadores haga click en OK, cancele si no "
 "concuerdan."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1010,63 +1024,63 @@ msgstr ""
 "La pregunta que responda se le hará a su contacto, si las respuestas "
 "concuerdan (cuidando mayúsculas/minúsculas) su identidad quedará verificada."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Introduzca su pregunta de seguridad"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Introduzca la respuesta a su pregunta de seguridad"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Esquema de autenticación inválido"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Sus mensajes no están cifrados. Haga click aquí para habilitar el cifrado OTR"
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Sus mensajes están cifrados pero la identidad de su contacto no ha sido "
 "verificada"
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Sus mensajes están cifrados y su contacto ha sido verificado"
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "Su contacto finalizó la sesión cifrada, debería hacer lo mismo"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Finalizar sesión cifrada"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Actualizar sesión cifrada"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Iniciar sesión cifrada"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verificar con identificadores"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verificar con SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "¿Qué es esto?"
 
@@ -1076,78 +1090,78 @@ msgstr "¿Qué es esto?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "texto plano"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "sin verificar"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verificado"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1166,102 +1180,107 @@ msgstr "Abrir sala"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Este contacto está ocupado"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Este contacto está en línea"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Este contacto no está disponible"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Este contacto está ausente por un largo periodo de tiempo"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Mis contactos"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Contactos pendientes"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Solicitudes de contacto"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Haga click para conversar con este contacto"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Haga click para eliminar este contacto"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
@@ -1311,10 +1330,6 @@ msgstr "¿Esta seguro de querer eliminar este contacto?"
 #~ msgid "Server:"
 #~ msgstr "Servidor"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Haga click para abrir esta sala"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "La autenticación falló"
diff --git a/locale/fr/LC_MESSAGES/converse.json b/locale/fr/LC_MESSAGES/converse.json
index 0ee2c2468..312a6e9c4 100644
--- a/locale/fr/LC_MESSAGES/converse.json
+++ b/locale/fr/LC_MESSAGES/converse.json
@@ -31,6 +31,10 @@
             null,
             "Annuler"
          ],
+         "Are you sure you want to remove the bookmark \"%1$s\"?": [
+            null,
+            "Voulez-vous vraiment retirer le marque-page « %1$s » ?"
+         ],
          "Sorry, something went wrong while trying to save your bookmark.": [
             null,
             "Désolé, quelque chose s’est mal passé pendant la sauvegarde de ce marque-page."
@@ -39,9 +43,21 @@
             null,
             "Cliquer pour ouvrir la liste des salons"
          ],
+         "Bookmarks": [
+            null,
+            "Marques-page"
+         ],
+         "Leave this room": [
+            null,
+            "Quitter ce salon"
+         ],
          "Remove this bookmark": [
             null,
-            "Supprimer ce marque-page"
+            "Retirer ce marque-page"
+         ],
+         "Unbookmark this room": [
+            null,
+            "Retirer ce salon"
          ],
          "Show more information on this room": [
             null,
@@ -65,7 +81,7 @@
          ],
          "Send": [
             null,
-            ""
+            "Envoyer"
          ],
          "me": [
             null,
@@ -77,7 +93,7 @@
          ],
          "Typing from another device": [
             null,
-            ""
+            "Saisie depuis un autre appareil"
          ],
          "is typing": [
             null,
@@ -85,7 +101,7 @@
          ],
          "Stopped typing on the other device": [
             null,
-            ""
+            "Fin de saisie depuis l’autre appareil"
          ],
          "has stopped typing": [
             null,
@@ -381,7 +397,7 @@
          ],
          "${command}": [
             null,
-            ""
+            "${command}"
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -503,6 +519,34 @@
             null,
             " a rejoint le salon."
          ],
+         "You are not on the member list of this room.": [
+            null,
+            "Vous n’êtes pas dans la liste des membres de ce salon."
+         ],
+         "You have been banned from this room.": [
+            null,
+            "Vous avez été banni de ce salon."
+         ],
+         "No nickname was specified.": [
+            null,
+            "Aucun alias n’a été indiqué."
+         ],
+         "You are not allowed to create new rooms.": [
+            null,
+            "Vous n’êtes pas autorisé à créer des salons."
+         ],
+         "Your nickname doesn't conform to this room's policies.": [
+            null,
+            "Votre alias n’est pas conforme à la politique de ce salon."
+         ],
+         "This room does not (yet) exist.": [
+            null,
+            "Ce salon n’existe pas (pour l’instant)."
+         ],
+         "This room has reached its maximum number of occupants.": [
+            null,
+            "Ce salon a atteint sa limite maximale d’occupants."
+         ],
          "Topic set by %1$s to: %2$s": [
             null,
             "Le sujet « %2$s » a été défini par %1$s"
@@ -583,6 +627,10 @@
             null,
             "Non sécurisé"
          ],
+         "This room is not publicly searchable": [
+            null,
+            "Ce salon ne peut pas être recherché publiquement"
+         ],
          "Messages are archived on the server": [
             null,
             "Les messages sont archivés sur le serveur"
@@ -595,6 +643,10 @@
             null,
             "Ce salon est modéré"
          ],
+         "All other room occupants can see your XMPP username": [
+            null,
+            "Tous les autres occupants de ce salon peuvent voir votre nom d’utilisateur XMPP"
+         ],
          "Anyone can join this room": [
             null,
             "N’importe qui peut rejoindre ce salon"
@@ -603,6 +655,18 @@
             null,
             "Ce salon nécessite un mot de passe pour y accéder"
          ],
+         "This room persists even if it's unoccupied": [
+            null,
+            "Ce salon persiste même s'il est inoccupé"
+         ],
+         "This room is publicly searchable": [
+            null,
+            "Ce salon peut être recherché publiquement"
+         ],
+         "Only moderators can see your XMPP username": [
+            null,
+            "Seuls les modérateurs peuvent voir votre identifiant XMPP"
+         ],
          "This room will disappear once the last person leaves": [
             null,
             "Ce salon disparaîtra au départ de la dernière personne"
@@ -625,7 +689,7 @@
          ],
          "Please enter a valid XMPP username": [
             null,
-            ""
+            "Veuillez saisir un identifiant utilisateur XMPP valide"
          ],
          "Room name": [
             null,
@@ -657,7 +721,7 @@
          ],
          "Room Address (JID):": [
             null,
-            ""
+            "Adresse du salon (JID) :"
          ],
          "Occupants:": [
             null,
@@ -889,7 +953,19 @@
          ],
          "Retry": [
             null,
-            ""
+            "Réessayer"
+         ],
+         "Click to toggle the rooms list": [
+            null,
+            "Cliquer pour ouvrir la liste des salons"
+         ],
+         "Open Rooms": [
+            null,
+            "Ouvrir les salons"
+         ],
+         "Are you sure you want to leave the room \"%1$s\"?": [
+            null,
+            "Voulez-vous vraiment supprimer le marque-page « %1$s » ?"
          ],
          "This contact is busy": [
             null,
@@ -949,15 +1025,27 @@
          ],
          "Unread": [
             null,
-            ""
+            "Non lu"
          ],
          "Chatty": [
             null,
-            ""
+            "Bavard"
          ],
          "Extended Away": [
             null,
-            ""
+            "Absence longue durée"
+         ],
+         "Click to remove %1$s as a contact": [
+            null,
+            "Cliquez pour retirer le contact « %1$s »"
+         ],
+         "Click to accept the contact request from %1$s": [
+            null,
+            "Cliquez pour accepter la demande de « %1$s »"
+         ],
+         "Click to decline the contact request from %1$s": [
+            null,
+            "Cliquez pour décliner la demande de contact de « %1$s »"
          ],
          "Click to chat with this contact": [
             null,
@@ -969,11 +1057,11 @@
          ],
          "Are you sure you want to remove this contact?": [
             null,
-            "Voulez-vous vraiment supprimer ce contact ?"
+            "Voulez-vous vraiment retirer ce contact ?"
          ],
          "Are you sure you want to decline this contact request?": [
             null,
-            "Voulez-vous vraiment refuser cette demande de contact ?"
+            "Voulez-vous vraiment décliner cette demande de contact ?"
          ]
       }
    }
diff --git a/locale/fr/LC_MESSAGES/converse.po b/locale/fr/LC_MESSAGES/converse.po
index 1451c4225..2d3ee8086 100644
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po
@@ -6,11 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2017-08-23 09:02+0000\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
-"Language-Team: French "
-"<https://hosted.weblate.org/projects/conversejs/translations/fr/>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/conversejs/"
+"translations/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,94 +24,94 @@ msgstr ""
 "Domain: converse\n"
 "domain: converse\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr "Marquer ce salon"
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr "Nom de ce marque-page :"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr "Voulez-vous rejoindre automatiquement ce salon au lancement ?"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr "Quel alias devrait être utilisé pour ce salon ?"
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Voulez-vous vraiment retirer le marque-page « %1$s » ?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 "Désolé, quelque chose s’est mal passé pendant la sauvegarde de ce marque-"
 "page."
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 msgid "Click to toggle the bookmarks list"
 msgstr "Cliquer pour ouvrir la liste des salons"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr "Marques-page"
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 msgid "Leave this room"
 msgstr "Quitter ce salon"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr "Retirer ce marque-page"
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 msgid "Unbookmark this room"
 msgstr "Retirer ce salon"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Afficher davantage d’informations sur ce salon"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Cliquer pour ouvrir ce salon"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr "Vous avez de nouveaux messages"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Fermer cette fenêtre de discussion"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Message personnel"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "moi"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
@@ -119,192 +119,197 @@ msgstr ""
 "Un message très long a été reçu. Cela pourrait être lié à une attaque visant "
 "à dégrader la performance de la conversation. La sortie a été tronquée."
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr "Saisie depuis un autre appareil"
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "écrit"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr "Fin de saisie depuis l’autre appareil"
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "a arrêté d’écrire"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "est parti"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Afficher ce menu"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Effacer les messages"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Voulez-vous vraiment supprimer les messages de cette conversation ?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "s’est déconnecté"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "est occupé"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Supprimer tous les messages"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Insérer une émoticône"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Démarrer un appel"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "Nom d’utilisateur XMPP :"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Cliquez ici pour se connecter anonymement"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Se connecter"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr "Nom"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "utilisateur@serveur"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "Mot de passe"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "S’inscrire"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Je suis %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Cliquez ici pour indiquer votre statut personnel"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Cliquez pour changer votre statut"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Statut personnel"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "en ligne"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "occupé"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "absent pour une longue durée"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "En ligne"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Cliquez pour ajouter de nouveaux contacts"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Ajouter un contact"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr "e.g. utilisateur@exemple.org"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Désolé, il y a eu une erreur lors de la tentative d’ajout "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Ce client ne permet pas les mises à jour de disponibilité"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Cliquez pour cacher ces contacts"
 
@@ -312,71 +317,71 @@ msgstr "Cliquez pour cacher ces contacts"
 msgid "Close this box"
 msgstr "Fermer cette fenêtre"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Réduire cette fenêtre de discussion"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Cliquez pour afficher cette discussion"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Réduit(s)"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Ce salon n’est pas anonyme"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Ce salon affiche maintenant les membres indisponibles"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Ce salon n’affiche pas les membres indisponibles"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr "Les paramètres de ce salon ont été modifiés"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Le logging du salon est activé"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Le logging du salon est désactivé"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 msgid "This room is now no longer anonymous"
 msgstr "Ce salon n’est plus anonyme"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Ce salon est maintenant semi-anonyme"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Ce salon est maintenant entièrement anonyme"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Vous avez été banni de ce salon"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Vous avez été expulsé de ce salon"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Vous avez été retiré de ce salon du fait d’un changement d’affiliation"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -384,7 +389,7 @@ msgstr ""
 "Vous avez été retiré de ce salon parce que ce salon est devenu réservé aux "
 "membres et vous n’êtes pas membre"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -402,126 +407,129 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s a été banni"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "L’alias de %1$s a changé"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s a été expulsé"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s a été supprimé à cause d’un changement d’affiliation"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s a été supprimé car il n’est pas membre"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Votre alias a été automatiquement déterminé en : %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Votre alias a été modifié en : %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Message"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 msgid "Close and leave this room"
 msgstr "Fermer et quitter ce salon"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 msgid "Configure this room"
 msgstr "Configurer ce salon"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Cacher la liste des participants"
 
-#: src/converse-muc.js:971
-msgid "${command}"
-msgstr "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
+msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Voulez-vous vraiment supprimer les messages de ce salon ?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Erreur : la commande ne peut pas être exécutée"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Changer le rôle  de l’utilisateur en administrateur"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Bannir l’utilisateur du salon"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Changer le rôle de l’utilisateur en participant"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Expulser l’utilisateur du salon"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Autoriser l’utilisateur à être membre"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Retirer le droit d’envoyer des messages"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Changer votre alias"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Changer le rôle de l’utilisateur en modérateur"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Accorder la propriété à ce salon"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Révoquer l’utilisateur des membres"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 msgid "Set room subject"
 msgstr "Indiquer le sujet du salon"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr "Définir le sujet de la salle (alias pour /subject)"
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Autoriser les utilisateurs muets à poster des messages"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
@@ -529,229 +537,235 @@ msgstr ""
 "L’alias choisi est réservé ou actuellment utilisé, veuillez en choisir un "
 "différent."
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr "Veuillez choisir votre alias"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Alias"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr "Entrer dans le salon"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Ce salon nécessite un mot de passe"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, javascript-format
 msgid "This action was done by %1$s."
 msgstr "L’action a été réalisée par %1$s."
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "La raison indiquée est : « %1$s »."
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "La raison indiquée est : « %1$s »."
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr " a quitté le salon. \""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 msgid " has left the room"
 msgstr " a quitté le salon"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr " a rejoint le salon. \""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr " a rejoint le salon."
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 msgid "You are not on the member list of this room."
 msgstr "Vous n’êtes pas dans la liste des membres de ce salon."
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 msgid "You have been banned from this room."
 msgstr "Vous avez été banni de ce salon."
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 msgid "No nickname was specified."
 msgstr "Aucun alias n’a été indiqué."
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 msgid "You are not allowed to create new rooms."
 msgstr "Vous n’êtes pas autorisé à créer des salons."
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Votre alias n’est pas conforme à la politique de ce salon."
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 msgid "This room does not (yet) exist."
 msgstr "Ce salon n’existe pas (pour l’instant)."
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ce salon a atteint sa limite maximale d’occupants."
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Le sujet « %2$s » a été défini par %1$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Cliquer pour citer cet utilisateur dans votre message."
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr "Cet utilisateur est un modérateur."
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr "Cet utilisateur peut envoyer des messages dans ce salon."
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr "Cet utilisateur ne peut PAS envoyer de messages dans ce salon."
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Participants :"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 msgid "Features"
 msgstr "Caractéristiques"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Masqué"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr "Archivage du message"
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr "Membres uniquement"
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Modéré"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Non-anonyme"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 msgid "Password protected"
 msgstr "Protégé par mot de passe"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr "Persistant"
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi-anonyme"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 msgid "Temporary"
 msgstr "Temporaire"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Non modéré"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr "Non sécurisé"
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 msgid "This room is not publicly searchable"
 msgstr "Ce salon ne peut pas être recherché publiquement"
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr "Les messages sont archivés sur le serveur"
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 msgid "This room is restricted to members only"
 msgstr "Ce salon est restreint aux membres uniquement"
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 msgid "This room is being moderated"
 msgstr "Ce salon est modéré"
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 msgid "All other room occupants can see your XMPP username"
 msgstr ""
 "Tous les autres occupants de ce salon peuvent voir votre nom d’utilisateur "
 "XMPP"
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 msgid "Anyone can join this room"
 msgstr "N’importe qui peut rejoindre ce salon"
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 msgid "This room requires a password before entry"
 msgstr "Ce salon nécessite un mot de passe pour y accéder"
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr "Ce salon persiste même s'il est inoccupé"
 
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 msgid "This room is publicly searchable"
 msgstr "Ce salon peut être recherché publiquement"
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 msgid "Only moderators can see your XMPP username"
 msgstr "Seuls les modérateurs peuvent voir votre identifiant XMPP"
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr "Ce salon disparaîtra au départ de la dernière personne"
 
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 msgid "This room is not being moderated"
 msgstr "Ce salon n’est pas modéré"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 msgid "This room does not require a password upon entry"
 msgstr "Ce salon nécessite un mot de passe pour y accéder"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Vous vous apprêtez à inviter %1$s dans le salon \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -759,78 +773,78 @@ msgstr ""
 "Vous pouvez facultativement ajouter un message, expliquant la raison de "
 "cette invitation."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr "Veuillez saisir un identifiant utilisateur XMPP valide"
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nom du salon"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Serveur"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Rejoindre"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Afficher les salons"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Salons"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Aucun salon dans %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Description :"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr "Adresse du salon (JID) :"
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Participants :"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Caractéristiques :"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Nécessite une authentification"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Nécessite une invitation"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Ouvrir un salon"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Salon permanent"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Salon temporaire"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s vous invite à rejoindre le salon : %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -859,19 +873,19 @@ msgstr "s’est déconnecté"
 msgid "wants to be your contact"
 msgstr "veut être votre contact"
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Rétablissement d’une session chiffrée"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Génération de la clé privée."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Votre navigateur pourrait ne plus répondre."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -888,19 +902,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "L’identité de cet utilisateur ne peut pas être vérifiée."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Échange de la clef privée avec le contact."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Vos messages ne sont plus chiffrés"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -908,29 +922,29 @@ msgstr ""
 "Vos messages sont maintenant chiffrés mais l’identité de votre contact n’a "
 "pas encore été vérifiée."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "L’identité de votre contact a été vérifiée."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Votre contact a arrêté le chiffrement de son côté, vous devriez le faire "
 "aussi."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Votre message ne peut pas être envoyé"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Un message non chiffré a été reçu"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Un message chiffré illisible a été reçu"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -953,7 +967,7 @@ msgstr ""
 "Si vous avez confirmé que les empreintes correspondent, cliquez OK, sinon "
 "cliquez Annuler."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -967,33 +981,33 @@ msgstr ""
 "Votre contact devra répondre à la même question et s’il fournit la même "
 "réponse (sensible à la casse), son identité sera vérifiée."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Quelle est votre question de sécurité ?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Quelle est la réponse à la question de sécurité ?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Schéma d’authentification fourni non valide"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Vos messages ne sont pas chiffrés. Cliquez ici pour activer le chiffrement "
 "OTR."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Vos messages sont chiffrés, mais votre contact n’a pas été vérifié."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Vos messages sont chiffrés et votre contact est vérifié."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
@@ -1001,27 +1015,27 @@ msgstr ""
 "Votre contact a fermé la session privée de son côté, vous devriez le faire "
 "aussi"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Terminer la conversation chiffrée"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Actualiser la conversation chiffrée"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Démarrer une conversation chiffrée"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Vérifier par empreintes de sécurité"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Vérifier par Question/Réponse"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Qu’est-ce que c’est ?"
 
@@ -1031,47 +1045,47 @@ msgstr "Qu’est-ce que c’est ?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "chiffré"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "non vérifié"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "vérifié"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "terminé"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " e.g. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Votre domaine XMPP :"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Récupération du formulaire d’enregistrement"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Astuce : une liste publique de fournisseurs XMPP est disponible"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "ici"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "S’enregistrer"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1079,11 +1093,11 @@ msgstr ""
 "Désolé, le fournisseur indiqué ne supporte pas l’enregistrement de compte en "
 "ligne. Merci d’essayer avec un autre fournisseur."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Demande du formulaire enregistrement au serveur XMPP"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1092,21 +1106,21 @@ msgstr ""
 "Quelque chose a échoué lors de l’établissement de la connexion avec \"%1$s"
 "\". Existe-t-il vraiment ?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "En cours de connexion"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Enregistré avec succès"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr "Le fournisseur a rejeté votre demande d’enregistrement."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr "Réessayer"
 
@@ -1123,105 +1137,113 @@ msgstr "Ouvrir les salons"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Voulez-vous vraiment supprimer le marque-page « %1$s » ?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Ce contact est occupé"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Ce contact est connecté"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Ce contact est déconnecté"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Ce contact est indisponible"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Ce contact est absent"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Ce contact est absent"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Groupes"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Mes contacts"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Contacts en attente"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Demandes de contacts"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Sans groupe"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr "Filtrer"
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr "Status"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr "Aucun"
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr "Bavard"
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr "Absence longue durée"
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Cliquez pour retirer le contact « %1$s »"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Cliquez pour accepter la demande de « %1$s »"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Cliquez pour décliner la demande de contact de « %1$s »"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Cliquez pour discuter avec ce contact"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Nom"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Voulez-vous vraiment retirer ce contact ?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Désolé, il y a eu une erreur lors de la tentative de retrait "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Voulez-vous vraiment décliner cette demande de contact ?"
 
+#~ msgid "${command}"
+#~ msgstr "${command}"
+
 #~ msgid "Click to add as a chat contact"
 #~ msgstr "Cliquer pour ajouter aux contacts"
 
@@ -1257,9 +1279,6 @@ msgstr "Voulez-vous vraiment décliner cette demande de contact ?"
 #~ msgstr ""
 #~ "Une erreur est survenue lors de la connexion au serveur de discussion : "
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Désolé, il y a eu une erreur lors de la tentative d’ajout "
-
 #~ msgid "Error: the \""
 #~ msgstr "Erreur : \""
 
@@ -1279,16 +1298,10 @@ msgstr "Voulez-vous vraiment décliner cette demande de contact ?"
 #~ msgid "Return"
 #~ msgstr "Retourner"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Désolé, il y a eu une erreur lors de la tentative de retrait "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "La raison indiquée est : \"%1$s\"."
 
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Cliquer pour citer cet utilisateur dans votre message."
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "L'authentification a échoué"
diff --git a/locale/he/LC_MESSAGES/converse.po b/locale/he/LC_MESSAGES/converse.po
index 66f109079..42c338064 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: GreenLunar <https://github.com/GreenLunar>\n"
 "Language-Team: Rahut <http://sourceforge.net/projects/rahut/>\n"
@@ -20,292 +20,297 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "שמור"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "הצג עוד מידע אודות חדר זה"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "הסר הודעות"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "הודעה אישית"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "אני"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "מקליד(ה) כעת"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "חדל(ה) להקליד"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "נעדר(ת)"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "הצג את תפריט זה"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "כתוב בגוף השלישי"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "הסר הודעות"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "כבר לא מקוון"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "עסוק(ה) כעת"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "טהר את כל ההודעות"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "הכנס סמיילי"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "התחל שיחה"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "לחץ כאן כדי להתחבר באופן אנונימי"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "כניסה"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "סיסמה"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "התחברות"
 
 # אני במצב
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "מצבי כעת הינו %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "לחץ כאן כדי לכתוב הודעת מצב מותאמת"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "לחץ כדי לשנות את הודעת השיחה שלך"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "מצב מותאם"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "נעדר לזמן מה"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "התנתקות"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "הוסף איש קשר"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "שם איש קשר"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "למשל user@example.com"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "הוסף"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "לא נמצאו משתמשים"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "לקוח זה לא מתיר הרשמות נוכחות"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "לחץ כדי להסתיר את אנשי קשר אלה"
 
@@ -314,80 +319,80 @@ msgstr "לחץ כדי להסתיר את אנשי קשר אלה"
 msgid "Close this box"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "ממוזער"
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "חדר זה כעת מציג חברים לא זמינים"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "חדר זה לא מציג חברים לא זמינים"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "תצורת חדר אשר לא-קשורה-בפרטיות שונתה"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "יומן חדר הינו מופעל כעת"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "יומן חדר הינו מנוטרל כעת"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "חדר זה אינו אנונימי כעת"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "חדר זה הינו אנונימי-למחצה כעת"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "חדר זה הינו אנונימי-לחלוטין כעת"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "חדר חדש נוצר"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "נאסרת מתוך חדר זה"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "נבעטת מתוך חדר זה"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "הוסרת מתוך חדר זה משום שינוי שיוך"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "הוסרת מתוך חדר זה משום שהחדר שונה לחברים-בלבד ואינך במעמד של חבר"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -405,468 +410,477 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s נאסר(ה)"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "השם כינוי של%1$s השתנה"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s נבעט(ה)"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s הוסרה(ה) משום שינוי שיוך"
 
 # היותו(ה)
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "השם כינוי שלך שונה אוטומטית בשם: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "השם כינוי שלך שונה בשם: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "הודעה"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "הסתר רשימת משתתפים"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך חדר זה?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "שגיאה: לא היתה אפשרות לבצע פקודה"
 
 # שייכות
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "שנה סינוף משתמש למנהל"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "אסור משתמש מתוך חדר"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "שנה תפקיד משתמש למשתתף"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "בעט משתמש מתוך חדר"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "כתוב בגוף שלישי"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "הענק חברות למשתמש"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "הסר יכולת משתמש לפרסם הודעות"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "הענק תפקיד אחראי למשתמש"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "הענק בעלות על חדר זה"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "שלול חברות משתמש"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "קבע נושא חדר"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "התר למשתמש מושתק לפרסם הודעות"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "סיסמה: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "שלח"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "השם כינוי שלך שונה בשם: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "הסיבה שניתנה היא: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "הסיבה שניתנה היא: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "אינך ברשימת החברים של חדר זה"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "נאסרת מתוך חדר זה"
 
 # אף שם כינוי לא צוין
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "לא צוין שום שם כינוי"
 
 # אינך מורשה
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "אין לך רשות ליצור חדרים חדשים"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "השם כינוי שלך לא תואם את המדינויות של חדר זה"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "חדר זה (עדיין) לא קיים"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "לחץ כדי לפתוח את חדר זה"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "נוכחים"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "הזמנה"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "נסתר"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "מבוקר"
 
 # לא-עלום
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "לא-אנונימי"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "סיסמה: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "פומבי"
 
 # עלום-למחצה
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "אנונימי-למחצה"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "לא מבוקר"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 msgid "Only moderators can see your XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "אתה עומד להזמין את %1$s לחדר שיחה \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "שם חדר"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "שרת"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "הצטרף לחדר"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "הצג חדרים"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "חדרים"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "אין חדרים על %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "נוכחים:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "מצריך אישור"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "מצריך הזמנה"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "חדר צמיתה"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -894,19 +908,19 @@ msgstr "כבר לא מקוון"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "בסס מחדש ישיבה מוצפנת"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "כעת מפיק מפתח פרטי."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "הדפדפן שלך עשוי שלא להגיב."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -922,45 +936,45 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "לא היתה אפשרות לאמת את זהות משתמש זה."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "מחליף מפתח פרטי עם איש קשר."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "ההודעות שלך אינן מוצפנות עוד"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr "ההודעות שלך מוצפנות כעת אך זהות האיש קשר שלך טרם אומתה."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "זהות האיש קשר שלך אומתה."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "האיש קשר סיים הצפנה בקצה שלהם, עליך לעשות זאת גם כן."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "ההודעה שלך לא היתה יכולה להישלח"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "אנחנו קיבלנו הודעה לא מוצפנת"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "אנחנו קיבלנו הודעה מוצפנת לא קריאה"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -982,7 +996,7 @@ msgstr ""
 "היה ואימתת כי טביעות האצבע תואמות, לחץ אישור (OK), אחרת לחץ ביטול (Cancel)."
 
 # הקצה השני
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -995,58 +1009,58 @@ msgstr ""
 "האיש קשר יתבקש עובר זאת לאותה שאלת אבטחה ואם אלו יקלידו את אותה התשובה "
 "במדויק (case sensitive), זהותם תאומת."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "מהי שאלת האבטחה שלך?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "מהי התשובה לשאלת האבטחה?"
 
 # תרשים
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "סופקה סכימת אימות שגויה"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr "ההודעות שלך אינן מוצפנות. לחץ כאן כדי לאפשר OTR."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "ההודעות שלך מוצפנות כעת, אך האיש קשר שלך טרם אומת."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "ההודעות שלך מוצפנות כעת והאיש קשר שלך אומת."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "האיש קשר סגר את קצה ישיבה פרטית שלהם, עליך לעשות זאת גם כן"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "סיים ישיבה מוצפנת"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "רענן ישיבה מוצפנת"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "התחל ישיבה מוצפנת"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "אמת בעזרת טביעות אצבע"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "אמת בעזרת SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "מה זה?"
 
@@ -1056,80 +1070,80 @@ msgstr "מה זה?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "לא מוצפנת"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "לא מאומתת"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "מאומתת"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "מוגמרת"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " למשל conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "שם מתחם של ספק XMPP שלך:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "משוך טופס הרשמה"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "טיפ: רשימה פומבית של ספקי XMPP הינה זמינה"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "כאן"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "הירשם"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 "מצטערים, הספק שניתן לא תומך ברישום חשבונות in band. אנא נסה עם ספק אחר."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "כעת מבקש טופס הרשמה מתוך שרת XMPP"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr "משהו השתבש במהלך ביסוס חיבור עם \"%1$s\". האם אתה בטוח כי זה קיים?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "כעת מחבר אותך פנימה"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "נרשם בהצלחה"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr "הספק דחה את ניסיון הרישום שלך. "
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1149,102 +1163,107 @@ msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
 
 # איש קשר זה הינו
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "איש קשר זה עסוק"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "איש קשר זה מקוון"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "איש קשר זה אינו מקוון"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "איש קשר זה לא זמין"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "איש קשר זה נעדר למשך זמן ממושך"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "איש קשר זה הינו נעדר"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "קבוצות"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "האנשי קשר שלי"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "אנשי קשר ממתינים"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "בקשות איש קשר"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "ללא קבוצה"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "לחץ כדי להסיר את איש קשר זה"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "לחץ כדי לקבל את בקשת איש קשר זה"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "לחץ כדי לסרב את בקשת איש קשר זה"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "לחץ כדי לשוחח עם איש קשר זה"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "שם"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
 
@@ -1282,9 +1301,6 @@ msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש 
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "אירעה שגיאה במהלך ניסיון שמירת הטופס."
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
-
 #~ msgid "The reason given is: \""
 #~ msgstr "הסיבה שניתנה היא: \""
 
@@ -1302,17 +1318,10 @@ msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש 
 #~ msgid "Return"
 #~ msgstr "חזור"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "הסיבה שניתנה היא: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "לחץ כדי לפתוח את חדר זה"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "אימות נכשל"
diff --git a/locale/hu/LC_MESSAGES/converse.po b/locale/hu/LC_MESSAGES/converse.po
index 4fd8857bc..b1825ee24 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian\n"
@@ -20,290 +20,295 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.5\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Ment"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Valóban törölni szeretné a csevegőpartnerét?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Sajnáljuk, hiba történt a törlés során"
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "További információk a csevegőszobáról"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "A csevegés bezárása"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Személyes üzenet"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "Én"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "gépel..."
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "már nem gépel"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "távol van"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Mutasd a menüt"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Törölni szeretné az eddigi üzeneteket?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "kijelentkezett"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "elfoglalt"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Hangulatjel beszúrása"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Hívás indítása"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Kattintson ide a névtelen bejelentkezéshez"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Belépés"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "felhasznalo@szerver"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "jelszó"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Belépés"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "%1$s vagyok"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Egyedi státusz üzenet írása"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Saját státusz beállítása"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Egyedi státusz"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "elérhető"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "elfoglalt"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "hosszú ideje távol"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "távol"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "nem elérhető"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Foglalt"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Távol"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Kilépés"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Új csevegőpartner hozzáadása"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Új partner felvétele"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Partner neve"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Keresés"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "pl. felhasznalo@pelda.hu"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Nincs felhasználó"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Sajnáljuk, hiba történt a hozzáadás során"
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Ez a kliens nem engedélyezi a jelenlét követését"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "A csevegő partnerek elrejtése"
 
@@ -312,73 +317,73 @@ msgstr "A csevegő partnerek elrejtése"
 msgid "Close this box"
 msgstr "A csevegés bezárása"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "A csevegés minimalizálása"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "A csevegés visszaállítása"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimalizálva"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Ez a szoba mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Ez a szoba nem mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "A szoba általános konfigurációja módosult"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "A szobába a belépés lehetséges"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "A szobába a belépés szünetel"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ez a szoba most NEM névtelen"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Ez a szoba most félig névtelen"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Ez a szoba most teljesen névtelen"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Létrejött egy új csevegőszoba"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Ki lettél tíltva ebből a szobából"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Ki lettél dobva ebből a szobából"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Taglista módosítás miatt kiléptettünk a csevegőszobából"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -386,7 +391,7 @@ msgstr ""
 "Kiléptettünk a csevegőszobából, mert mostantól csak a taglistán szereplők "
 "lehetnek jelen"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -404,457 +409,466 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "A szobából kitíltva: %1$s"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s beceneve módosult"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "A szobából kidobva: %1$s"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "Taglista módosítás miatt a szobából kiléptetve: %1$s"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "A taglistán nem szerepel, így a szobából kiléptetve: %1$s"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "A beceneved módosításra került a következőre: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "A beceneved a következőre módosult: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "A résztvevők listájának elrejtése"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Törölni szeretné az üzeneteket ebből a szobából?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Hiba: A parancs nem értelmezett"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "A felhasználó adminisztrátorrá tétele"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Felhasználó kitíltása a csevegőszobából"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "A felhasználó taggá tétele"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Felhasználó kiléptetése a csevegőszobából"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Tagság megadása a felhasználónak"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "A felhasználó nem küldhet üzeneteket"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Moderátori jog adása a felhasználónak"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "A szoba tulajdonjogának megadása"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Tagság megvonása a felhasználótól"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Csevegőszoba téma beállítása"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Elnémított felhasználók is küldhetnek üzeneteket"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Becenév"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "A csevegőszobába belépéshez jelszó szükséges"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Küldés"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "A beceneved a következőre módosult: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Az indok: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Az indok: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Nem szerepelsz a csevegőszoba taglistáján"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Ki lettél tíltva ebből a szobából"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nem lett megadva becenév"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Nem lehet új csevegőszobát létrehozni"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "A beceneved ütközik a csevegőszoba szabályzataival"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ez a szoba (még) nem létezik"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ez a csevegőszoba elérte a maximális jelenlévők számát"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "A következő témát állította be %1$s: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Ez a felhasználó egy moderátor"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Ez a felhasználó küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Jelenlevők"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Meghívás"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderált"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "NEM névtelen"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Jelszó: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Nyílvános"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Félig névtelen"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Moderálatlan"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Ez a csevegőszoba elérte a maximális jelenlévők számát"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Ez a felhasználó egy moderátor"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Belépés a csevegőszobába"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "A csevegőszobába belépéshez jelszó szükséges"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Ez a szoba NEM névtelen"
+msgid "This room is restricted to members only"
+msgstr "Ez a csevegőszoba elérte a maximális jelenlévők számát"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Ez a felhasználó egy moderátor"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "A csevegőszobába belépéshez jelszó szükséges"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Ez a szoba NEM névtelen"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "A csevegőszobába belépéshez jelszó szükséges"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "%1$s meghívott a(z) \"%2$s\" csevegőszobába. "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "Megadhat egy üzenet a meghívás okaként."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Szoba neve"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Szerver"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Csatlakozás"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Létező szobák"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Szobák"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Nincs csevegőszoba a(z) %1$s szerveren"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Leírás:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Jelenlevők:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Azonosítás szükséges"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Meghívás szükséges"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Állandó szoba"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s meghívott a(z) %2$s csevegőszobába"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -882,19 +896,19 @@ msgstr "kijelentkezett"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Titkosított kapcsolat újraépítése"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Privát kulcs generálása"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Előfordulhat, hogy a böngésző futása megáll."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -910,47 +924,47 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "A felhasználó ellenőrzése sikertelen."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Privát kulcs cseréje..."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Az üzenetek mostantól már nem titkosítottak"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 "Az üzenetek titikosítva vannak, de a csevegőpartnerét még nem hitelesítette."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "A csevegőpartnere hitelesítve lett."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "A csevegőpartnere kikapcsolta a titkosítást, így Önnek is ezt kellene tennie."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Az üzenet elküldése nem sikerült"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Titkosítatlan üzenet érkezett"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Visszafejthetetlen titkosított üzenet érkezett"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -972,7 +986,7 @@ msgstr ""
 "Amennyiben az ujjlenyomatok biztosan egyeznek, klikkeljen az OK, ellenkező "
 "esetben a Mégse gombra."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -985,57 +999,57 @@ msgstr ""
 "Majd a csevegőpartnerének is megjelenik ez a kérdés. Végül ha a válaszok "
 "azonosak lesznek (kis- nagybetű érzékeny), a partner hitelesítetté válik."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Mi legyen a biztonsági kérdés?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Mi a válasz a biztonsági kérdésre?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Érvénytelen hitelesítési séma."
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr "Az üzenetek titkosítatlanok. OTR titkosítás aktiválása."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Az üzenetek titikosítottak, de a csevegőpartnere még nem hitelesített."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Az üzenetek titikosítottak és a csevegőpartnere hitelesített."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "A csevegőpartnere lezárta a magán beszélgetést"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Titkosított kapcsolat vége"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "A titkosított kapcsolat frissítése"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Titkosított beszélgetés indítása"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Ellenőrzés újjlenyomattal"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Ellenőrzés SMP-vel"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Mi ez?"
 
@@ -1045,47 +1059,47 @@ msgstr "Mi ez?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "titkosítatlan"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "nem hitelesített"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "hitelesített"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "befejezett"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr "pl. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Az XMPP szolgáltató domain neve:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Regisztrációs űrlap"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tipp: A nyílvános XMPP szolgáltatókról egy lista elérhető"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "itt"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1093,11 +1107,11 @@ msgstr ""
 "A megadott szolgáltató nem támogatja a csevegőn keresztüli regisztrációt. "
 "Próbáljon meg egy másikat."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Regisztrációs űrlap lekérése az XMPP szervertől"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1106,15 +1120,15 @@ msgstr ""
 "Hiba történt a(z) \"%1$s\" kapcsolódásakor. Biztos benne, hogy ez létező "
 "kiszolgáló?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Belépés..."
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Sikeres regisztráció"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1122,7 +1136,7 @@ msgstr ""
 "A szolgáltató visszautasította a regisztrációs kérelmet. Kérem ellenőrízze a "
 "bevitt adatok pontosságát."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1141,102 +1155,107 @@ msgstr "Nyitott szoba"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Valóban törölni szeretné a csevegőpartnerét?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Elfoglalt"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Elérhető"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Nincs bejelentkezve"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Elérhetetlen"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Hosszabb ideje távol"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Távol"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Csoportok"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Kapcsolataim"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Függőben levő kapcsolatok"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Kapcsolatnak jelölés"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Nincs csoportosítva"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Partner törlése"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Partner felvételének elfogadása"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Partner felvételének megtagadása"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Csevegés indítása ezzel a partnerünkkel"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Név"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Valóban törölni szeretné a csevegőpartnerét?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Sajnáljuk, hiba történt a törlés során"
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 
@@ -1274,9 +1293,6 @@ msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "Hiba történt az adatok mentése közben."
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Sajnáljuk, hiba történt a hozzáadás során"
-
 #~ msgid "Error: the \""
 #~ msgstr "Hiba: a \""
 
@@ -1297,17 +1313,10 @@ msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 #~ msgid "Return"
 #~ msgstr "Visza"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Sajnáljuk, hiba történt a törlés során"
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Az indok: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Belépés a csevegőszobába"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Azonosítási hiba"
diff --git a/locale/id/LC_MESSAGES/converse.po b/locale/id/LC_MESSAGES/converse.po
index 32b1c4f71..f17e887ff 100644
--- a/locale/id/LC_MESSAGES/converse.po
+++ b/locale/id/LC_MESSAGES/converse.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2014-01-25 21:30+0700\n"
 "Last-Translator: Priyadi Iman Nurcahyo <priyadi@priyadi.net>\n"
 "Language-Team: Bahasa Indonesia\n"
@@ -17,298 +17,303 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Simpan"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Tampilkan informasi ruangan ini"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Hapus pesan"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "saya"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Tampilkan menu ini"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Hapus pesan"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "sibuk"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Teman"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Masuk"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Saya %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Klik untuk menulis status kustom"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Klik untuk mengganti status"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Status kustom"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "terhubung"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "sibuk"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "lama tak di tempat"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "tak di tempat"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Terhubung"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Sibuk"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Pergi"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Klik untuk menambahkan teman baru"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Tambah teman"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nama teman"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Cari"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Tambah"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Pengguna tak ditemukan"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik untuk menghapus teman ini"
@@ -318,74 +323,74 @@ msgstr "Klik untuk menghapus teman ini"
 msgid "Close this box"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Ruangan ini menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Ruangan ini tidak menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Konfigurasi ruangan yang tak berhubungan dengan privasi telah diubah"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Pencatatan di ruangan ini sekarang dinyalakan"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Pencatatan di ruangan ini sekarang dimatikan"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ruangan ini sekarang tak-anonim"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Ruangan ini sekarang semi-anonim"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Ruangan ini sekarang anonim"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Ruangan baru telah dibuat"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Anda telah dicekal dari ruangan ini"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Anda telah ditendang dari ruangan ini"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Anda telah dihapus dari ruangan ini karena perubahan afiliasi"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -393,7 +398,7 @@ msgstr ""
 "Anda telah dihapus dari ruangan ini karena ruangan ini hanya terbuka untuk "
 "anggota dan anda bukan anggota"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -411,463 +416,472 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s telah dicekal"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s telah dicekal"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s telah ditendang keluar"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s telah dihapus karena perubahan afiliasi"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s telah dihapus karena bukan anggota"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Pesan"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Larang pengguna dari ruangan"
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "Tendang pengguna dari ruangan"
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "Tulis ini menggunakan bahasa pihak ketiga"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "Tendang pengguna dari ruangan"
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "Tulis ini menggunakan bahasa pihak ketiga"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Setel topik ruangan"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Nama panggilan"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Kata sandi: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Kirim"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Anda telah dicekal dari ruangan ini"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nama panggilan belum ditentukan"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Anda tak diizinkan untuk membuat ruangan baru"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Nama panggilan anda tidak sesuai aturan ruangan ini"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ruangan ini belum dibuat"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topik diganti oleh %1$s menjadi: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Pengguna ini adalah moderator"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Pengguna ini dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Pengguna ini tak dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 #, fuzzy
 msgid "Occupants"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Dimoderasi"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Tidak anonim"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Kata sandi: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Umum"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi-anonim"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Tak dimoderasi"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Pengguna ini adalah moderator"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Klik untuk membuka ruangan ini"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Ruangan ini membutuhkan kata sandi"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Ruangan ini tidak anonim"
+msgid "This room is restricted to members only"
+msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Pengguna ini adalah moderator"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Ruangan ini membutuhkan kata sandi"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Ruangan ini tidak anonim"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nama ruangan"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "Ikuti"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Perlihatkan ruangan"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Ruangan"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Tak ada ruangan di %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Membutuhkan otentikasi"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Membutuhkan undangan"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Ruangan permanen"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -895,19 +909,19 @@ msgstr "Teman ini tidak terhubung"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Menyambung kembali sesi terenkripsi"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -924,19 +938,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Tak dapat melakukan verifikasi identitas pengguna ini."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Pesan anda tidak lagi terenkripsi"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -945,31 +959,31 @@ msgstr ""
 "Pesan anda sekarang terenkripsi, namun identitas teman anda belum dapat "
 "diverifikasi."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Identitas teman anda telah diverifikasi."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Teman anda menghentikan percakapan terenkripsi, anda sebaiknya melakukan hal "
 "yang sama."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Pesan anda tak dapat dikirim"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Kami menerima pesan terenkripsi"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Kami menerima pesan terenkripsi yang gagal dibaca"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -992,7 +1006,7 @@ msgstr ""
 "Jika anda bisa mengkonfirmasi sidik jadi cocok, klik Lanjutkan, jika tidak "
 "klik Batal."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1008,34 +1022,34 @@ msgstr ""
 "jawaban yang sama (huruf kapital diperhatikan), identitas mereka "
 "diverifikasi."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Apakah pertanyaan keamanan anda?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Apa jawaban dari pertanyaan keamanan tersebut?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Skema otentikasi salah"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Pesan anda tak terenkripsi. Klik di sini untuk menyalakan enkripsi OTR."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Pesan anda terenkripsi, tetapi teman anda belum diverifikasi."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Pesan anda terenkripsi dan teman anda telah diverifikasi."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
@@ -1044,27 +1058,27 @@ msgstr ""
 "Teman anda telah mematikan sesi terenkripsi, dan anda juga sebaiknya "
 "melakukan hal yang sama"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Sudahi percakapan terenkripsi"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Setel ulang percakapan terenkripsi"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Mulai sesi terenkripsi"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verifikasi menggunakan sidik jari"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verifikasi menggunakan SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Apakah ini?"
 
@@ -1074,78 +1088,78 @@ msgstr "Apakah ini?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "tak dienkripsi"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "tak diverifikasi"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "diverifikasi"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "selesai"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1164,103 +1178,108 @@ msgstr "Ruangan terbuka"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Teman ini sedang sibuk"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Teman ini terhubung"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Teman ini tidak tersedia"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Teman ini tidak di tempat untuk waktu yang lama"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Teman saya"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Teman yang menunggu"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Permintaan pertemanan"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Klik untuk mulai perbinjangan dengan teman ini"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Klik untuk menghapus teman ini"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik untuk menghapus teman ini"
@@ -1308,10 +1327,6 @@ msgstr "Klik untuk menghapus teman ini"
 #~ msgid "Server:"
 #~ msgstr "Server"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Klik untuk membuka ruangan ini"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Otentikasi gagal"
diff --git a/locale/it/LC_MESSAGES/converse.po b/locale/it/LC_MESSAGES/converse.po
index c5b33307a..0b0ba4044 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2017-03-15 10:55+0000\n"
 "Last-Translator: Thomas Camaran <camaran@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/conversejs/"
@@ -23,95 +23,95 @@ msgstr ""
 "lang: it\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr "Salva questa stanza"
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr "Nome per questo bookmark:"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr "Vuoi collegarti automaticamente a questa stanza quando fai il login?"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr "Qual è il nickname per questa stanza?"
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Salva"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Sei sicuro di voler rimuovere il segnalibro \"%1$s\"?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Si è verificato un errore nel salvataggio del bookmark."
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 msgid "Click to toggle the bookmarks list"
 msgstr "Clicca per aprire/chiudere la lista bookmarks"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Stanza Salvate"
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Chiudi e lascia questa stanza"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr "Rimuovi questo bookmark"
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Salva questa stanza"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Mostra più informazioni su questa stanza"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Clicca per aprire questa stanza"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr "Hai messaggi non letti"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Chiudi questa chat"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Messaggio personale"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "me"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
@@ -120,192 +120,197 @@ msgstr ""
 "attacco destinato a degradare le performance della chat. L'output è stato "
 "accorciato."
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "sta scrivendo"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "si è allontanato"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Mostra questo menu"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Rimuovi messaggi"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Sei sicuro di volere pulire i messaggi da questo chat box?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "è andato offline"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "è occupato"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Pulisci tutti i messaggi"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Inserisci uno smiley"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Inizia una chiamata"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Clicca per entrare anonimo"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Entra"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr "Username"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "Password"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Accesso"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Sono %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Clicca qui per scrivere un messaggio di stato personalizzato"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Clicca per cambiare il tuo stato"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Stato personalizzato"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "in linea"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "occupato"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "assente da molto"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "assente"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "offline"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "In linea"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Occupato"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Assente"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Non in linea"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Logo out"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Clicca per aggiungere nuovi contatti alla chat"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Aggiungi contatti"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nome del contatto"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr "es. user@example.org"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Nessun utente trovato"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Si è verificato un errore durante il tentativo di aggiunta "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Questo client non consente sottoscrizioni di presenza"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Clicca per nascondere questi contatti"
 
@@ -313,79 +318,79 @@ msgstr "Clicca per nascondere questi contatti"
 msgid "Close this box"
 msgstr "Chiudi questo box"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Riduci questo chat box"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Clicca per ripristinare questa chat"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Ridotto"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Questa stanza non è anonima"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Questa stanza mostra i membri non disponibili al momento"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Questa stanza non mostra i membri non disponibili"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr "La configurazione della stanza è cambiata"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "La registrazione è abilitata nella stanza"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "La registrazione è disabilitata nella stanza"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 msgid "This room is now no longer anonymous"
 msgstr "Questa stanza è non-anonima"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Questa stanza è semi-anonima"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Questa stanza è completamente-anonima"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Una nuova stanza è stata creata"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Sei stato bandito da questa stanza"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Sei stato espulso da questa stanza"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 "Sei stato rimosso da questa stanza a causa di un cambio di affiliazione"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 "Sei stato rimosso da questa stanza poiché ora la stanza accetta solo membri"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -403,441 +408,450 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s è stato bannato"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s nickname è cambiato"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s è stato espulso"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s è stato rimosso a causa di un cambio di affiliazione"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s è stato rimosso in quanto non membro"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Il tuo nickname è stato cambiato automaticamente in: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Il tuo nickname è stato cambiato: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 msgid "Close and leave this room"
 msgstr "Chiudi e lascia questa stanza"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 msgid "Configure this room"
 msgstr "Configura questa stanza"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Nascondi la lista degli occupanti"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Sei sicuro di voler pulire i messaggi da questa stanza?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Errore: impossibile eseguire il comando"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Bandisci utente dalla stanza"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Espelli utente dalla stanza"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Rimuovi la possibilità di inviare messaggi all'utente"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Cambia il tuo nickname"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 msgid "Set room subject"
 msgstr "Cambia oggetto della stanza"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr "Imposta oggetto della stanza (alias per /subject)"
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Abilita l'utente mutato ad inviare nuovamente messaggi"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 "Il nickname scelto è riservato o attualmente in uso, indicane uno diverso."
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr "Scegli il tuo nickname"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr "Entra nella stanza"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Questa stanza richiede una password"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Password: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Invia"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Questa azione è stata fatta da %1$s."
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "La ragione data è: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "La ragione data è: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr " ha lasciato la stanza. \""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 msgid " has left the room"
 msgstr " ha lasciato la stanza"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr " è entrato nella stanza. \""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr " è entrato nella stanza."
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Non sei nella lista dei membri di questa stanza"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Sei stato bandito da questa stanza"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nessun soprannome specificato"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Non ti è permesso creare nuove stanze"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Il tuo soprannome non è conforme alle regole di questa stanza"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Questa stanza non esiste (per ora)"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Questa stanza ha raggiunto il limite massimo di occupanti"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic impostato da %1$s a: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Clicca per menzionare questo utente nel tuo messaggio."
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr "Questo utente è un moderatore."
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr "Questo utente può inviare messaggi in questa stanza."
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr "Questo utente NON può inviare messaggi in questa stanza."
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Occupanti"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Invita"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 msgid "Features"
 msgstr "Impostazioni"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr "Archivio Messaggi"
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr "Solo membri"
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderata"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Non-anonima"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 msgid "Open"
 msgstr "Aperta"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 msgid "Password protected"
 msgstr "Con Password"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr "Persistente"
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Pubblica"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi-anonima"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 msgid "Temporary"
 msgstr "Temporanea"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Non moderata"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr "Non Sicura"
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Questa stanza non è pubblica"
 
-#: src/converse-muc.js:2185
+#: src/converse-muc.js:2191
 msgid "Messages are archived on the server"
 msgstr "Messaggi sono archiviati sul server"
 
-#: src/converse-muc.js:2186
+#: src/converse-muc.js:2192
 msgid "This room is restricted to members only"
 msgstr "Questa stanza è ristretta ai soli membri"
 
-#: src/converse-muc.js:2187
+#: src/converse-muc.js:2193
 msgid "This room is being moderated"
 msgstr "Questa stanza è moderata"
 
-#: src/converse-muc.js:2188
+#: src/converse-muc.js:2194
 #, fuzzy
 msgid "All other room occupants can see your XMPP username"
 msgstr "Tutti gli occupanti della stanza possono vedere il tuo Jabber ID"
 
-#: src/converse-muc.js:2189
+#: src/converse-muc.js:2195
 msgid "Anyone can join this room"
 msgstr "Chiunque può collegarsi a questa stanza"
 
-#: src/converse-muc.js:2190
+#: src/converse-muc.js:2196
 msgid "This room requires a password before entry"
 msgstr "Questa stanza richiede una password"
 
-#: src/converse-muc.js:2191
+#: src/converse-muc.js:2197
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2192
+#: src/converse-muc.js:2198
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "La stanza è nella lista delle ricerche pubbliche"
 
-#: src/converse-muc.js:2193
+#: src/converse-muc.js:2199
 #, fuzzy
 msgid "Only moderators can see your XMPP username"
 msgstr "Solo il moderatore può vedere il tuo Jabber ID"
 
-#: src/converse-muc.js:2194
+#: src/converse-muc.js:2200
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2195
+#: src/converse-muc.js:2201
 msgid "This room is not being moderated"
 msgstr "Questa stanza non è moderata"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 msgid "This room does not require a password upon entry"
 msgstr "Questa stanza non richiede una password"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Stai per invitare %1$s nella stanza \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "Puoi includere un messaggio per spiegare le ragioni dell'invito."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nome stanza"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Entra nella Stanza"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Mostra stanze"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Stanze"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Nessuna stanza su %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Utenti presenti:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Funzionalità:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Richiede autenticazione"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Richiede un invito"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Stanza aperta"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Stanza permanente"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Stanza temporanea"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s ti ha invitato a partecipare a una chat room: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -866,19 +880,19 @@ msgstr "è online"
 msgid "wants to be your contact"
 msgstr "vuole essere un tuo contatto"
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Ristabilisci sessione criptata"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Generazione chiave private in corso."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Il tuo browser potrebbe bloccarsi."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -889,19 +903,19 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Non posso verificare l'identità dell'utente."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Scambio la chiave privata col contatto."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "I tuoi messaggi non sono più criptati"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -909,27 +923,27 @@ msgstr ""
 "I tuoi messaggi sono ora criptati ma l'identità del tuo contatto non è "
 "verificata."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "L'identità del contatto è verificata."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Il tuo messaggio non può essere spedito"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Abbiamo ricevuto un messaggio non criptato"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Abbiamo ricevuto un messaggio criptato non leggibile"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -943,7 +957,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -952,58 +966,58 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Qual è la tua domanda di sicurezza?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Qual è la risposta alla domanda di sicurezza?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Schema di autenticazione non valido"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "I tuoi messaggi non sono criptati. Clicca qui per attivare OTR encryption."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "I tuoi messaggi sono criptati ma il tuo contatto non è verificato."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Il tuoi messaggi sono criptati e il tuo contatto verificato."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Fine della conversazione criptata"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Aggiorna conversazione criptata"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Inizio conversazione criptata"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verifica con fingerprints"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verifica con SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Che cos'è?"
 
@@ -1013,47 +1027,47 @@ msgstr "Che cos'è?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "non criptato"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "non verificato"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verificato"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "finito"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " es. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Nome del dominio del provider XMPP:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Modulo di registrazione"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Suggerimento: È disponibile un elenco di provider XMPP pubblici"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "qui"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Registra"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1061,11 +1075,11 @@ msgstr ""
 "Siamo spiacenti, il provider specificato non supporta la registrazione di "
 "account. Si prega di provare con un altro provider."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Sto richiedendo un modulo di registrazione al server XMPP"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1074,15 +1088,15 @@ msgstr ""
 "Qualcosa è andato storto durante la connessione con “%1$s”. Sei sicuro che "
 "esiste?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Registrazione riuscita"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1090,7 +1104,7 @@ msgstr ""
 "Il provider ha respinto il tentativo di registrazione. Controlla i dati "
 "inseriti."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1109,102 +1123,107 @@ msgstr "Stanza aperta"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Sei sicuro di voler rimuovere il segnalibro \"%1$s\"?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Questo contatto è occupato"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Questo contatto è online"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Questo contatto è offline"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Questo contatto non è disponibile"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Il contatto è away da un lungo periodo"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Questo contatto è away"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Gruppi"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "I miei contatti"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Contatti in attesa"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Richieste dei contatti"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Senza Gruppo"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr "Filtri"
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr "Stato"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr "Ogni"
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr "Away estesa"
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Clicca per rimuovere questo contatto"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Clicca per accettare questa richiesta di contatto"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Clicca per rifiutare questa richiesta di contatto"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Clicca per parlare con questo contatto"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Nome"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Sei sicuro di voler rimuovere questo contatto?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Si è verificato un errore durante il tentativo di rimozione "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 
@@ -1241,9 +1260,6 @@ msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "Si è verificato un errore durante la connessione al server. "
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Si è verificato un errore durante il tentativo di aggiunta "
-
 #~ msgid "Error: the \""
 #~ msgstr "Errore: il \""
 
@@ -1263,16 +1279,10 @@ msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 #~ msgid "Return"
 #~ msgstr "Ritorna"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Si è verificato un errore durante il tentativo di rimozione "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "La ragione data è: \"%1$s\"."
 
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Clicca per menzionare questo utente nel tuo messaggio."
-
 #~ msgid "Authentication failed."
 #~ msgstr "Autenticazione fallita."
 
diff --git a/locale/ja/LC_MESSAGES/converse.po b/locale/ja/LC_MESSAGES/converse.po
index f856b46f2..061e411fb 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 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2014-01-07 11:32+0900\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Language JA\n"
@@ -17,298 +17,303 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "この談話室についての詳細を見る"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "メッセージを削除"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "私"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "このメニューを表示"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "第三者に書く"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "メッセージを削除"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "取り込み中"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "相手先"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "サインイン"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "私はいま %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "状況メッセージを入力するには、ここをクリック"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "クリックして、在席状況を変更"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "独自の在席状況"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "在席"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "不在"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "オンライン"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "クリックして新しいチャットの相手先を追加"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "相手先を追加"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "名前"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "検索"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "追加"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "ユーザーが見つかりません"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "クリックしてこの相手先を削除"
@@ -318,74 +323,74 @@ msgstr "クリックしてこの相手先を削除"
 msgid "Close this box"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "この談話室はメンバー以外にも見えます"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "この談話室はメンバー以外には見えません"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "談話室の設定(プライバシーに無関係)が変更されました"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取りはじめます"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "この談話室はただいま非匿名です"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "この談話室はただいま半匿名です"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "この談話室はただいま匿名です"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "この談話室から締め出されました"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "この談話室から蹴り出されました"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "分掌の変更のため、この談話室から削除されました"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -393,7 +398,7 @@ msgstr ""
 "談話室がメンバー制に変更されました。メンバーではないため、この談話室から削除"
 "されました"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -410,463 +415,472 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s を締め出しました"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s を締め出しました"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s を蹴り出しました"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "分掌の変更のため、%1$s を削除しました"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "メンバーでなくなったため、%1$s を削除しました"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "ユーザーを談話室から締め出す"
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "ユーザーを談話室から蹴り出す"
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "第三者に書く"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "ユーザーを談話室から蹴り出す"
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "第三者に書く"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "談話室の話題を設定"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "パスワード:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "送信"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "この談話室から締め出されました"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "ニックネームがありません"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "新しい談話室を作成する権限がありません"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "ニックネームがこの談話室のポリシーに従っていません"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "この談話室は存在しません"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "この談話室は入室者数の上限に達しています"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s が話題を設定しました: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "このユーザーは司会者です"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "このユーザーはこの談話室で発言できます"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "このユーザーはこの談話室で発言できません"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 #, fuzzy
 msgid "Occupants"
 msgstr "入室者:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "特徴:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "非表示"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "発言制限"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "パスワード:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "公開談話室"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "発言制限なし"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "この談話室は入室者数の上限に達しています"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "このユーザーは司会者です"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "クリックしてこの談話室を開く"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "この談話室にはパスワードが必要です"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "この談話室は非匿名です"
+msgid "This room is restricted to members only"
+msgstr "この談話室は入室者数の上限に達しています"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "このユーザーは司会者です"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "この談話室にはパスワードが必要です"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "この談話室は非匿名です"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "談話室の名前"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "サーバー"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "入室"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "談話室一覧を見る"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "談話室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "%1$s に談話室はありません"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "説明: "
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "入室者:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "特徴:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "認証の要求"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "招待の要求"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "常設談話室"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -894,19 +908,19 @@ msgstr "この相手先はオフラインです"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "暗号化セッションの再接続"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -922,19 +936,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "このユーザーの本人性を検証できませんでした。"
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "メッセージはもう暗号化されません"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -942,29 +956,29 @@ msgid ""
 msgstr ""
 "メッセージは暗号化されますが、相手が本人であることは検証されていません。"
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "相手の本人性を検証しました。"
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "相手は、暗号化を終了しました。あなたもそれに合わせる必要があります。"
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "メッセージを送信できませんでした"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "暗号化されていないメッセージを受信しました"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "読めない暗号化メッセージを受信しました"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -986,7 +1000,7 @@ msgstr ""
 "確認して、鍵指紋が正しければ「OK」を、正しくなければ「キャンセル」をクリック"
 "してください。"
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1000,62 +1014,62 @@ msgstr ""
 "相手にも、同じ質問が表示され、正しく同じ答(大文字・小文字は区別されます)を入"
 "力することで、本人性を検証します。"
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "秘密の質問はなんですか?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "秘密の質問の答はなんですか?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "認証の方式が正しくありません"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "メッセージは暗号化されません。OTR 暗号化を有効にするにはここをクリックしてく"
 "ださい。"
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "メッセージは暗号化されますが、相手は検証されていません。"
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "メッセージは暗号化され、相手も検証されています。"
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "相手は私信を終了しました。あなたも同じようにしてください"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "暗号化された会話を終了"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "暗号化された会話をリフレッシュ"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "暗号化された会話を開始"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "鍵指紋で検証"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "SMP で検証"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "これは何ですか?"
 
@@ -1065,78 +1079,78 @@ msgstr "これは何ですか?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "暗号化されていません"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "検証されていません"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "検証されました"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "完了"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1155,103 +1169,108 @@ msgstr "開放談話室"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "この相手先は取り込み中です"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "この相手先は在席しています"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "この相手先は不通です"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "この相手先は不在です"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "相手先一覧"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "保留中の相手先"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "会話に呼び出し"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "クリックしてこの相手先とチャット"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "クリックしてこの相手先を削除"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "クリックしてこの相手先を削除"
@@ -1299,10 +1318,6 @@ msgstr "クリックしてこの相手先を削除"
 #~ msgid "Server:"
 #~ msgstr "サーバー"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "クリックしてこの談話室を開く"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "認証に失敗"
diff --git a/locale/nb/LC_MESSAGES/converse.po b/locale/nb/LC_MESSAGES/converse.po
index 61492c8d3..e7bc6349c 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Andreas Lorentsen <andreas.lorentsen@gmail.com>\n"
 "Language-Team: \n"
@@ -18,295 +18,300 @@ msgstr ""
 "lang: nb\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Lagre"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Er du sikker på at du vil fjerne denne kontakten?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Vis mer informasjon om dette rommet"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Fjern meldinger"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Personlig melding"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "meg"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "skriver"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "har stoppet å skrive"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "Kontakten er borte"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Viser denne menyen"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Fjern meldinger"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Er du sikker på at du vil fjerne meldingene fra denne meldingsboksen?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "opptatt"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Fjern alle meldinger"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Start en samtale"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Logg inn"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Innlogging"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Jeg er %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Klikk her for å skrive en personlig statusmelding"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Klikk for å endre din meldingsstatus"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Personlig status"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "pålogget"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "opptatt"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "borte lenge"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "borte"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Opptatt"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Borte"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Logg Av"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Klikk for å legge til nye meldingskontakter"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Legg til en Kontakt"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Kontaktnavn"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Søk"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Legg Til"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Ingen brukere funnet"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Klikk for å skjule disse kontaktene"
 
@@ -315,73 +320,73 @@ msgstr "Klikk for å skjule disse kontaktene"
 msgid "Close this box"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimert"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Dette rommet viser nå utilgjengelige medlemmer"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Dette rommet viser ikke utilgjengelige medlemmer"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Ikke-personvernsrelatert romkonfigurasjon har blitt endret"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Romlogging er nå aktivert"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Romlogging er nå deaktivert"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Dette rommet er nå ikke-anonymt"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Dette rommet er nå semi-anonymt"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Dette rommet er nå totalt anonymt"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt opprettet"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Du har blitt utestengt fra dette rommet"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Du ble kastet ut av dette rommet"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Du har blitt fjernet fra dette rommet på grunn av en holdningsendring"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -389,7 +394,7 @@ msgstr ""
 "Du har blitt fjernet fra dette rommet fordi rommet nå kun tillater "
 "medlemmer, noe du ikke er."
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -407,462 +412,471 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s  har blitt utestengt"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s sitt kallenavn er endret"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s  ble kastet ut"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s har blitt fjernet på grunn av en holdningsendring"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s har blitt fjernet på grunn av at han/hun ikke er medlem"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ditt kallenavn har blitt automatisk endret til %1$s "
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ditt kallenavn har blitt endret til %1$s "
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Melding"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Er du sikker på at du vil fjerne meldingene fra dette rommet?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Feil: kunne ikke utføre kommandoen"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Utesteng bruker fra rommet"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Kast ut bruker fra rommet"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Fjern brukerens muligheter til å skrive meldinger"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Du er ikke på medlemslisten til dette rommet"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Endre rommets emne"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Tillat stumme brukere å skrive meldinger"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Passord:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Send"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ditt kallenavn har blitt endret til %1$s "
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Årsaken som er oppgitt er: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Årsaken som er oppgitt er: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Du er ikke på medlemslisten til dette rommet"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Du har blitt utestengt fra dette rommet"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Ingen kallenavn var spesifisert"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Du har ikke tillatelse til å opprette nye rom"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Ditt kallenavn er ikke i samsvar med rommets regler"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Dette rommet eksisterer ikke (enda)"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Dette rommet har nådd maksimalt antall brukere"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Emnet ble endret den %1$s til: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Denne brukeren er moderator"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Denne brukeren kan skrive meldinger i dette rommet"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Denne brukeren kan IKKE sende meldinger i dette rommet"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Invitér"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderert"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Ikke-Anonym"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Passord:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Alle"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi-anonymt"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Umoderert"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Dette rommet har nådd maksimalt antall brukere"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Denne brukeren er moderator"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Klikk for å åpne dette rommet"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Dette rommet krever et passord"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Dette rommet er ikke anonymt"
+msgid "This room is restricted to members only"
+msgstr "Dette rommet har nådd maksimalt antall brukere"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Denne brukeren er moderator"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Dette rommet krever et passord"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Dette rommet er ikke anonymt"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Du er i ferd med å invitere %1$s til samtalerommet \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Romnavn"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "Koble til"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Vis Rom"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Rom"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Ingen rom på %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Krever Godkjenning"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Krever en invitasjon"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Permanent Rom"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s har invitert deg til å bli med i chatterommet: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -892,19 +906,19 @@ msgstr "Kontakten er avlogget"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Gjenopptar kryptert økt"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Genererer privat nøkkel"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Din nettleser kan bli uresponsiv"
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -921,19 +935,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Kunne ikke bekrefte denne brukerens identitet"
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Bytter private nøkler med kontakt"
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Dine meldinger er ikke kryptert lenger."
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -941,28 +955,28 @@ msgstr ""
 "Dine meldinger er nå krypterte, men identiteten til din kontakt har ikke "
 "blitt verifisert."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "Din kontakts identitet har blitt verifisert."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Din kontakt har avsluttet kryptering i sin ende, dette burde du også gjøre."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Beskjeden din kunne ikke sendes"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Vi mottok en ukryptert beskjed"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Vi mottok en uleselig melding"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -985,7 +999,7 @@ msgstr ""
 "Om du har bekreftet at avtrykkene matcher, klikk OK. I motsatt fall, trykk "
 "Avbryt."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1000,59 +1014,59 @@ msgstr ""
 "nøyaktig samme svaret (det er forskjell på små og store bokstaver), vil "
 "identiteten verifiseres."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Hva er ditt Sikkerhetsspørsmål?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Hva er svaret på ditt Sikkerhetsspørsmål?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Du har vedlagt en ugyldig godkjenningsplan."
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Dine meldinger er ikke krypterte. Klikk her for å aktivere OTR-kryptering."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Dine meldinger er krypterte, men din kontakt har ikke blitt verifisert."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Dine meldinger er krypterte og din kontakt er verifisert."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "Din kontakt har avsluttet økten i sin ende, dette burde du også gjøre."
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Avslutt kryptert økt"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Last inn kryptert samtale på nytt"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Start en kryptert samtale"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verifiser med Avtrykk"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verifiser med SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Hva er dette?"
 
@@ -1062,47 +1076,47 @@ msgstr "Hva er dette?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "ukryptertß"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "uverifisert"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verifisert"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "ferdig"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Din XMPP-tilbyders domenenavn:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Hent registreringsskjema"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tips: En liste med offentlige XMPP-tilbydere er tilgjengelig"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "her"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Registrér deg"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1110,11 +1124,11 @@ msgstr ""
 "Beklager, den valgte tilbyderen støtter ikke in band kontoregistrering. "
 "Vennligst prøv igjen med en annen tilbyder. "
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Spør etter registreringsskjema fra XMPP-tjeneren"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1123,22 +1137,22 @@ msgstr ""
 "Noe gikk galt under etablering av forbindelse med \"%1$s\". Er du sikker på "
 "at denne eksisterer?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Logger deg inn"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Registrering var vellykket"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr "Tilbyderen avviste ditt registreringsforsøk."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1157,102 +1171,107 @@ msgstr "Åpent Rom"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Er du sikker på at du vil fjerne denne kontakten?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Denne kontakten er opptatt"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Kontakten er pålogget"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Kontakten er utilgjengelig"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Kontakten er borte for en lengre periode"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Kontakten er borte"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Grupper"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Mine Kontakter"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Kontakter som venter på godkjenning"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Kontaktforespørsler"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Ugrupperte"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Klikk for å fjerne denne kontakten"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Klikk for å Godta denne kontaktforespørselen"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Klikk for å avslå denne kontaktforespørselen"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Klikk for å chatte med denne kontakten"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Er du sikker på at du vil fjerne denne kontakten?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Klikk for å fjerne denne kontakten"
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 
@@ -1311,10 +1330,6 @@ msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Årsaken som er oppgitt er: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Klikk for å åpne dette rommet"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Godkjenning mislyktes"
diff --git a/locale/nl/LC_MESSAGES/converse.po b/locale/nl/LC_MESSAGES/converse.po
index 5cf3a3031..e3205cfcb 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2017-04-06 11:47+0200\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/conversejs/"
@@ -22,300 +22,305 @@ msgstr ""
 "lang: nl\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik om room te openen"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Toon meer informatie over deze room"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Verwijder bericht"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "ikzelf"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "Conact is afwezig"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Toon dit menu"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Verwijder bericht"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "Contact is offline"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "bezet"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Aanmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Ik ben %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om custom status bericht te maken"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Klik hier om status te wijzigen"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "bezet"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "afwezig lange tijd"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "afwezig"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Bezet"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Afwezig"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Klik om nieuwe contacten toe te voegen"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Voeg contact toe"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Contact naam"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Geen gebruikers gevonden"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik om contact te verwijderen"
@@ -325,79 +330,79 @@ msgstr "Klik om contact te verwijderen"
 msgid "Close this box"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 msgid "The room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Deze room is nu niet annoniem"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Deze room is nu semie annoniem"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Deze room is nu volledig annoniem"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Een nieuwe room is gemaakt"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Je bent verbannen uit deze room"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Je bent uit de room gegooid"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr ""
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -413,463 +418,472 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s is verbannen"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s is verbannen"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s has been kicked out"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Bericht"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Ban gebruiker van chatroom"
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "Goei gebruiker uit chatroom"
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "Schrijf in de 3de persoon"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "Goei gebruiker uit chatroom"
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "Schrijf in de 3de persoon"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Zet chatroom topic"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Je bent verbannen uit deze room"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Geen nickname ingegeven"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Je bent niet toegestaan nieuwe rooms te maken"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Je nickname is niet conform policy"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Deze room bestaat niet"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Deze room heeft het maximale aantal gebruikers"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Klik om room te openen"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Dit is een moderator"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Deze gebruiker kan berichten sturen in deze room"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Deze gebruiker kan NIET een bericht sturen in deze room"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 #, fuzzy
 msgid "Occupants"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Functies:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Gemodereerd"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Niet annoniem"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Open room"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Wachtwoord: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi annoniem"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Niet gemodereerd"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Deze room heeft het maximale aantal gebruikers"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Dit is een moderator"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Klik om room te openen"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Chatroom heeft een wachtwoord"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Deze room is niet annoniem"
+msgid "This room is restricted to members only"
+msgstr "Deze room heeft het maximale aantal gebruikers"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Dit is een moderator"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Klik om room te openen"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Chatroom heeft een wachtwoord"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Deze room is niet annoniem"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Room naam"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "Deelnemen"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Toon rooms"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Rooms"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Geen room op %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Beschrijving"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Functies:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Verificatie vereist"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Veriest een uitnodiging"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Blijvend room"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -897,19 +911,19 @@ msgstr "Contact is offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Bezig versleutelde sessie te herstellen"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -920,48 +934,48 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Niet kon de identiteit van deze gebruiker niet identificeren."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Je berichten zijn niet meer encrypted"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr "Jou berichten zijn encrypted, maar je contact is niet geverifieerd."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Jou contact is geverifieerd"
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Jou contact heeft encryption aanstaan, je moet het zelfde doen."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Je bericht kon niet worden verzonden"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "We ontvingen een unencrypted bericht "
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "We ontvangen een onleesbaar unencrypted bericht"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -975,7 +989,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -984,61 +998,61 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Wat is jou sericury vraag?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Wat is het antwoord op de security vraag?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr ""
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Jou bericht is niet encrypted. KLik hier om ORC encrytion aan te zetten."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Jou berichten zijn encrypted, maar je contact is niet geverifieerd."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Jou bericht is encrypted en jou contact is geverifieerd."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "Jou contact heeft encryption aanstaan, je moet het zelfde doen."
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Beeindig encrypted gesprek"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Ververs encrypted gesprek"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Start encrypted gesprek"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr ""
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr ""
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Wat is dit?"
 
@@ -1048,78 +1062,78 @@ msgstr "Wat is dit?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "ongecodeerde"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "niet geverifieerd"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "geverifieerd"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "klaar"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1138,103 +1152,108 @@ msgstr "Open room"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Contact is bezet"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Contact is online"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Contact is offline"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Contact is niet beschikbaar"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Contact is afwezig voor lange periode"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Conact is afwezig"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Mijn contacts"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Conacten in afwachting van"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Contact uitnodiging"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Klik om te chatten met contact"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Klik om contact te verwijderen"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik om contact te verwijderen"
@@ -1282,10 +1301,6 @@ msgstr "Klik om contact te verwijderen"
 #~ msgid "Server:"
 #~ msgstr "Server"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Klik om room te openen"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Authenticeren mislukt"
diff --git a/locale/pl/LC_MESSAGES/converse.po b/locale/pl/LC_MESSAGES/converse.po
index a0c09941d..bd13f9722 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-08-01 10:22+0000\n"
 "Last-Translator: Serge Victor <converse.js@random.re>\n"
 "Language-Team: Polish\n"
@@ -19,288 +19,293 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Zachowaj"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Wystąpił błąd w trakcie próby usunięcia "
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Pokaż więcej informacji o pokoju"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Zamknij okno rozmowy"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Wiadomość osobista"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "ja"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "pisze"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "przestał pisać"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "uciekł"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Pokaż menu"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Usuń wiadomości"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z okienka rozmowy?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "wyłączył się"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "zajęty"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Wyczyść wszystkie wiadomości"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Wstaw uśmieszek"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Zadzwoń"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "Nazwa użytkownika XMPP:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Kliknij tutaj aby zalogować się anonimowo"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "użytkownik@serwer"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "hasło"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Zaloguj się"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Jestem %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Kliknij aby wpisać nowy status"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Kliknij aby zmienić status rozmowy"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Własny status"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "dostępny"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "zajęty"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "dłużej nieobecny"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "nieobecny"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 msgid "offline"
 msgstr "rozłączony"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Dostępny"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Zajęty"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Nieobecny"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Kliknij aby dodać nowe kontakty"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Dodaj kontakt"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr "np. użytkownik@przykładowa-domena.pl"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Nie znaleziono użytkowników"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Wystąpił błąd w czasie próby dodania "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Klient nie umożliwia subskrybcji obecności"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Kliknij aby schować te kontakty"
 
@@ -308,73 +313,73 @@ msgstr "Kliknij aby schować te kontakty"
 msgid "Close this box"
 msgstr "Zamknij okno"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Zminimalizuj okno czatu"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Kliknij aby powrócić do rozmowy"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Zminimalizowany"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Pokój pokazuje niedostępnych rozmówców"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Ten pokój nie wyświetla niedostępnych członków"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Ustawienia pokoju nie związane z prywatnością zostały zmienione"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Zostało włączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Zostało wyłączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Pokój stał się nieanonimowy"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Pokój stał się półanonimowy"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Jesteś niemile widziany w tym pokoju"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Zostałeś wykopany z pokoju"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Zostałeś usunięty z pokoju ze względu na zmianę przynależności"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -382,7 +387,7 @@ msgstr ""
 "Zostałeś usunięty z pokoju ze względu na to, że pokój zmienił się na "
 "wymagający członkowstwa, a ty nie jesteś członkiem"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -400,376 +405,385 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s został zbanowany"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s zmienił ksywkę"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s został wykopany"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s został usunięty z powodu zmiany przynależności"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s został usunięty ze względu na to, że nie jest członkiem"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Twoja ksywka została automatycznie zmieniona na: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Twoja ksywka została zmieniona na: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Ukryj listę rozmówców"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z tego pokoju?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Błąd: nie potrafię uruchomić polecenia"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Przyznaj prawa administratora"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Zablokuj dostępu do pokoju"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Zmień prawa dostępu na zwykłego uczestnika"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Wykop z pokoju"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Przyznaj członkowstwo "
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Zablokuj człowiekowi możliwość rozmowy"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Zmień ksywkę"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Przyznaj prawa moderatora"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Uczyń właścicielem pokoju"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Usuń z listy członków"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Ustaw temat pokoju"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Pozwól uciszonemu człowiekowi na rozmowę"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 "Ksywka jaką wybrałeś jest zarezerwowana albo w użyciu, wybierz proszę inną."
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr "Wybierz proszę ksywkę"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Ksywka"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 msgid "Enter room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Hasło:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Wyślij"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Twoja ksywka została zmieniona na: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Podana przyczyna to: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Podana przyczyna to: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Nie jesteś członkiem tego pokoju rozmów"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Jesteś niemile widziany w tym pokoju"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nie podałeś ksywki"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Nie masz uprawnień do tworzenia nowych pokojów rozmów"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Twoja ksywka nie jest zgodna z regulaminem pokoju"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ten pokój (jeszcze) nie istnieje"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Temat ustawiony przez %1$s na: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Kliknij aby wspomnieć człowieka w wiadomości."
+
+#: src/converse-muc.js:2082
 msgid "This user is a moderator."
 msgstr "Ten człowiek jest moderatorem"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 msgid "This user can send messages in this room."
 msgstr "Ten człowiek może rozmawiać w niejszym pokoju"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 msgid "This user can NOT send messages in this room."
 msgstr "Ten człowiek NIE może rozmawiać w niniejszym pokoju"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Uczestników"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Zaproś"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderowany"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Nieanonimowy"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Hasło:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Publiczny"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Półanonimowy"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Niemoderowany"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Ten człowiek jest moderatorem"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Kliknij aby wejść do pokoju"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Pokój rozmów wymaga podania hasła"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Pokój nie jest anonimowy"
+msgid "This room is restricted to members only"
+msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Ten człowiek jest moderatorem"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Kliknij aby wejść do pokoju"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Pokój rozmów wymaga podania hasła"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Pokój nie jest anonimowy"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Zamierzasz zaprosić %1$s do pokoju rozmów \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -777,78 +791,78 @@ msgstr ""
 "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę "
 "zaproszenia."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nazwa pokoju"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Serwer"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Pokaż pokoje"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Pokoje"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Brak jest pokojów na %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Uczestnicy:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Wymaga autoryzacji"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Wymaga zaproszenia"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Stały pokój"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s zaprosił(a) cię do wejścia do pokoju rozmów %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -875,19 +889,19 @@ msgstr "połączył się"
 msgid "wants to be your contact"
 msgstr "chce być twoim kontaktem"
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Przywacam sesję szyfrowaną"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Generuję klucz prywatny."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Twoja przeglądarka może nieco zwolnić."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -903,19 +917,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Nie jestem w stanie zweryfikować tożsamości kontaktu."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Wymieniam klucze szyfrujące z kontaktem."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Twoje wiadomości nie są już szyfrowane"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -923,27 +937,27 @@ msgstr ""
 "Wiadomości są teraz szyfrowane, ale tożsamość kontaktu nie została "
 "zweryfikowana."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "Tożsamość kontaktu została zweryfikowana"
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Kontakt zakończył sesję szyfrowaną, powinieneś zrobić to samo."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Twoja wiadomość nie została wysłana"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Otrzymaliśmy niezaszyfrowaną wiadomość"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Otrzymaliśmy nieczytelną zaszyfrowaną wiadomość"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -966,7 +980,7 @@ msgstr ""
 "Jeśli odciski palców zostały potwierdzone, kliknij OK, w inny wypadku "
 "kliknij Anuluj."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -980,59 +994,59 @@ msgstr ""
 "jeśli udzieli tej samej odpowiedzi (ważna jest wielkość liter), tożsamość "
 "zostanie zweryfikowana."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Jakie jest pytanie bezpieczeństwa?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Jaka jest odpowiedź na pytanie bezpieczeństwa?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Niewłaściwy schemat autoryzacji"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Twoje wiadomości nie są szyfrowane. Kliknij, aby uruchomić szyfrowanie OTR"
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Wiadomości są szyfrowane, ale tożsamość kontaktu nie została zweryfikowana."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Wiadomości są szyfrowane i tożsamość kontaktu została zweryfikowana."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "Kontakt zakończył prywatną rozmowę i ty zrób to samo"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Zakończ szyfrowaną rozmowę"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Odśwież szyfrowaną rozmowę"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Rozpocznij szyfrowaną rozmowę"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Zweryfikuj za pomocą odcisków palców"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Zweryfikuj za pomocą SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Co to jest?"
 
@@ -1042,47 +1056,47 @@ msgstr "Co to jest?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "nieszyfrowane"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "niezweryfikowane"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "zweryfikowane"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "zakończone"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr "np. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Domena twojego dostawcy XMPP:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Pobierz formularz rejestracyjny"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Wskazówka: dostępna jest lista publicznych dostawców XMPP"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "tutaj"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1090,11 +1104,11 @@ msgstr ""
 "Przepraszamy, ale podany dostawca nie obsługuje rejestracji. Spróbuj wskazać "
 "innego dostawcę."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Pobieranie formularza rejestracyjnego z serwera XMPP"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1103,15 +1117,15 @@ msgstr ""
 "Coś nie zadziałało przy próbie połączenia z \"%1$s\". Jesteś pewien że "
 "istnieje?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Jesteś logowany"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Szczęśliwie zarejestrowany"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1119,7 +1133,7 @@ msgstr ""
 "Dostawca odrzucił twoją próbę rejestracji. Sprawdź proszę poprawność danych "
 "które zostały wprowadzone."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1138,102 +1152,107 @@ msgstr "Otwarty pokój"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Kontakt jest zajęty"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Kontakt jest połączony"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Kontakt jest niepołączony"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Kontakt jest niedostępny"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Kontakt jest nieobecny przez dłuższą chwilę"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Kontakt jest nieobecny"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Grupy"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Moje kontakty"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Kontakty oczekujące"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Zaproszenia do kontaktu"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Niezgrupowane"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr "Filtr"
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr "Stan"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr "Dowolny"
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr "Gotowy do rozmowy"
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr "Dłuższa nieobecność"
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Kliknij aby usunąć kontakt"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Klknij aby zaakceptować życzenie nawiązania kontaktu"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Kliknij aby odrzucić życzenie nawiązania kontaktu"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Kliknij aby porozmawiać z kontaktem"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Wystąpił błąd w trakcie próby usunięcia "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 
@@ -1271,9 +1290,6 @@ msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "Wystąpił błąd w czasie próby zachowania formularza."
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Wystąpił błąd w czasie próby dodania "
-
 #~ msgid "Error: the \""
 #~ msgstr "Błąd: \""
 
@@ -1294,16 +1310,10 @@ msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 #~ msgid "Return"
 #~ msgstr "Powrót"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Wystąpił błąd w trakcie próby usunięcia "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Podana przyczyna to: \""
 
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Kliknij aby wspomnieć człowieka w wiadomości."
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Autoryzacja nie powiodła się"
diff --git a/locale/pt_BR/LC_MESSAGES/converse.po b/locale/pt_BR/LC_MESSAGES/converse.po
index 610978c0f..0d9e1736b 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Alan Meira <alan@engarte.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -20,300 +20,305 @@ msgstr ""
 "lang: pt_BR\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Salvar"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Clique para remover o contato"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Mostrar mais informações nessa sala"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Remover mensagens"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Clique para remover o contato"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "eu"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contato está ausente"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Mostrar o menu"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Remover mensagens"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Tem certeza que deseja limpar as mensagens dessa caixa?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contato está offline"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Conectar-se"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Estou %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Clique aqui para customizar a mensagem de status"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Clique para mudar seu status no chat"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Status customizado"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "ausente a bastante tempo"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Clique para adicionar novos contatos ao chat"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Adicionar contato"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Procurar"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Não foram encontrados usuários"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Clique para remover o contato"
@@ -323,74 +328,74 @@ msgstr "Clique para remover o contato"
 msgid "Close this box"
 msgstr "Clique para remover o contato"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Clique para remover o contato"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Agora esta sala mostra membros indisponíveis"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Essa sala não mostra membros indisponíveis"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Configuraçõs não relacionadas à privacidade mudaram"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "O log da sala está ativado"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "O log da sala está desativado"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Esse sala é não anônima"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Essa sala agora é semi anônima"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Essa sala agora é totalmente anônima"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Você foi banido dessa sala"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Você foi expulso dessa sala"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Você foi removido da sala devido a uma mudança de associação"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -398,7 +403,7 @@ msgstr ""
 "Você foi removido da sala porque ela foi mudada para somente membrose você "
 "não é um membro"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -416,463 +421,472 @@ msgstr ""
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s foi banido"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s foi banido"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s foi expulso"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "<srtong>%1$s foi removido por causa de troca de associação"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s foi removido por não ser um membro"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Banir usuário do chat"
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "Expulsar usuário do chat"
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "Escrever em terceira pessoa"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "Expulsar usuário do chat"
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "Escrever em terceira pessoa"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Definir tópico do chat"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Apelido"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Senha: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Você foi banido dessa sala"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Você não escolheu um apelido "
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Você não tem permitição de criar novas salas"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Seu apelido não está de acordo com as regras da sala"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "A sala não existe (ainda)"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "A sala atingiu o número máximo de ocupantes"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topico definido por %1$s para: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "CLique para abrir a sala"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Esse usuário é o moderador"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Esse usuário pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Esse usuário NÃO pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 #, fuzzy
 msgid "Occupants"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Não anônimo"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Senha: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Público"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Semi anônimo"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Sem moderação"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "A sala atingiu o número máximo de ocupantes"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Esse usuário é o moderador"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "CLique para abrir a sala"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Esse chat precisa de senha"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Essa sala não é anônima"
+msgid "This room is restricted to members only"
+msgstr "A sala atingiu o número máximo de ocupantes"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Esse usuário é o moderador"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "CLique para abrir a sala"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Esse chat precisa de senha"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Essa sala não é anônima"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Nome da sala"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "Entrar"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Mostar salas"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Sem salas em %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Requer autenticação"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Requer um convite"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -900,19 +914,19 @@ msgstr "Este contato está offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Reestabelecendo sessão criptografada"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Gerando chave-privada."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Seu navegador pode parar de responder."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -929,20 +943,20 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Não foi possível verificar a identidade deste usuário."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "Trocando chave-privada com o contato."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Suas mensagens não estão mais criptografadas"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -951,29 +965,29 @@ msgstr ""
 "Suas mensagens estão agora criptografadas mas a identidade do contatonão foi "
 "confirmada."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "A identidade do contato foi verificada."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Seu contato parou de usar criptografia, você deveria fazer o mesmo."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Sua mensagem não pode ser enviada"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Recebemos uma mensagem não-criptografada"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Recebemos uma mensagem não-criptografada ilegível"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -996,7 +1010,7 @@ msgstr ""
 "Se você tiver confirmado que as assinaturas conferem, clique OK, caso "
 "contrário, clique Cancelar."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1012,63 +1026,63 @@ msgstr ""
 "corretamente a mesma resposta (caso sensitivo), a identidade dele será "
 "verificada."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Qual é a sua pergunta de segurança?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Qual é a resposta para a pergunta de segurança?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Schema de autenticação fornecido é inválido"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Suas mensagens não estão criptografadas. Clique aqui para habilitar "
 "criptografia OTR."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 "Suas mensagens estão criptografadas, mas seu contato não foi verificado."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Suas mensagens estão criptografadas e seu contato verificado."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "Seu contato fechou a sessão privada, você deveria fazer o mesmo"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Finalizar conversa criptografada"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Atualizar conversa criptografada"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Iniciar conversa criptografada"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Verificar com assinatura digital"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Verificar com SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "O que é isso?"
 
@@ -1078,78 +1092,78 @@ msgstr "O que é isso?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "não-criptografado"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "não-verificado"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "verificado"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1168,103 +1182,108 @@ msgstr "Sala aberta"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Este contato está ocupado"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Este contato está online"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Este contato está offline"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Este contato está indisponível"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Este contato está ausente por um longo período"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Este contato está ausente"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Meus contatos"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Contados pendentes"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Solicitação de contatos"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Clique para conversar com o contato"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Clique para remover o contato"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Clique para remover o contato"
@@ -1315,10 +1334,6 @@ msgstr "Clique para remover o contato"
 #~ msgid "Server:"
 #~ msgstr "Server"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "CLique para abrir a sala"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Falha de autenticação"
diff --git a/locale/ru/LC_MESSAGES/converse.po b/locale/ru/LC_MESSAGES/converse.po
index b7a744a66..c6f0af5d1 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Laconic Team <info@laconic.website>\n"
 "Language-Team: Laconic Team <info@laconic.website>\n"
@@ -17,291 +17,296 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Вы уверены, что хотите удалить этот контакт?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Возникла ошибка при удалении "
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Зайти в чат"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Зайти в чат"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Зайти в чат"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Показать больше информации об этом чате"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Зайти в чат"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Удалить сообщения"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 msgid "Close this chat box"
 msgstr "Закрыть это окно чата"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Ваше сообщение"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "Я"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "набирает текст"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "перестал набирать"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "отошёл"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Показать это меню"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Вписать третьего человека"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Удалить сообщения"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Вы уверены, что хотите очистить сообщения из окна чата?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "вышел из сети"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "занят"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Очистить все сообщения"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr "Вставить смайлик"
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Инициировать звонок"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 msgid "Click here to log in anonymously"
 msgstr "Нажмите здесь, чтобы войти анонимно"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Войти"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 msgid "password"
 msgstr "пароль"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Вход"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Редактировать произвольный статус"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Изменить ваш статус"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Произвольный статус"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "на связи"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "занят"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "отошёл надолго"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "отошёл"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "В сети"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Занят"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Отошёл"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Выйти"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Добавить новый чат"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Добавть контакт"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Поиск"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "например, user@example.com"
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Добавить"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Пользователи не найдены"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr "Возникла ошибка при добавлении "
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr "Программа не поддерживает уведомления о статусе"
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Кликните, чтобы спрятать эти контакты"
 
@@ -310,79 +315,79 @@ msgstr "Кликните, чтобы спрятать эти контакты"
 msgid "Close this box"
 msgstr "Закрыть это окно чата"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr "Свернуть окно чата"
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Кликните, чтобы развернуть чат"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Свёрнуто"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Этот чат показывает недоступных собеседников"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Этот чат не показывает недоступных собеседников"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Изменились настройки чата, не относящиеся к приватности"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Протокол чата включен"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Протокол чата выключен"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Этот чат больше не анонимный"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Этот чат частично анонимный"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Этот чат стал полностью анонимный"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Появился новый чат"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Вам запрещено подключатся к этому чату"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Вас выкинули из чата"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас удалили из-за изменения прав"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "Вы отключены от чата, потому что он теперь только для участников"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -398,459 +403,468 @@ msgstr "Вы отключены от этого чата, потому что с
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s забанен"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s сменил псевдоним"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s выкинут"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s удалён, потому что изменились права"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s удалён, потому что не участник"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ваш псевдоним автоматически изменён на: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ваш псевдоним изменён на: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr "Спрятать список участников"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Вы уверены, что хотите очистить сообщения из этого чата?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Ошибка: невозможно выполнить команду"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Дать права администратора"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Забанить пользователя в этом чате."
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 msgid "Change user role to occupant"
 msgstr "Изменить роль пользователя на \"участник\""
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Удалить пользователя из чата."
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Вписать третьего"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Сделать пользователя участником"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Запретить отправку сообщений"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Предоставить права модератора пользователю"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Предоставить права владельца на этот чат"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Отозвать членство пользователя"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Установить тему"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Разрешить заглушенным пользователям отправлять сообщения"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Пароль: "
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Отправить"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ваш псевдоним изменён на: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Причина: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Причина: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Вы не участник этого чата"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Вам запрещено подключатся к этому чату"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Вы не указали псевдоним"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Вы не имеете права создавать чаты"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Псевдоним запрещён правилами чата"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Этот чат не существует"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Чат достиг максимального количества участников"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема %2$s устатновлена %1$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Зайти в чат"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Модератор"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Собеседник"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Пользователь не может посылать сообщения в этот чат"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Участники:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Скрыто"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Модерируемая"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Не анонимная"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Пароль: "
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Публичный"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Частично анонимный"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Немодерируемый"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Чат достиг максимального количества участников"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Модератор"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Зайти в чат"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Для доступа в чат необходим пароль."
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Этот чат не анонимный"
+msgid "This room is restricted to members only"
+msgstr "Чат достиг максимального количества участников"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Модератор"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Зайти в чат"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Для доступа в чат необходим пароль."
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Этот чат не анонимный"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Вы собираетесь пригласить %1$s в чат \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Вы можете дополнительно вставить сообщение, объясняющее причину приглашения."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Имя чата"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Присоединться к чату"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Показать чаты"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Чаты"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Нет чатов %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Участники:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Требуется авторизация"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Требуется приглашение"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Постоянный чат"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s пригласил вас в чат: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -878,19 +892,19 @@ msgstr "вышел из сети"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Восстанавливается зашифрованная сессия"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Генерируется секретный ключ"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Ваш браузер может зависнуть."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -907,19 +921,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Не удалось проверить подлинность этого пользователя."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Обмен секретным ключом с контактом."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Ваши сообщения больше не шифруются"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -928,28 +942,28 @@ msgstr ""
 "Ваши сообщения шифруются, но ваша учётная запись не проверена вашим "
 "собеседником."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Ваша учётная запись проверена вашим собеседником."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Ваш контакт закончил шифрование у себя, вы должны сделать тоже самое."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Ваше сообщение не отправлено"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Вы получили незашифрованное сообщение"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Вы получили нечитаемое зашифрованное сообщение"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -971,7 +985,7 @@ msgstr ""
 "Если вы удостоверились, что отпечатки совпадают, нажмите OK; если нет "
 "нажмите Отмена"
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -984,61 +998,61 @@ msgstr ""
 "Вашему контакту будет задан этот вопрос, и если ответы совпадут (с учётом "
 "регистра), его подлинность будет подтверждена."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Введите секретный вопрос"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Ответ на секретный вопрос"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Некоррекная схема аутентификации"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Ваши сообщения не шифруются. Нажмите здесь, чтобы настроить шифрование."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Ваши сообщения шифруются, но ваш контакт не проверен."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Ваши сообщения шифруются и ваш контакт проверен."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "Ваш контакт закрыл свою часть приватной сессии, вы должны сделать тоже самое."
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Закончить шифрованную беседу"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Обновить шифрованную беседу"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Начать шифрованный разговор"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Проверить при помощи отпечатков"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Проверить при помощи SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Что это?"
 
@@ -1048,47 +1062,47 @@ msgstr "Что это?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "не зашифровано"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "не проверено"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "проверено"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "закончено"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr "например, conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Получить форму регистрации"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Совет. Список публичных XMPP провайдеров доступен"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "здесь"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1096,11 +1110,11 @@ msgstr ""
 "К сожалению, провайдер не поддерживает регистрацию аккаунта через клиентское "
 "приложение. Пожалуйста попробуйте выбрать другого провайдера."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запрашивается регистрационная форма с XMPP сервера"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1109,15 +1123,15 @@ msgstr ""
 "Что-то пошло не так при установке связи с \"%1$s\". Вы уверены, что такой "
 "адрес существует?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Осуществляется вход"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Зарегистрирован успешно"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1125,7 +1139,7 @@ msgstr ""
 "Провайдер отклонил вашу попытку зарегистрироваться. Пожалуйста, проверьте, "
 "правильно ли введены значения."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1144,102 +1158,107 @@ msgstr "Открыть чат"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Вы уверены, что хотите удалить этот контакт?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Занят"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "В сети"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Не в сети"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Недоступен"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Надолго отошёл"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Отошёл"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Группы"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Контакты"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Собеседники, ожидающие авторизации"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Запросы на авторизацию"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Несгруппированные"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Удалить контакт"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Кликните, чтобы принять запрос этого контакта"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Кликните, чтобы отклонить запрос этого контакта"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Кликните, чтобы начать общение"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr "Имя"
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Вы уверены, что хотите удалить этот контакт?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Возникла ошибка при удалении "
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Вы уверены, что хотите отклонить запрос от этого контакта?"
 
@@ -1278,9 +1297,6 @@ msgstr "Вы уверены, что хотите отклонить запрос
 #~ msgid "An error occurred while connecting to the chat server: "
 #~ msgstr "При сохранение формы произошла ошибка."
 
-#~ msgid "Sorry, there was an error while trying to add "
-#~ msgstr "Возникла ошибка при добавлении "
-
 #~ msgid "Error: the \""
 #~ msgstr "Ошибка:  \""
 
@@ -1302,17 +1318,10 @@ msgstr "Вы уверены, что хотите отклонить запрос
 #~ msgid "Return"
 #~ msgstr "Назад"
 
-#~ msgid "Sorry, there was an error while trying to remove "
-#~ msgstr "Возникла ошибка при удалении "
-
 #, fuzzy
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Причина: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Зайти в чат"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Не удалось авторизоваться"
diff --git a/locale/uk/LC_MESSAGES/converse.po b/locale/uk/LC_MESSAGES/converse.po
index d844ec80f..6ee9f8e4a 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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Andriy Kopystyansky <anri@polynet.lviv.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -20,292 +20,297 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "Відміна"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Ви впевнені, що хочете видалити цей контакт?"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "Показати більше інформації про цю кімату"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Видалити повідомлення"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "Персональна вісточка"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "я"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr "друкує"
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr "припинив друкувати"
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 msgid "has gone away"
 msgstr "пішов геть"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "Показати це меню"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "Писати від третьої особи"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "Видалити повідомлення"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 msgid "has gone offline"
 msgstr "тепер поза мережею"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 msgid "is busy"
 msgstr "зайнятий"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 msgid "Clear all messages"
 msgstr "Очистити всі повідомлення"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr "Почати виклик"
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 msgid "XMPP Username:"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "Ввійти"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "Вступити"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "Клацніть тут, щоб створити власний статус"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "Клацніть, щоб змінити статус в чаті"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "Власний статус"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "на зв'язку"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "зайнятий"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "давно відсутній"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "відсутній"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "На зв'язку"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "Далеко"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 msgid "Log out"
 msgstr "Вийти"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "Клацніть, щоб додати нові контакти до чату"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "Додати контакт"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "Назва контакту"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "Пошук"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "Додати"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "Жодного користувача не знайдено"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 msgid "Click to hide these contacts"
 msgstr "Клацніть, щоб приховати ці контакти"
 
@@ -314,73 +319,73 @@ msgstr "Клацніть, щоб приховати ці контакти"
 msgid "Close this box"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 msgid "Click to restore this chat"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "Мінімізовано"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "Ця кімната вже показує недоступних учасників"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "Ця кімната не показує недоступних учасників"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Змінено конфігурацію кімнати, не повязану з приватністю"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "Журналювання кімнати тепер ввімкнено"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "Журналювання кімнати тепер вимкнено"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ця кімната тепер не-анонімна"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "Ця кімната тепер напів-анонімна"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "Ця кімната тепер повністю анонімна"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "Створено нову кімнату"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "Вам заблокували доступ до цієї кімнати"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "Вас викинули з цієї кімнати"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас видалено з кімнати у зв'язку зі змінами власності кімнати"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -388,7 +393,7 @@ msgstr ""
 "Вас видалено з цієї кімнати, оскільки вона тепер вимагає членства, а Ви ним "
 "не є її членом"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -404,460 +409,469 @@ msgstr "Вас видалено з цієї кімнати, тому що MUC (
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s заблоковано"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "Прізвисько %1$s змінено"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s було викинуто звідси"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s було видалено через зміни власності кімнати"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s було виделано через відсутність членства"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ваше прізвисько було автоматично змінене на: %1$s"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ваше прізвисько було змінене на: %1$s"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Сховати список учасників"
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цієї кімнати?"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr "Помилка: Не можу виконати команду"
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr "Призначити користувача адміністратором"
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 msgid "Ban user from room"
 msgstr "Заблокувати і викинути з кімнати"
 
-#: src/converse-muc.js:1036
+#: src/converse-muc.js:1042
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Зробити користувача учасником"
 
-#: src/converse-muc.js:1038
+#: src/converse-muc.js:1044
 msgid "Kick user from room"
 msgstr "Викинути з кімнати"
 
-#: src/converse-muc.js:1039
+#: src/converse-muc.js:1045
 msgid "Write in 3rd person"
 msgstr "Писати в 3-й особі"
 
-#: src/converse-muc.js:1040
+#: src/converse-muc.js:1046
 msgid "Grant membership to a user"
 msgstr "Надати членство користувачу"
 
-#: src/converse-muc.js:1041
+#: src/converse-muc.js:1047
 msgid "Remove user's ability to post messages"
 msgstr "Забрати можливість слати повідомлення"
 
-#: src/converse-muc.js:1042
+#: src/converse-muc.js:1048
 msgid "Change your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:1043
+#: src/converse-muc.js:1049
 msgid "Grant moderator role to user"
 msgstr "Надати права модератора"
 
-#: src/converse-muc.js:1044
+#: src/converse-muc.js:1050
 msgid "Grant ownership of this room"
 msgstr "Передати у власність цю кімнату"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr "Забрати членство в користувача"
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "Встановити тему кімнати"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr "Дозволити безголосому користувачу слати повідомлення"
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "Прізвисько"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "Пароль:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "Надіслати"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ваше прізвисько було змінене на: %1$s"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Причиною вказано: \""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
-msgstr ""
+#: src/converse-muc.js:1774
+#, fuzzy, javascript-format
+msgid "The reason given is: \"%1$s \""
+msgstr "Причиною вказано: \""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Ви не є у списку членів цієї кімнати"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Вам заблокували доступ до цієї кімнати"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Не вказане прізвисько"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Вам не дозволено створювати нові кімнати"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Ваше прізвисько не відповідає політиці кімнати"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Такої кімнати (поки) не існує"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ця кімната досягнула максимуму учасників"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема встановлена %1$s: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Цей користувач є модератором"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Цей користувач може слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 msgid "Occupants"
 msgstr "Учасники"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr "Запросіть"
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "Прихована"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "Модерована"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "Не-анонімні"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "Пароль:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "Публічна"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "Напів-анонімна"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "Немодерована"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "Ця кімната досягнула максимуму учасників"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "Цей користувач є модератором"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "Клацніть, щоб увійти в цю кімнату"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "Ця кімната вимагає пароль"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "Ця кімната не є анонімною"
+msgid "This room is restricted to members only"
+msgstr "Ця кімната досягнула максимуму учасників"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "Цей користувач є модератором"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "Ця кімната вимагає пароль"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "Ця кімната не є анонімною"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Ви запрошуєте %1$s до чату \"%2$s\". "
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "Назва кімнати"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 msgid "Join Room"
 msgstr "Приєднатися до кімнати"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "Показати кімнати"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "Кімнати"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Жодної кімнати на %1$s"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "Опис:"
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "Присутні:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "Вимагає автентикації"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "Вимагає запрошення"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "Постійна кімната"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s запрошує вас приєднатись до чату: %2$s"
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -886,19 +900,19 @@ msgstr "тепер поза мережею"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "Перевстановлюю криптований сеанс"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "Генерація приватного ключа."
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "Ваш браузер може підвиснути."
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -915,47 +929,47 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "Не можу перевірити автентичність цього користувача."
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 msgid "Exchanging private key with contact."
 msgstr "Обмін приватним ключем з контактом."
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "Ваші повідомлення більше не криптуються"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 "Ваші повідомлення вже криптуються, але особа Вашого контакту не перевірена."
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 msgid "Your contact's identify has been verified."
 msgstr "Особу Вашого контакту перевірено."
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Ваш контакт припинив криптування зі свого боку, Вам слід зробити те саме."
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "Ваше повідомлення не може бути надіслане"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "Ми отримали некриптоване повідомлення"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "Ми отримали нечитабельне криптоване повідомлення"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -977,7 +991,7 @@ msgstr ""
 "Якщо Ви підтверджуєте відповідність відбитка, клацніть Гаразд, інакше "
 "клацніть Відміна."
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -990,60 +1004,60 @@ msgstr ""
 "Потім Вашого контакта запитають те саме питання, і якщо вони введуть ту саму "
 "відповідь (враховуючи регістр), їх особи будуть перевірені."
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "Яке Ваше таємне питання?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "Яка відповідь на таємне питання?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "Надана некоректна схема автентикації"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Ваші повідомлення не криптуються. Клацніть тут, щоб увімкнути OTR-"
 "криптування."
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Ваші повідомлення криптуються, але Ваш контакт не був перевірений."
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Ваші повідомлення криптуються і Ваш контакт перевірено."
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "Ваш контакт закрив зі свого боку приватну сесію, Вам слід зробити те ж саме"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "Завершити криптовану розмову"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "Оновити криптовану розмову"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "Почати криптовану розмову"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "Перевірити за відбитками"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "Перевірити за SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "Що це?"
 
@@ -1053,47 +1067,47 @@ msgstr "Що це?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "некриптовано"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "неперевірено"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "перевірено"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "завершено"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr " напр. conversejs.org"
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr "Домен Вашого провайдера XMPP:"
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr "Отримати форму реєстрації"
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Порада: доступний перелік публічних XMPP-провайдерів"
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr "тут"
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr "Реєстрація"
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1101,11 +1115,11 @@ msgstr ""
 "Вибачте, вказаний провайдер не підтримує реєстрації онлайн. Спробуйте іншого "
 "провайдера."
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запитую форму реєстрації з XMPP сервера"
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
@@ -1114,22 +1128,22 @@ msgstr ""
 "Щось пішло не так при встановленні зв'язку з \"%1$s\". Ви впевнені, що такий "
 "існує?"
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr "Входимо"
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr "Успішно зареєстровано"
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr "Провайдер відхилив Вашу спробу реєстрації."
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1148,102 +1162,107 @@ msgstr "Увійти в кімнату"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "Ви впевнені, що хочете видалити цей контакт?"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "Цей контакт зайнятий"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "Цей контакт на зв'язку"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "Цей контакт поза мережею"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "Цей контакт недоступний"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "Цей контакт відсутній тривалий час"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "Цей контакт відсутній"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr "Групи"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "Мої контакти"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "Контакти в очікуванні"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "Запити контакту"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr "Негруповані"
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "Клацніть, щоб видалити цей контакт"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "Клацніть, щоб прийняти цей запит контакту"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "Клацніть, щоб відхилити цей запит контакту"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "Клацніть, щоб почати розмову з цим контактом"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 msgid "Are you sure you want to remove this contact?"
 msgstr "Ви впевнені, що хочете видалити цей контакт?"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "Клацніть, щоб видалити цей контакт"
+
+#: src/converse-rosterview.js:689
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Ви впевнені, що хочете відхилити цей запит контакту?"
 
@@ -1302,10 +1321,6 @@ msgstr "Ви впевнені, що хочете відхилити цей за
 #~ msgid "The reason given is: <em>\"%1$s\"</em>."
 #~ msgstr "Причиною вказано: \""
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "Клацніть, щоб увійти в цю кімнату"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "Автентикація невдала"
diff --git a/locale/zh/LC_MESSAGES/converse.po b/locale/zh/LC_MESSAGES/converse.po
index a76e57996..d2942f9c8 100644
--- a/locale/zh/LC_MESSAGES/converse.po
+++ b/locale/zh/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: 2017-08-09 17:56+0200\n"
+"POT-Creation-Date: 2017-08-23 11:55+0200\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Huxisuz Hu <huxisuz@gmail.com>\n"
 "Language-Team: Language zh\n"
@@ -19,298 +19,303 @@ msgstr ""
 "lang: zh\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:134
+#: src/converse-bookmarks.js:75 src/converse-bookmarks.js:142
 #: src/converse-roomslist.js:140
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:143
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:144
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:145
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:139 src/converse-controlbox.js:524
+#: src/converse-bookmarks.js:147 src/converse-controlbox.js:519
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-bookmarks.js:140 src/converse-register.js:251
+#: src/converse-bookmarks.js:148 src/converse-register.js:253
 msgid "Cancel"
 msgstr "取消"
 
-#: src/converse-bookmarks.js:210
+#: src/converse-bookmarks.js:226
 #, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "确定移除联系人吗？"
 
-#: src/converse-bookmarks.js:319
+#: src/converse-bookmarks.js:335
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:421
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "打开聊天室"
 
-#: src/converse-bookmarks.js:406
+#: src/converse-bookmarks.js:422
 msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:443 src/converse-roomslist.js:138
+#: src/converse-bookmarks.js:459 src/converse-roomslist.js:138
 #, fuzzy
 msgid "Leave this room"
 msgstr "打开聊天室"
 
-#: src/converse-bookmarks.js:444
+#: src/converse-bookmarks.js:460
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-bookmarks.js:445 src/converse-roomslist.js:139
+#: src/converse-bookmarks.js:461 src/converse-roomslist.js:139
 #, fuzzy
 msgid "Unbookmark this room"
 msgstr "打开聊天室"
 
-#: src/converse-bookmarks.js:446 src/converse-muc.js:2500
+#: src/converse-bookmarks.js:462 src/converse-muc.js:2506
 #: src/converse-roomslist.js:141
 msgid "Show more information on this room"
 msgstr "显示次聊天室的更多信息"
 
-#: src/converse-bookmarks.js:449 src/converse-muc.js:2499
+#: src/converse-bookmarks.js:465 src/converse-muc.js:2505
 #: src/converse-roomslist.js:143
 msgid "Click to open this room"
 msgstr "打开聊天室"
 
-#: src/converse-chatview.js:262 src/converse-headline.js:77
-#: src/converse-muc.js:500
+#: src/converse-chatview.js:264 src/converse-headline.js:77
+#: src/converse-muc.js:505
 #, fuzzy
 msgid "You have unread messages"
 msgstr "移除消息"
 
-#: src/converse-chatview.js:263
+#: src/converse-chatview.js:265
 #, fuzzy
 msgid "Close this chat box"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-chatview.js:264
+#: src/converse-chatview.js:266
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:265 src/converse-muc.js:497
+#: src/converse-chatview.js:267 src/converse-muc.js:502
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:484
+#: src/converse-chatview.js:486
 msgid "me"
 msgstr "我"
 
-#: src/converse-chatview.js:491
+#: src/converse-chatview.js:493
 msgid ""
 "A very large message has been received.This might be due to an attack meant "
 "to degrade the chat performance.Output has been shortened."
 msgstr ""
 
-#: src/converse-chatview.js:533
+#: src/converse-chatview.js:535
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:535
+#: src/converse-chatview.js:537
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:540
+#: src/converse-chatview.js:542
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:542
+#: src/converse-chatview.js:544
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:547 src/converse-chatview.js:809
+#: src/converse-chatview.js:549 src/converse-chatview.js:811
 #: src/converse-notification.js:182
 #, fuzzy
 msgid "has gone away"
 msgstr "对方离开"
 
-#: src/converse-chatview.js:658 src/converse-muc.js:1037
+#: src/converse-chatview.js:660 src/converse-muc.js:1043
 msgid "Show this menu"
 msgstr "显示此项菜单"
 
-#: src/converse-chatview.js:659
+#: src/converse-chatview.js:661
 msgid "Write in the third person"
 msgstr "以第三者身份写"
 
-#: src/converse-chatview.js:660 src/converse-muc.js:1035
+#: src/converse-chatview.js:662 src/converse-muc.js:1041
 msgid "Remove messages"
 msgstr "移除消息"
 
-#: src/converse-chatview.js:747
+#: src/converse-chatview.js:749
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "你确定清除此次的聊天记录吗？"
 
-#: src/converse-chatview.js:807 src/converse-notification.js:180
+#: src/converse-chatview.js:809 src/converse-notification.js:180
 #, fuzzy
 msgid "has gone offline"
 msgstr "对方已下线"
 
-#: src/converse-chatview.js:811 src/converse-notification.js:184
+#: src/converse-chatview.js:813 src/converse-notification.js:184
 #, fuzzy
 msgid "is busy"
 msgstr "忙碌"
 
-#: src/converse-chatview.js:854
+#: src/converse-chatview.js:856
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:855
+#: src/converse-chatview.js:857
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:856
+#: src/converse-chatview.js:858
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:197 src/converse-core.js:764
-#: src/converse-rosterview.js:87
+#: src/converse-controlbox.js:186 src/converse-core.js:751
+#: src/converse-rosterview.js:89
 msgid "Contacts"
 msgstr "联系人"
 
-#: src/converse-controlbox.js:392
+#: src/converse-controlbox.js:387
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:393
+#: src/converse-controlbox.js:388
 msgid "Password:"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:394
+#: src/converse-controlbox.js:389
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-controlbox.js:395
+#: src/converse-controlbox.js:390
 msgid "Log In"
 msgstr "登录"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:396
+#: src/converse-controlbox.js:391
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:397
+#: src/converse-controlbox.js:392
 #, fuzzy
 msgid "password"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:404
+#: src/converse-controlbox.js:399
 msgid "Sign in"
 msgstr "登录"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:492 src/converse-controlbox.js:570
+#: src/converse-controlbox.js:487 src/converse-controlbox.js:565
 #, javascript-format
 msgid "I am %1$s"
 msgstr "我现在%1$s"
 
-#: src/converse-controlbox.js:494 src/converse-controlbox.js:575
+#: src/converse-controlbox.js:489 src/converse-controlbox.js:570
 msgid "Click here to write a custom status message"
 msgstr "点击这里，填写状态信息"
 
-#: src/converse-controlbox.js:495 src/converse-controlbox.js:576
+#: src/converse-controlbox.js:490 src/converse-controlbox.js:571
 msgid "Click to change your chat status"
 msgstr "点击这里改变聊天状态"
 
-#: src/converse-controlbox.js:523
+#: src/converse-controlbox.js:518
 msgid "Custom status"
 msgstr "DIY状态"
 
-#: src/converse-controlbox.js:552 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:547 src/converse-controlbox.js:557
 msgid "online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:554
+#: src/converse-controlbox.js:549
 msgid "busy"
 msgstr "忙碌"
 
-#: src/converse-controlbox.js:556
+#: src/converse-controlbox.js:551
 msgid "away for long"
 msgstr "长时间离开"
 
-#: src/converse-controlbox.js:558
+#: src/converse-controlbox.js:553
 msgid "away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:560
+#: src/converse-controlbox.js:555
 #, fuzzy
 msgid "offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:604 src/converse-rosterview.js:156
+#: src/converse-controlbox.js:599 src/converse-rosterview.js:158
 msgid "Online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:605 src/converse-rosterview.js:158
+#: src/converse-controlbox.js:600 src/converse-rosterview.js:160
 msgid "Busy"
 msgstr "忙碌中"
 
-#: src/converse-controlbox.js:606 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:601 src/converse-rosterview.js:161
 msgid "Away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:607 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:602 src/converse-rosterview.js:163
 msgid "Offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:603
 #, fuzzy
 msgid "Log out"
 msgstr "登录"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:609
 msgid "Click to add new chat contacts"
 msgstr "点击添加新联系人"
 
-#: src/converse-controlbox.js:615
+#: src/converse-controlbox.js:610
 msgid "Add a contact"
 msgstr "添加联系人"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:642
 msgid "Contact name"
 msgstr "联系人名称"
 
-#: src/converse-controlbox.js:648
+#: src/converse-controlbox.js:643
 msgid "Search"
 msgstr "搜索"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:648
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:654
+#: src/converse-controlbox.js:649
 msgid "Add"
 msgstr "添加"
 
-#: src/converse-controlbox.js:678
+#: src/converse-controlbox.js:673
 msgid "No users found"
 msgstr "未找到用户"
 
-#: src/converse-core.js:1305
+#: src/converse-core.js:1147
+#, javascript-format
+msgid "Sorry, there was an error while trying to add %1$s as a contact."
+msgstr ""
+
+#: src/converse-core.js:1291
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1379
+#: src/converse-core.js:1365
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "点击移除联系人"
@@ -320,80 +325,80 @@ msgstr "点击移除联系人"
 msgid "Close this box"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-minimize.js:190 src/converse-minimize.js:499
+#: src/converse-minimize.js:181 src/converse-minimize.js:504
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:330
+#: src/converse-minimize.js:325
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-minimize.js:483
+#: src/converse-minimize.js:478
 msgid "Minimized"
 msgstr "最小化的"
 
-#: src/converse-muc.js:275
+#: src/converse-muc.js:280
 msgid "This room is not anonymous"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:276
+#: src/converse-muc.js:281
 msgid "This room now shows unavailable members"
 msgstr "此聊天室显示不可用用户"
 
-#: src/converse-muc.js:277
+#: src/converse-muc.js:282
 msgid "This room does not show unavailable members"
 msgstr "此聊天室不显示不可用用户"
 
-#: src/converse-muc.js:278
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "此聊天室设置(非私密性)已改变"
 
-#: src/converse-muc.js:279
+#: src/converse-muc.js:284
 msgid "Room logging is now enabled"
 msgstr "聊天室聊天记录已启用"
 
-#: src/converse-muc.js:280
+#: src/converse-muc.js:285
 msgid "Room logging is now disabled"
 msgstr "聊天室聊天记录已禁用"
 
-#: src/converse-muc.js:281
+#: src/converse-muc.js:286
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "此聊天室非匿名"
 
-#: src/converse-muc.js:282
+#: src/converse-muc.js:287
 msgid "This room is now semi-anonymous"
 msgstr "此聊天室半匿名"
 
-#: src/converse-muc.js:283
+#: src/converse-muc.js:288
 msgid "This room is now fully-anonymous"
 msgstr "此聊天室完全匿名"
 
-#: src/converse-muc.js:284
+#: src/converse-muc.js:289
 msgid "A new room has been created"
 msgstr "新聊天室已创建"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:293
 msgid "You have been banned from this room"
 msgstr "您已被此聊天室禁止入内"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:294
 msgid "You have been kicked from this room"
 msgstr "您已被踢出次房间"
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:295
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "由于关系变化，您已被移除此房间"
 
-#: src/converse-muc.js:291
+#: src/converse-muc.js:296
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
 msgstr "您已被移除此房间因为此房间更改为只允许成员加入，而您非成员"
 
-#: src/converse-muc.js:292
+#: src/converse-muc.js:297
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -409,463 +414,472 @@ msgstr "由于服务不可用，您已被移除此房间。"
 #. * can then at least tell gettext to scan for it so that these
 #. * strings are picked up by the translation machinery.
 #.
-#: src/converse-muc.js:306
+#: src/converse-muc.js:311
 #, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s 已被禁止"
 
-#: src/converse-muc.js:307
+#: src/converse-muc.js:312
 #, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s 已被禁止"
 
-#: src/converse-muc.js:308
+#: src/converse-muc.js:313
 #, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s 已被踢出"
 
-#: src/converse-muc.js:309
+#: src/converse-muc.js:314
 #, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "由于关系解除、%1$s 已被移除"
 
-#: src/converse-muc.js:310
+#: src/converse-muc.js:315
 #, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "由于不是成员、%1$s 已被移除"
 
-#: src/converse-muc.js:314
+#: src/converse-muc.js:319
 #, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:315
+#: src/converse-muc.js:320
 #, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:496
+#: src/converse-muc.js:501
 msgid "Message"
 msgstr "信息"
 
-#: src/converse-muc.js:542
+#: src/converse-muc.js:547
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:543
+#: src/converse-muc.js:548
 #, fuzzy
 msgid "Configure this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:587
+#: src/converse-muc.js:592
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:971
-msgid "${command}"
+#: src/converse-muc.js:976
+#, javascript-format
+msgid ""
+"Error: the \"%1$s\" command takes two arguments, the user's nickname and "
+"optionally a reason."
 msgstr ""
 
-#: src/converse-muc.js:983
+#: src/converse-muc.js:989
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:991
+#: src/converse-muc.js:997
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:1033
+#: src/converse-muc.js:1039
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:1034
+#: src/converse-muc.js:1040
 #, fuzzy
 msgid "Ban user from room"
 msgstr "阻止此用户进入房间"
 
-#: src/converse-muc.js:1036
-msgid "Change user role to occupant"
-msgstr ""
-
-#: src/converse-muc.js:1038
-#, fuzzy
-msgid "Kick user from room"
-msgstr "把用户踢出房间"
-
-#: src/converse-muc.js:1039
-#, fuzzy
-msgid "Write in 3rd person"
-msgstr "以第三者身份写"
-
-#: src/converse-muc.js:1040
-msgid "Grant membership to a user"
-msgstr ""
-
-#: src/converse-muc.js:1041
-msgid "Remove user's ability to post messages"
-msgstr ""
-
 #: src/converse-muc.js:1042
-msgid "Change your nickname"
-msgstr ""
-
-#: src/converse-muc.js:1043
-msgid "Grant moderator role to user"
+msgid "Change user role to occupant"
 msgstr ""
 
 #: src/converse-muc.js:1044
 #, fuzzy
+msgid "Kick user from room"
+msgstr "把用户踢出房间"
+
+#: src/converse-muc.js:1045
+#, fuzzy
+msgid "Write in 3rd person"
+msgstr "以第三者身份写"
+
+#: src/converse-muc.js:1046
+msgid "Grant membership to a user"
+msgstr ""
+
+#: src/converse-muc.js:1047
+msgid "Remove user's ability to post messages"
+msgstr ""
+
+#: src/converse-muc.js:1048
+msgid "Change your nickname"
+msgstr ""
+
+#: src/converse-muc.js:1049
+msgid "Grant moderator role to user"
+msgstr ""
+
+#: src/converse-muc.js:1050
+#, fuzzy
 msgid "Grant ownership of this room"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:1045
+#: src/converse-muc.js:1051
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:1046
+#: src/converse-muc.js:1052
 #, fuzzy
 msgid "Set room subject"
 msgstr "设置房间主题"
 
-#: src/converse-muc.js:1047
+#: src/converse-muc.js:1053
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:1048
+#: src/converse-muc.js:1054
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1603
+#: src/converse-muc.js:1609
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1620
+#: src/converse-muc.js:1626
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1621 src/converse-muc.js:2426
+#: src/converse-muc.js:1627 src/converse-muc.js:2432
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/converse-muc.js:1622
+#: src/converse-muc.js:1628
 #, fuzzy
 msgid "Enter room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1641
+#: src/converse-muc.js:1647
 msgid "This chatroom requires a password"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:1642
+#: src/converse-muc.js:1648
 msgid "Password: "
 msgstr "密码:"
 
-#: src/converse-muc.js:1643
+#: src/converse-muc.js:1649
 msgid "Submit"
 msgstr "发送"
 
-#: src/converse-muc.js:1756
+#: src/converse-muc.js:1762
 #, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:1759
+#: src/converse-muc.js:1765
 #, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1768
-msgid "${notification.reason}"
+#: src/converse-muc.js:1774
+#, javascript-format
+msgid "The reason given is: \"%1$s \""
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1792
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1788
+#: src/converse-muc.js:1794
 #, fuzzy
 msgid " has left the room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1802
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1804
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1833
+#: src/converse-muc.js:1839
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:1835
+#: src/converse-muc.js:1841
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "您已被此聊天室禁止入内"
 
-#: src/converse-muc.js:1839
+#: src/converse-muc.js:1845
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "未指定昵称"
 
-#: src/converse-muc.js:1843
+#: src/converse-muc.js:1849
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "您可此创建新房间了"
 
-#: src/converse-muc.js:1845
+#: src/converse-muc.js:1851
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "您的昵称不符合此房间标准"
 
-#: src/converse-muc.js:1849
+#: src/converse-muc.js:1855
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "此房间不存在"
 
-#: src/converse-muc.js:1851
+#: src/converse-muc.js:1857
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "此房间人数已达上线"
 
-#: src/converse-muc.js:1966
+#: src/converse-muc.js:1972
 #, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s 设置话题为: %2$s"
 
-#: src/converse-muc.js:2076
+#: src/converse-muc.js:2081
+#, fuzzy, javascript-format
+msgid "Click to mention %1$s in your message."
+msgstr "打开聊天室"
+
+#: src/converse-muc.js:2082
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "此用户是主持人"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2083
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "此用户在这房间里可发消息"
 
-#: src/converse-muc.js:2078
+#: src/converse-muc.js:2084
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "此用户不可在此房间发消息"
 
-#: src/converse-muc.js:2131
+#: src/converse-muc.js:2137
 #, fuzzy
 msgid "Occupants"
 msgstr "成员:"
 
-#: src/converse-muc.js:2149 src/converse-muc.js:2353
+#: src/converse-muc.js:2155 src/converse-muc.js:2359
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2170
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "Features"
 msgstr "特性:"
 
-#: src/converse-muc.js:2171 src/converse-muc.js:2574
+#: src/converse-muc.js:2177 src/converse-muc.js:2580
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: src/converse-muc.js:2172
+#: src/converse-muc.js:2178
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2173
+#: src/converse-muc.js:2179
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2174 src/converse-muc.js:2576
+#: src/converse-muc.js:2180 src/converse-muc.js:2582
 msgid "Moderated"
 msgstr "发言受限"
 
-#: src/converse-muc.js:2175 src/converse-muc.js:2577
+#: src/converse-muc.js:2181 src/converse-muc.js:2583
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:2176
+#: src/converse-muc.js:2182
 #, fuzzy
 msgid "Open"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:2177
+#: src/converse-muc.js:2183
 #, fuzzy
 msgid "Password protected"
 msgstr "密码:"
 
-#: src/converse-muc.js:2178
+#: src/converse-muc.js:2184
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2179 src/converse-muc.js:2580
+#: src/converse-muc.js:2185 src/converse-muc.js:2586
 msgid "Public"
 msgstr "公开的"
 
-#: src/converse-muc.js:2180 src/converse-muc.js:2581
+#: src/converse-muc.js:2186 src/converse-muc.js:2587
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:2181
+#: src/converse-muc.js:2187
 #, fuzzy
 msgid "Temporary"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:2182 src/converse-muc.js:2583
+#: src/converse-muc.js:2188 src/converse-muc.js:2589
 msgid "Unmoderated"
 msgstr "无发言限制"
 
-#: src/converse-muc.js:2183
+#: src/converse-muc.js:2189
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2184
+#: src/converse-muc.js:2190
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:2185
-msgid "Messages are archived on the server"
-msgstr ""
-
-#: src/converse-muc.js:2186
-#, fuzzy
-msgid "This room is restricted to members only"
-msgstr "此房间人数已达上线"
-
-#: src/converse-muc.js:2187
-#, fuzzy
-msgid "This room is being moderated"
-msgstr "此用户是主持人"
-
-#: src/converse-muc.js:2188
-msgid "All other room occupants can see your XMPP username"
-msgstr ""
-
-#: src/converse-muc.js:2189
-#, fuzzy
-msgid "Anyone can join this room"
-msgstr "打开聊天室"
-
-#: src/converse-muc.js:2190
-#, fuzzy
-msgid "This room requires a password before entry"
-msgstr "此聊天室需要密码"
-
 #: src/converse-muc.js:2191
-msgid "This room persists even if it's unoccupied"
+msgid "Messages are archived on the server"
 msgstr ""
 
 #: src/converse-muc.js:2192
 #, fuzzy
-msgid "This room is publicly searchable"
-msgstr "此为非匿名聊天室"
+msgid "This room is restricted to members only"
+msgstr "此房间人数已达上线"
 
 #: src/converse-muc.js:2193
-msgid "Only moderators can see your XMPP username"
-msgstr ""
+#, fuzzy
+msgid "This room is being moderated"
+msgstr "此用户是主持人"
 
 #: src/converse-muc.js:2194
-msgid "This room will disappear once the last person leaves"
+msgid "All other room occupants can see your XMPP username"
 msgstr ""
 
 #: src/converse-muc.js:2195
 #, fuzzy
+msgid "Anyone can join this room"
+msgstr "打开聊天室"
+
+#: src/converse-muc.js:2196
+#, fuzzy
+msgid "This room requires a password before entry"
+msgstr "此聊天室需要密码"
+
+#: src/converse-muc.js:2197
+msgid "This room persists even if it's unoccupied"
+msgstr ""
+
+#: src/converse-muc.js:2198
+#, fuzzy
+msgid "This room is publicly searchable"
+msgstr "此为非匿名聊天室"
+
+#: src/converse-muc.js:2199
+msgid "Only moderators can see your XMPP username"
+msgstr ""
+
+#: src/converse-muc.js:2200
+msgid "This room will disappear once the last person leaves"
+msgstr ""
+
+#: src/converse-muc.js:2201
+#, fuzzy
 msgid "This room is not being moderated"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:2196
+#: src/converse-muc.js:2202
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:2332
+#: src/converse-muc.js:2338
 #, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2333
+#: src/converse-muc.js:2339
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2352
+#: src/converse-muc.js:2358
 msgid "Please enter a valid XMPP username"
 msgstr ""
 
-#: src/converse-muc.js:2425
+#: src/converse-muc.js:2431
 msgid "Room name"
 msgstr "聊天室名称"
 
-#: src/converse-muc.js:2427
+#: src/converse-muc.js:2433
 msgid "Server"
 msgstr "服务器"
 
-#: src/converse-muc.js:2428
+#: src/converse-muc.js:2434
 #, fuzzy
 msgid "Join Room"
 msgstr "加入"
 
-#: src/converse-muc.js:2429
+#: src/converse-muc.js:2435
 msgid "Show rooms"
 msgstr "显示所有聊天室"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2452
 msgid "Rooms"
 msgstr "聊天室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2475
+#: src/converse-muc.js:2481
 #, javascript-format
 msgid "No rooms on %1$s"
 msgstr "%1$s 上没有聊天室"
 
-#: src/converse-muc.js:2569
+#: src/converse-muc.js:2575
 msgid "Description:"
 msgstr "描述: "
 
-#: src/converse-muc.js:2570
+#: src/converse-muc.js:2576
 msgid "Room Address (JID):"
 msgstr ""
 
-#: src/converse-muc.js:2571
+#: src/converse-muc.js:2577
 msgid "Occupants:"
 msgstr "成员:"
 
-#: src/converse-muc.js:2572
+#: src/converse-muc.js:2578
 msgid "Features:"
 msgstr "特性:"
 
-#: src/converse-muc.js:2573
+#: src/converse-muc.js:2579
 msgid "Requires authentication"
 msgstr "需要验证"
 
-#: src/converse-muc.js:2575
+#: src/converse-muc.js:2581
 msgid "Requires an invitation"
 msgstr "需要被邀请"
 
-#: src/converse-muc.js:2578
+#: src/converse-muc.js:2584
 msgid "Open room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:2579
+#: src/converse-muc.js:2585
 msgid "Permanent room"
 msgstr "永久聊天室"
 
-#: src/converse-muc.js:2582
+#: src/converse-muc.js:2588
 msgid "Temporary room"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:2674
+#: src/converse-muc.js:2680
 #, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2679
+#: src/converse-muc.js:2684
 #, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
@@ -893,19 +907,19 @@ msgstr "对方已下线"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:121
+#: src/converse-otr.js:122
 msgid "Re-establishing encrypted session"
 msgstr "重新建立加密会话"
 
-#: src/converse-otr.js:132
+#: src/converse-otr.js:133
 msgid "Generating private key."
 msgstr "正在生成私钥"
 
-#: src/converse-otr.js:133
+#: src/converse-otr.js:134
 msgid "Your browser might become unresponsive."
 msgstr "您的浏览器可能会暂时无响应"
 
-#: src/converse-otr.js:171
+#: src/converse-otr.js:172
 #, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
@@ -921,49 +935,49 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:180
+#: src/converse-otr.js:181
 msgid "Could not verify this user's identify."
 msgstr "无法验证对方信息。"
 
-#: src/converse-otr.js:222
+#: src/converse-otr.js:223
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "正在与对方交换私钥"
 
-#: src/converse-otr.js:311
+#: src/converse-otr.js:312
 msgid "Your messages are not encrypted anymore"
 msgstr "您的消息将不再被加密"
 
-#: src/converse-otr.js:313
+#: src/converse-otr.js:314
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr "您的消息现已加密，但是对方身份尚未验证"
 
-#: src/converse-otr.js:315
+#: src/converse-otr.js:316
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "对方的身份已通过验证。"
 
-#: src/converse-otr.js:317
+#: src/converse-otr.js:318
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "对方已结束加密，您也需要做同样的操作。"
 
-#: src/converse-otr.js:327
+#: src/converse-otr.js:328
 msgid "Your message could not be sent"
 msgstr "您的消息无法送出"
 
-#: src/converse-otr.js:330
+#: src/converse-otr.js:331
 msgid "We received an unencrypted message"
 msgstr "我们收到了一条未加密的信息"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:334
 msgid "We received an unreadable encrypted message"
 msgstr "我们收到一条无法读取的信息"
 
-#: src/converse-otr.js:360
+#: src/converse-otr.js:361
 #, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
@@ -984,7 +998,7 @@ msgstr ""
 "\n"
 "如果确认符合，请点击OK，否则点击取消"
 
-#: src/converse-otr.js:373
+#: src/converse-otr.js:374
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -997,60 +1011,60 @@ msgstr ""
 "\n"
 "对方需要回答相同的问题（区分大小写）,如果答案一致，身份将被验证。"
 
-#: src/converse-otr.js:374
+#: src/converse-otr.js:375
 msgid "What is your security question?"
 msgstr "您的安全问题是?"
 
-#: src/converse-otr.js:376
+#: src/converse-otr.js:377
 msgid "What is the answer to the security question?"
 msgstr "此安全问题的答案是?"
 
-#: src/converse-otr.js:380
+#: src/converse-otr.js:381
 msgid "Invalid authentication scheme provided"
 msgstr "非法的认证方式"
 
-#: src/converse-otr.js:404
+#: src/converse-otr.js:405
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr "您的消息未加密。点击这里来启用OTR加密"
 
-#: src/converse-otr.js:406
+#: src/converse-otr.js:407
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "您的消息已加密，但对方未通过验证"
 
-#: src/converse-otr.js:408
+#: src/converse-otr.js:409
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "您的消息已加密，对方已验证。"
 
-#: src/converse-otr.js:410
+#: src/converse-otr.js:411
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "对方已关闭私有会话，您也应该关闭"
 
-#: src/converse-otr.js:428
+#: src/converse-otr.js:429
 msgid "End encrypted conversation"
 msgstr "结束加密的会话"
 
-#: src/converse-otr.js:429
+#: src/converse-otr.js:430
 msgid "Refresh encrypted conversation"
 msgstr "刷新加密的会话"
 
-#: src/converse-otr.js:430
+#: src/converse-otr.js:431
 msgid "Start encrypted conversation"
 msgstr "开始加密的会话"
 
-#: src/converse-otr.js:431
+#: src/converse-otr.js:432
 msgid "Verify with fingerprints"
 msgstr "验证指纹"
 
-#: src/converse-otr.js:432
+#: src/converse-otr.js:433
 msgid "Verify with SMP"
 msgstr "验证SMP"
 
-#: src/converse-otr.js:433
+#: src/converse-otr.js:434
 msgid "What's this?"
 msgstr "这是什么?"
 
@@ -1060,78 +1074,78 @@ msgstr "这是什么?"
 #. has been initialized and with it the i18n machinery. That's why
 #. we do it here in the "initialize" method and not at the top of
 #. the module.
-#: src/converse-otr.js:467
+#: src/converse-otr.js:468
 msgid "unencrypted"
 msgstr "未加密"
 
-#: src/converse-otr.js:468
+#: src/converse-otr.js:469
 msgid "unverified"
 msgstr "未验证"
 
-#: src/converse-otr.js:469
+#: src/converse-otr.js:470
 msgid "verified"
 msgstr "已验证"
 
-#: src/converse-otr.js:470
+#: src/converse-otr.js:471
 msgid "finished"
 msgstr "结束了"
 
-#: src/converse-register.js:113
+#: src/converse-register.js:115
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:137
+#: src/converse-register.js:139
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:138
+#: src/converse-register.js:140
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:139
+#: src/converse-register.js:141
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:140
+#: src/converse-register.js:142
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:145
+#: src/converse-register.js:147
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:190
+#: src/converse-register.js:192
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:274
+#: src/converse-register.js:276
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:310
+#: src/converse-register.js:312
 #, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:329
+#: src/converse-register.js:331
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:332
+#: src/converse-register.js:334
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:429
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
 msgstr ""
 
-#: src/converse-register.js:446
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
@@ -1150,103 +1164,108 @@ msgstr "打开聊天室"
 msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr "确定移除联系人吗？"
 
-#: src/converse-rosterview.js:80
+#: src/converse-rosterview.js:82
 msgid "This contact is busy"
 msgstr "对方忙碌中"
 
-#: src/converse-rosterview.js:81
+#: src/converse-rosterview.js:83
 msgid "This contact is online"
 msgstr "对方在线中"
 
-#: src/converse-rosterview.js:82
+#: src/converse-rosterview.js:84
 msgid "This contact is offline"
 msgstr "对方已下线"
 
-#: src/converse-rosterview.js:83
+#: src/converse-rosterview.js:85
 msgid "This contact is unavailable"
 msgstr "对方免打扰"
 
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:86
 msgid "This contact is away for an extended period"
 msgstr "对方暂时离开"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:87
 msgid "This contact is away"
 msgstr "对方离开"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:90
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:91
 msgid "My contacts"
 msgstr "我的好友列表"
 
-#: src/converse-rosterview.js:90
+#: src/converse-rosterview.js:92
 msgid "Pending contacts"
 msgstr "保留中的联系人"
 
-#: src/converse-rosterview.js:91
+#: src/converse-rosterview.js:93
 msgid "Contact requests"
 msgstr "来自好友的请求"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:94
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:150
+#: src/converse-rosterview.js:152
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:153
+#: src/converse-rosterview.js:155
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:156
 msgid "Any"
 msgstr ""
 
-#: src/converse-rosterview.js:155
+#: src/converse-rosterview.js:157
 msgid "Unread"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:159
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:160
+#: src/converse-rosterview.js:162
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:573 src/converse-rosterview.js:601
+#: src/converse-rosterview.js:575 src/converse-rosterview.js:603
 #, fuzzy, javascript-format
 msgid "Click to remove %1$s as a contact"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:581
+#: src/converse-rosterview.js:583
 #, fuzzy, javascript-format
 msgid "Click to accept the contact request from %1$s"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:582
+#: src/converse-rosterview.js:584
 #, fuzzy, javascript-format
 msgid "Click to decline the contact request from %1$s"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:600
+#: src/converse-rosterview.js:602
 msgid "Click to chat with this contact"
 msgstr "点击与对方交谈"
 
-#: src/converse-rosterview.js:602
+#: src/converse-rosterview.js:604
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:657
+#: src/converse-rosterview.js:659
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "确定移除联系人吗？"
 
-#: src/converse-rosterview.js:687
+#: src/converse-rosterview.js:670
+#, fuzzy, javascript-format
+msgid "Sorry, there was an error while trying to remove %1$s as a contact."
+msgstr "点击移除联系人"
+
+#: src/converse-rosterview.js:689
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "确定移除联系人吗？"
@@ -1297,10 +1316,6 @@ msgstr "确定移除联系人吗？"
 #~ msgid "Server:"
 #~ msgstr "服务器"
 
-#, fuzzy
-#~ msgid "Click to mention this user in your message."
-#~ msgstr "打开聊天室"
-
 #, fuzzy
 #~ msgid "Authentication failed."
 #~ msgstr "验证失败"
diff --git a/src/converse-core.js b/src/converse-core.js
index 74310c436..097c3a71a 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -534,7 +534,7 @@
             } else if (status === Strophe.Status.CONNFAIL) {
                 _converse.giveFeedback(
                     __('Connection failed'), 'error',
-                    __(`An error occurred while connecting to the chat server: ${condition}`)
+                    __('An error occurred while connecting to the chat server: '+condition)
                 );
                 _converse.setDisconnectionCause(status, condition);
             } else if (status === Strophe.Status.DISCONNECTING) {
@@ -1144,7 +1144,7 @@
                             resolve(contact);
                         },
                         function (err) {
-                            alert(__(`Sorry, there was an error while trying to add ${name} as a contact.`));
+                            alert(__('Sorry, there was an error while trying to add %1$s as a contact.', name));
                             _converse.log(err, Strophe.LogLevel.ERROR);
                             resolve(err);
                         }
diff --git a/src/converse-muc.js b/src/converse-muc.js
index 3118f0639..70810121a 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -973,7 +973,8 @@
                     // TODO check if first argument is valid
                     if (args.length < 1 || args.length > 2) {
                         this.showStatusNotification(
-                            __(`Error: the "${command}" command takes two arguments, the user's nickname and optionally a reason.`),
+                            __('Error: the "%1$s" command takes two arguments, the user\'s nickname and optionally a reason.',
+                                command),
                             true
                         );
                         return false;
@@ -1758,10 +1759,10 @@
                     if (notification.disconnected) {
                         this.showDisconnectMessage(notification.disconnection_message);
                         if (notification.actor) {
-                            this.showDisconnectMessage(__(___('This action was done by %1$s.'), notification.actor));
+                            this.showDisconnectMessage(__('This action was done by %1$s.', notification.actor));
                         }
                         if (notification.reason) {
-                            this.showDisconnectMessage(__(___('The reason given is: "%1$s".'), notification.reason));
+                            this.showDisconnectMessage(__('The reason given is: "%1$s".', notification.reason));
                         }
                         this.model.save('connection_status', converse.ROOMSTATUS.DISCONNECTED);
                         return;
@@ -1770,7 +1771,7 @@
                         this.$content.append(tpl_info({'message': message}));
                     });
                     if (notification.reason) {
-                        this.showStatusNotification(__(`The reason given is: "${notification.reason}"`), true);
+                        this.showStatusNotification(__('The reason given is: "%1$s "', notification.reason), true);
                     }
                     if (notification.messages.length) {
                         this.scrollDown();
@@ -2077,7 +2078,7 @@
                             { 'jid': '',
                               'show': show,
                               'hint_show': _converse.PRETTY_CHAT_STATUS[show],
-                              'hint_occupant': __(`Click to mention ${this.model.get('nick')} in your message.`),
+                              'hint_occupant': __('Click to mention %1$s in your message.', this.model.get('nick')),
                               'desc_moderator': __('This user is a moderator.'),
                               'desc_occupant': __('This user can send messages in this room.'),
                               'desc_visitor': __('This user can NOT send messages in this room.')
@@ -2334,7 +2335,7 @@
 
                 promptForInvite (suggestion) {
                     const reason = prompt(
-                        __(___('You are about to invite %1$s to the chat room "%2$s". '), suggestion.text.label, this.model.get('id')) +
+                        __('You are about to invite %1$s to the chat room "%2$s". ', suggestion.text.label, this.model.get('id')) +
                         __("You may optionally include a message, explaining the reason for the invitation.")
                     );
                     if (reason !== null) {
@@ -2477,7 +2478,7 @@
                 informNoRoomsFound () {
                     const $available_chatrooms = this.$el.find('#available-chatrooms');
                     // For translators: %1$s is a variable and will be replaced with the XMPP server name
-                    $available_chatrooms.html(`<dt>${__('No rooms on %1$s',this.model.get('muc_domain'))}</dt>`);
+                    $available_chatrooms.html(`<dt>${__('No rooms on %1$s', this.model.get('muc_domain'))}</dt>`);
                     $('input#show-rooms').show().siblings('span.spinner').remove();
                 },
 
@@ -2676,12 +2677,11 @@
                     contact = contact? contact.get('fullname'): Strophe.getNodeFromJid(from);
                     if (!reason) {
                         result = confirm(
-                            __(___("%1$s has invited you to join a chat room: %2$s"),
-                                contact, room_jid)
+                            __("%1$s has invited you to join a chat room: %2$s", contact, room_jid)
                         );
                     } else {
                         result = confirm(
-                            __(___('%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"'),
+                            __('%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"',
                                 contact, room_jid, reason)
                         );
                     }
diff --git a/src/converse-rosterview.js b/src/converse-rosterview.js
index db3f554b2..56bce02c2 100644
--- a/src/converse-rosterview.js
+++ b/src/converse-rosterview.js
@@ -667,7 +667,7 @@
                                 this.remove();
                             },
                             function (err) {
-                                alert(__(`Sorry, there was an error while trying to remove ${name} as a contact.`));
+                                alert(__('Sorry, there was an error while trying to remove %1$s as a contact.', name));
                                 _converse.log(err, Strophe.LogLevel.ERROR);
                             }
                         );
diff --git a/src/utils.js b/src/utils.js
index ee22c6088..08107c56e 100755
--- a/src/utils.js
+++ b/src/utils.js
@@ -88,6 +88,25 @@
         }
     }
 
+    function calculateElementHeight (el) {
+        /* Return the height of the passed in DOM element,
+         * based on the heights of its children.
+         */
+        return _.reduce(
+            el.children,
+            (result, child) => result + child.offsetHeight, 0
+        );
+    }
+
+    function slideOutWrapup (el) {
+        /* Wrapup function for slideOut. */
+        el.removeAttribute('data-slider-marker');
+        el.classList.remove('collapsed');
+        el.style.overflow = "";
+        el.style.height = "";
+    }
+
+
     var u = {};
 
     // Translation machinery
@@ -186,22 +205,12 @@
     };
 
     u.slideOut = function (el, duration=900) {
-        /* Shows/expands an element by sliding it out of itself. */
-
-        function calculateEndHeight (el) {
-            return _.reduce(
-                el.children,
-                (result, child) => result + child.offsetHeight, 0
-            );
-        }
-
-        function wrapup (el) {
-            el.removeAttribute('data-slider-marker');
-            el.classList.remove('collapsed');
-            el.style.overflow = "";
-            el.style.height = "";
-        }
-
+        /* Shows/expands an element by sliding it out of itself
+         *
+         * Parameters:
+         *      (HTMLElement) el - The HTML string
+         *      (Number) duration - The duration amount in milliseconds
+         */
         return new Promise((resolve, reject) => {
             if (_.isNil(el)) {
                 const err = "Undefined or null element passed into slideOut"
@@ -214,10 +223,10 @@
                 el.removeAttribute('data-slider-marker');
                 window.clearInterval(interval_marker);
             }
-            const end_height = calculateEndHeight(el);
+            const end_height = calculateElementHeight(el);
             if (window.converse_disable_effects) { // Effects are disabled (for tests)
                 el.style.height = end_height + 'px';
-                wrapup(el);
+                slideOutWrapup(el);
                 resolve();
                 return;
             }
@@ -234,9 +243,9 @@
                     // We recalculate the height to work around an apparent
                     // browser bug where browsers don't know the correct
                     // offsetHeight beforehand.
-                    el.style.height = calculateEndHeight(el) + 'px';
+                    el.style.height = calculateElementHeight(el) + 'px';
                     window.clearInterval(interval_marker);
-                    wrapup(el);
+                    slideOutWrapup(el);
                     resolve();
                 }
             }, interval);