diff --git a/locale/af/LC_MESSAGES/converse.po b/locale/af/LC_MESSAGES/converse.po
index a40f4c64a..78d06fb06 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,82 +22,96 @@ msgstr ""
 "lang: af\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr "Boekmerk hierdie kletskamer"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr "Die naam vir hierdie boekmerk:"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 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:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr "Wat sal u bynaam vir hierdie kletskamer wees?"
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Stoor"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Kanseleer"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 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:376
+#: src/converse-bookmarks.js:380
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik om die boekmerklys te skakel"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+#, fuzzy
+msgid "Bookmarks"
 msgstr "Kletskamerboekmerke"
 
-#: src/converse-bookmarks.js:394
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
-msgstr "Klik om hierdie kletskamer te open"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
+msgstr "Sluit en verlaat hierdie kletskamer"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Wys meer inligting aangaande hierdie kletskamer"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr "Verwyder hierdie boekmerk"
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Boekmerk hierdie kletskamer"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Wys meer inligting aangaande hierdie kletskamer"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Klik om hierdie kletskamer te open"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr "U het ongelese boodskappe"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Sluit hierdie kletskas"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Persoonlike boodskap"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "ek"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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."
@@ -106,240 +120,241 @@ msgstr ""
 "werkverrigting te ontwrig. Die boodskap word dus slegs in verkorte weergawe "
 "vertoon."
 
-#: src/converse-chatview.js:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "tik tans"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "het opgehou tik"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "het weggegaan"
 
 # The last three values are needed by Jed (a Javascript translations library)
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Vertoon hierdie keuselys"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Verwyder boodskappe"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "is nou aflyn"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "is besig"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Vee alle boodskappe uit"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Voeg 'n emotikon by"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP Gebruikersnaam:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Klik hier om anoniem aan te meld"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Meld aan"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "gebruiker@bediener"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "wagwoord"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Ek is %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om jou eie statusboodskap te skryf"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Klik om jou klets-status te verander"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Doelgemaakte status"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "aangemeld"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "besig"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "vir lank afwesig"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "afwesig"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "afgemeld"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Aangemeld"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Besig"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Afwesig"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Afgemeld"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Meld af"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Kontaknaam"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Soek"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr "bv. gebruiker@voorbeeld.org"
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Voeg by"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Klik om nuwe kletskontakte by te voeg"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Voeg 'n kontak by"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Kontaknaam"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Soek"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr "bv. gebruiker@voorbeeld.org"
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Voeg by"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Geen gebruikers gevind"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Klik om as kletskontak by te voeg"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Klets"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Herkonnekteer"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr "Die konneksie is onderbreek, probeer tans tans om te herkonnekteer."
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 msgid "Connection error"
 msgstr "Fout tydens verbinding"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 msgid "An error occurred while connecting to the chat server."
 msgstr "A fout het voorgekom tydens verbinding met die kletsbediener."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Verbind tans"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Besig om te bekragtig"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Bekragtiging het gefaal"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 msgid "Connection failed"
 msgstr "Verbinding het gefaal"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 msgid "An error occurred while connecting to the chat server: "
 msgstr "A fout het voorgekom tydens verbinding met die kletsbediener: "
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "Jammer, 'n ander fout het voorgekom tydens byvoeging. "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Klik om hierdie kontakte te verskuil"
 
@@ -347,71 +362,71 @@ msgstr "Klik om hierdie kontakte te verskuil"
 msgid "Close this box"
 msgstr "Maak hierdie kletskas toe"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Minimeer hierdie kletskas"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Klik om hierdie klets te herstel"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Geminimaliseer"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Hierdie vertrek is nie anoniem nie"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Hierdie vertrek wys nou onbeskikbare lede"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Hierdie vertrek wys nie onbeskikbare lede nie"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr "Die kamer instellings het verander"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Kamer log is nou aangeskakel"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Kamer log is nou afgeskakel"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 msgid "This room is now no longer anonymous"
 msgstr "Hiedie kamer is nie meer anoniem nie"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Hierdie kamer is nou gedeeltelik anoniem"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Hierdie kamer is nou ten volle anoniem"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "'n Nuwe kamer is geskep"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Jy is uit die kamer verban"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Jy is uit die kamer geskop"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -419,7 +434,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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -437,119 +452,126 @@ 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:286
+#: src/converse-muc.js:308
+#, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s is verban"
 
-#: src/converse-muc.js:287
+#: src/converse-muc.js:309
+#, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s se bynaam het verander"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:310
+#, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s is uitgeskop"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, 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:290
+#: src/converse-muc.js:312
+#, 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:294
+#: src/converse-muc.js:316
+#, 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:295
+#: src/converse-muc.js:317
+#, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "U bynaam is verander na: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Boodskap"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 msgid "Close and leave this room"
 msgstr "Sluit en verlaat hierdie kletskamer"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 msgid "Configure this room"
 msgstr "Konfigureer hierdie kletskamer"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Verskuil die lys van deelnemers"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Fout: die \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Fout: kon nie die opdrag uitvoer nie"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Verander die gebruiker se affiliasie na admin"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Verban gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Verander gebruiker se rol na lid"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Skop gebruiker uit hierdie kletskamer"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Verleen lidmaatskap aan 'n gebruiker"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Verwyder gebruiker se vermoë om boodskappe te plaas"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Verander u bynaam"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Verleen moderator rol aan gebruiker"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Verleen eienaarskap van hierdie kamer"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Herroep gebruiker se lidmaatskap"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 msgid "Set room subject"
 msgstr "Stel onderwerp vir kletskamer"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr "Verskaf kamer onderwerp (alias vir /subject)"
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
@@ -557,227 +579,231 @@ msgstr ""
 "Die bynaam wat u gekies het is gereserveer of tans in gebruik, kies asb. 'n "
 "ander een."
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr "Kies asb. u bynaam"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Bynaam"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 msgid "Enter room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Hiedie kletskamer benodig 'n wagwoord"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Wagwoord: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Dien in"
 
-#: src/converse-muc.js:1703
+#: src/converse-muc.js:1781
+#, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Hierdie aksie is uitgevoer deur: %1$s."
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Die gegewe rede is: \"%1$s\"."
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Die gegewe rede is: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr " het die kamer verlaat.\""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 msgid " has left the room"
 msgstr " het die kletskamer verlaat"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr " het die kamer binnegekom.\""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr " het die kamer bygetree."
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 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:1782
+#: src/converse-muc.js:1860
 msgid "You have been banned from this room."
 msgstr "Jy is uit die kamer verban."
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 msgid "No nickname was specified."
 msgstr "Geen bynaam verskaf nie."
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 msgid "You are not allowed to create new rooms."
 msgstr "Jy word nie toegelaat om nog kletskamers te skep nie."
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 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:1796
+#: src/converse-muc.js:1874
 msgid "This room does not (yet) exist."
 msgstr "Hierdie kamer bestaan tans (nog) nie."
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 msgid "This room has reached its maximum number of occupants."
 msgstr "Hierdie kletskamer het sy maksimum aantal deelnemers bereik."
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Onderwerp deur %1$s bygewerk na: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 msgid "Click to mention "
 msgstr "Klik om te noem "
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr "Hierdie gebruiker is 'n moderator."
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr "Hierdie gebruiker kan boodskappe na die kamer stuur."
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Deelnemers"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 msgid "Features"
 msgstr "Eienskappe"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Verskuil"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr "Boodskap-argivering"
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr "Slegs lede"
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Gemodereer"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Nie-anoniem"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 msgid "Open"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 msgid "Password protected"
 msgstr "Wagwoord"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr "Blywend"
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Deels anoniem"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 msgid "Temporary"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Ongemodereer"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr "Onversekerd"
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 msgid "This room is not publicly searchable"
 msgstr "Hierdie kletskamer is nie publiek opspoorbaar nie"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr "Boodskappe word op die bediener gestoor"
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 msgid "This room is restricted to members only"
 msgstr "Hierdie kletskamer is slegs tot lede beperk"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 msgid "This room is being moderated"
 msgstr "Hierdie kletskamer word gemodereer"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr "Alle ander deelnemers can u Jabber ID sien"
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 msgid "Anyone can join this room"
 msgstr "Enige iemand kan hierdie kletskamer binnekom"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 msgid "This room requires a password before entry"
 msgstr "Hierdie kletskamer benodig 'n wagwoord"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr "Hierdie kletskamer bestaan voort selfs al is dit leeg"
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 msgid "This room is publicly searchable"
 msgstr "Hierdie kletskamer is publiek opspoorbaar"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr "Slegs moderators kan u Jabber ID sien"
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 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:2102
+#: src/converse-muc.js:2184
 msgid "This room is not being moderated"
 msgstr "Hierdie kletskamer word nie gemodereer nie"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 msgid "This room does not require a password upon entry"
 msgstr "Hiedie kletskamer benodig nie 'n wagwoord nie"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -785,78 +811,82 @@ msgstr ""
 "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te "
 "staaf."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Kamer naam"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Bediener"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Wys kletskamers"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Kletskamers"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Geen kletskamers op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Kletskamers op %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Beskrywing:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 msgid "Server:"
 msgstr "Bediener:"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Eienskappe:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Benodig magtiging"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Benodig 'n uitnodiging"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Permanente kamer"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -866,11 +896,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr "Kennisgewing van %1$s"
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr "%1$s sê"
 
@@ -882,19 +914,20 @@ msgstr "het aanlyn gekom"
 msgid "wants to be your contact"
 msgstr "wil jou kontak wees"
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Herstel versleutelde sessie"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Genereer private sleutel."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "U webblaaier mag tydelik onreageerbaar word."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -910,19 +943,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Kon nie hierdie gebruiker se identitied bevestig nie."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Sleutels word met gespreksmaat uitgeruil."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "U boodskappe is nie meer versleutel nie"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -930,28 +963,29 @@ msgstr ""
 "U boodskappe is nou versleutel maar u gespreksmaat se identiteit is nog "
 "onseker."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "U gespreksmaat se identiteit is bevestig."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "U boodskap kon nie gestuur word nie"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Ons het 'n onversleutelde boodskap ontvang"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Ons het 'n onleesbare versleutelde boodskap ontvang"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -973,7 +1007,7 @@ msgstr ""
 "Indien u die vingerafdrukke bevestig het, klik OK, andersinds klik "
 "Kanselleer."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -988,61 +1022,61 @@ msgstr ""
 "dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit "
 "bevestig wees."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Wat is u sekuriteitsvraag?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Wat is die antwoord tot die sekuriteitsvraag?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Ongeldige verifikasiemetode verskaf"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "U boodskappe is versleutel en u gespreksmaat se identiteit bevestig."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Beëindig versleutelde gesprek"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Verfris versleutelde gesprek"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Begin versleutelde gesprek"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Bevestig met vingerafdrukke"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Bevestig met SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Wat is hierdie?"
 
@@ -1052,47 +1086,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "nie-privaat"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "onbevestig"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "privaat"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "afgesluit"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " bv. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "U XMPP-verskaffer se domein naam:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Haal die registrasie form"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Wenk: A lys van publieke XMPP-verskaffers is beskikbaar"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "hier"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Registreer"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1100,11 +1134,12 @@ msgstr ""
 "Jammer, die gekose verskaffer ondersteun nie in-band registrasie nie.Probeer "
 "weer met 'n ander verskaffer."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Vra tans die XMPP-bediener vir 'n registrasie vorm"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1112,19 +1147,19 @@ msgstr ""
 "Iets het fout geloop tydens koppeling met \"%1$s\". Is u seker dat dit "
 "bestaan?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "U word nou aangemeld"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Suksesvol geregistreer"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Terug"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1132,102 +1167,124 @@ msgstr ""
 "Die verskaffer het u registrasieversoek verwerp. Kontrolleer asb. jou gegewe "
 "waardes vir korrektheid."
 
-#: src/converse-register.js:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Klik om die boekmerklys te skakel"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Oop kletskamer"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+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:85
 msgid "This contact is busy"
 msgstr "Hierdie persoon is besig"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Hierdie persoon is aanlyn"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Hierdie persoon is aflyn"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Hierdie persoon is onbeskikbaar"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Hierdie persoon is vir lank afwesig"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Hierdie persoon is afwesig"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Groepe"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "My kontakte"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Hangende kontakte"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Kontak versoeke"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Ongegroepeer"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr "Filtreer"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr "Kletsstand"
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr "Enige"
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr "Geselserig"
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr "Weg vir langer"
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Klik om hierdie kontak te verwyder"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Klik om hierdie kontakversoek te aanvaar"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om hierdie kontakversoek te weier"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Klik om met hierdie kontak te klets"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Naam"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Is u seker u wil hierdie gespreksmaat verwyder?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "Jammer, 'n fout het voorgekom tydens die verwydering van "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
diff --git a/locale/ca/LC_MESSAGES/converse.po b/locale/ca/LC_MESSAGES/converse.po
index 629a84d21..eb9e834a7 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,331 +26,344 @@ 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:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Desa"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 #, 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:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Mostra més informació d'aquesta sala"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Mostra més informació d'aquesta sala"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Elimina els missatges"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Tanca aquest quadre del xat"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Missatge personal"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "jo"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "està escrivint"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "ha deixat d'escriure"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "ha marxat"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Mostra aquest menú"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "s'ha desconnectat"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "està ocupat"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Esborra tots els missatges"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Insereix una cara somrient"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Inicia una trucada"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contactes"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Feu clic aquí per iniciar la sessió de manera anònima"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Inicia la sessió"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "usuari@servidor"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "contrasenya"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Estic %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Feu clic aquí per escriure un missatge d'estat personalitzat"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Feu clic per canviar l'estat del xat"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Estat personalitzat"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "en línia"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "ocupat"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "absent durant una estona"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "desconnectat"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "En línia"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Tanca la sessió"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:616
+msgid "Click to add new chat contacts"
+msgstr "Feu clic per afegir contactes nous al xat"
+
+#: src/converse-controlbox.js:617
+msgid "Add a contact"
+msgstr "Afegeix un contacte"
+
+#: src/converse-controlbox.js:652
 msgid "Contact name"
 msgstr "Nom del contacte"
 
-#: src/converse-controlbox.js:609
+#: src/converse-controlbox.js:653
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:613
+#: src/converse-controlbox.js:657
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "p. ex. usuari@exemple.com"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:658
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/converse-controlbox.js:619
-msgid "Click to add new chat contacts"
-msgstr "Feu clic per afegir contactes nous al xat"
-
-#: src/converse-controlbox.js:620
-msgid "Add a contact"
-msgstr "Afegeix un contacte"
-
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "No s'ha trobat cap usuari"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Feu clic per afegir com a contacte del xat"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Canvia de xat"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "S'ha produït un error en intentar desar el formulari."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "S'està efectuant l'autenticació"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Error d'autenticació"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "S'ha produït un error en intentar desar el formulari."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "S'ha produït un error en intentar afegir "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Aquest client no admet les subscripcions de presència"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Feu clic per amagar aquests contactes"
 
@@ -359,74 +372,74 @@ msgstr "Feu clic per amagar aquests contactes"
 msgid "Close this box"
 msgstr "Tanca aquest quadre del xat"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Minimitza aquest quadre del xat"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Feu clic per restaurar aquest xat"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimitzat"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Aquesta sala ara mostra membres no disponibles"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Aquesta sala no mostra membres no disponibles"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, 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:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "El registre de la sala està habilitat"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "El registre de la sala està deshabilitat"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Aquesta sala ara no és anònima"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Aquesta sala ara és parcialment anònima"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Aquesta sala ara és totalment anònima"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "S'ha creat una sala nova"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -434,7 +447,7 @@ msgstr ""
 "Se us ha eliminat d'aquesta sala perquè ara només permet membres i no en sou "
 "membre"
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -452,463 +465,469 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "S'ha expulsat %1$s"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "L'àlies de %1$s ha canviat"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "S'ha expulsat %1$s"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, 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:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, 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:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Missatge"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Amaga la llista d'ocupants"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Error: el \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Error: no s'ha pogut executar l'ordre"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Canvia l'afiliació de l'usuari a administrador"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Canvia el rol de l'usuari a ocupant"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Expulsa l'usuari de la sala"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Atorga una afiliació a un usuari"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Elimina la capacitat de l'usuari de publicar missatges"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Atorga el rol de moderador a l'usuari"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Atorga la propietat d'aquesta sala"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Revoca l'afiliació de l'usuari"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Defineix un tema per a la sala"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Permet que un usuari silenciat publiqui missatges"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Àlies"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Contrasenya:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Envia"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "El vostre àlies ha canviat a: %1$s"
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "El motiu indicat és: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "El motiu indicat és: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Se us ha expulsat d'aquesta sala"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "No s'ha especificat cap àlies"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "No teniu permís per crear sales noves"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Aquesta sala (encara) no existeix"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, 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:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema definit per %1$s en: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Aquest usuari és un moderador"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Aquest usuari pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Ocupants"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 #, fuzzy
 msgid "Invite"
 msgstr "Convida..."
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Amagat"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderada"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "No és anònima"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Contrasenya:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semianònima"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "No moderada"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Aquest usuari és un moderador"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Aquesta sala no és anònima"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Aquesta sala de xat requereix una contrasenya"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 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:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nom de la sala"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Uneix-me a la sala"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Mostra les sales"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Sales"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "No hi ha cap sala a %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Sales a %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Ocupants:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Cal autenticar-se"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Cal tenir una invitació"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Sala permanent"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -918,11 +937,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -935,19 +956,20 @@ msgstr "s'ha desconnectat"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "S'està tornant a establir la sessió xifrada"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "S'està generant la clau privada"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "És possible que el navegador no respongui."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -963,19 +985,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "No s'ha pogut verificar la identitat d'aquest usuari."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "S'està intercanviant la clau privada amb el contacte."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Els vostres missatges ja no estan xifrats"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -983,27 +1005,28 @@ msgstr ""
 "Ara, els vostres missatges estan xifrats, però no s'ha verificat la "
 "identitat del contacte."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "S'ha verificat la identitat del contacte."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "No s'ha pogut enviar el missatge"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Hem rebut un missatge sense xifrar"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Hem rebut un missatge xifrat il·legible"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1024,7 +1047,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:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1039,61 +1062,61 @@ msgstr ""
 "mateixa resposta (es distingeix majúscules de minúscules), se'n verificarà "
 "la identitat."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Quina és la vostra pregunta de seguretat?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Quina és la resposta a la pregunta de seguretat?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "S'ha indicat un esquema d'autenticació no vàlid"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 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:419
+#: src/converse-otr.js:417
 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Finalitza la conversa xifrada"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Actualitza la conversa xifrada"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Comença la conversa xifrada"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verifica amb empremtes"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verifica amb SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Què és això?"
 
@@ -1103,47 +1126,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "sense xifrar"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "sense verificar"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verificat"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "acabat"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr "p. ex. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Nom de domini del vostre proveïdor XMPP:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Obtingues un formulari de registre"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 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:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "aquí"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Registre"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1151,11 +1174,12 @@ msgstr ""
 "El proveïdor indicat no admet el registre del compte. Proveu-ho amb un altre "
 "proveïdor."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 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:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1163,19 +1187,19 @@ msgstr ""
 "Ha passat alguna cosa mentre s'establia la connexió amb \"%1$s\". Segur que "
 "existeix?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "S'està iniciant la vostra sessió"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Registre correcte"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Torna"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1183,103 +1207,125 @@ msgstr ""
 "El proveïdor ha rebutjat l'intent de registre. Comproveu que els valors que "
 "heu introduït siguin correctes."
 
-#: src/converse-register.js:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Feu clic per obrir aquesta sala"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Obre la sala"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Segur que voleu eliminar aquest contacte?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Aquest contacte està ocupat"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Aquest contacte està en línia"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Aquest contacte està desconnectat"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Aquest contacte no està disponible"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Aquest contacte està absent durant un període prolongat"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Aquest contacte està absent"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Grups"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Els meus contactes"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Contactes pendents"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Sol·licituds de contacte"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Sense agrupar"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Feu clic per eliminar aquest contacte"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, 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:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, 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:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Feu clic per conversar amb aquest contacte"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Nom"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Segur que voleu eliminar aquest contacte?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "S'ha produït un error en intentar eliminar "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 
diff --git a/locale/converse.pot b/locale/converse.pot
index a5d9b2961..9bdf007c1 100644
--- a/locale/converse.pot
+++ b/locale/converse.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-23 17:19+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,320 +17,332 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr ""
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr ""
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 msgid "Click to toggle the bookmarks list"
 msgstr ""
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
+#: src/converse-bookmarks.js:398
+#, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr ""
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+msgid "Leave this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr ""
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+msgid "Unbookmark this room"
+msgstr ""
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr ""
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr ""
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr ""
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr ""
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr ""
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr ""
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr ""
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr ""
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr ""
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr ""
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr ""
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr ""
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr ""
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr ""
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr ""
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr ""
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr ""
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr ""
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr ""
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr ""
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr ""
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr ""
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr ""
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr ""
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr ""
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:647
-msgid "No users found"
+#: src/converse-controlbox.js:652
+msgid "Contact name"
 msgstr ""
 
 #: src/converse-controlbox.js:653
+msgid "Search"
+msgstr ""
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr ""
+
+#: src/converse-controlbox.js:679
+msgid "No users found"
+msgstr ""
+
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr ""
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 msgid "Connection error"
 msgstr ""
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 msgid "An error occurred while connecting to the chat server."
 msgstr ""
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr ""
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr ""
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 msgid "Connection failed"
 msgstr ""
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 msgid "An error occurred while connecting to the chat server: "
 msgstr ""
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr ""
 
@@ -338,77 +350,77 @@ msgstr ""
 msgid "Close this box"
 msgstr ""
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr ""
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr ""
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 msgid "This room is now no longer anonymous"
 msgstr ""
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr ""
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr ""
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr ""
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -424,422 +436,437 @@ 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:286
+#: src/converse-muc.js:308
+#, javascript-format
 msgid "%1$s has been banned"
 msgstr ""
 
-#: src/converse-muc.js:287
+#: src/converse-muc.js:309
+#, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr ""
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:310
+#, javascript-format
 msgid "%1$s has been kicked out"
 msgstr ""
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:312
+#, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:294
+#: src/converse-muc.js:316
+#, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr ""
 
-#: src/converse-muc.js:295
+#: src/converse-muc.js:317
+#, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr ""
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr ""
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 msgid "Close and leave this room"
 msgstr ""
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 msgid "Configure this room"
 msgstr ""
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr ""
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr ""
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr ""
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr ""
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 msgid "Set room subject"
 msgstr ""
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr ""
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 msgid "Enter room"
 msgstr ""
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr ""
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr ""
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr ""
 
-#: src/converse-muc.js:1703
+#: src/converse-muc.js:1781
+#, javascript-format
 msgid "This action was done by %1$s."
 msgstr ""
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 msgid " has left the room"
 msgstr ""
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 msgid "You are not on the member list of this room."
 msgstr ""
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 msgid "You have been banned from this room."
 msgstr ""
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 msgid "No nickname was specified."
 msgstr ""
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 msgid "You are not allowed to create new rooms."
 msgstr ""
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr ""
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 msgid "This room does not (yet) exist."
 msgstr ""
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 msgid "This room has reached its maximum number of occupants."
 msgstr ""
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 msgid "Click to mention "
 msgstr ""
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr ""
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 msgid "This user can NOT send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 msgid "Features"
 msgstr ""
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr ""
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr ""
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 msgid "Open"
 msgstr ""
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 msgid "Password protected"
 msgstr ""
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr ""
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 msgid "Temporary"
 msgstr ""
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr ""
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 msgid "This room is not publicly searchable"
 msgstr ""
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 msgid "This room is restricted to members only"
 msgstr ""
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 msgid "This room is being moderated"
 msgstr ""
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 msgid "Anyone can join this room"
 msgstr ""
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 msgid "This room requires a password before entry"
 msgstr ""
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 msgid "This room is publicly searchable"
 msgstr ""
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 msgid "This room is not being moderated"
 msgstr ""
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 msgid "This room does not require a password upon entry"
 msgstr ""
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr ""
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr ""
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr ""
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 msgid "Server:"
 msgstr ""
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr ""
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr ""
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr ""
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr ""
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr ""
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr ""
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr ""
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -847,11 +874,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -863,19 +892,20 @@ msgstr ""
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr ""
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -885,45 +915,46 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr ""
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr ""
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr ""
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr ""
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr ""
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr ""
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -936,7 +967,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -945,57 +976,57 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr ""
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr ""
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr ""
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr ""
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr ""
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr ""
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr ""
 
@@ -1005,176 +1036,197 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr ""
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr ""
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr ""
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
-msgid "This contact is busy"
+#: src/converse-roomslist.js:71
+msgid "Click to toggle the rooms list"
+msgstr ""
+
+#: src/converse-roomslist.js:72
+msgid "Open Rooms"
+msgstr ""
+
+#: src/converse-roomslist.js:103
+#, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
 msgstr ""
 
 #: src/converse-rosterview.js:85
-msgid "This contact is online"
+msgid "This contact is busy"
 msgstr ""
 
 #: src/converse-rosterview.js:86
-msgid "This contact is offline"
+msgid "This contact is online"
 msgstr ""
 
 #: src/converse-rosterview.js:87
-msgid "This contact is unavailable"
+msgid "This contact is offline"
 msgstr ""
 
 #: src/converse-rosterview.js:88
-msgid "This contact is away for an extended period"
+msgid "This contact is unavailable"
 msgstr ""
 
 #: src/converse-rosterview.js:89
+msgid "This contact is away for an extended period"
+msgstr ""
+
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr ""
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr ""
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr ""
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr ""
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr ""
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr ""
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr ""
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr ""
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr ""
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr ""
diff --git a/locale/de/LC_MESSAGES/converse.po b/locale/de/LC_MESSAGES/converse.po
index a366bd7b9..0473e05cf 100644
--- a/locale/de/LC_MESSAGES/converse.po
+++ b/locale/de/LC_MESSAGES/converse.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+0200\n"
 "PO-Revision-Date: 2017-04-23 16:55+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/conversejs/"
@@ -22,321 +22,336 @@ msgstr ""
 "lang: de\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr "Lesezeichen setzen"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr "Der Name für das Lesezeichen:"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Speichern"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Etwas ging beim Versuch des Abspeicherns des Lesezeichens schief."
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 msgid "Click to toggle the bookmarks list"
 msgstr "Zum Aus-/Einklappen klicken"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+#, fuzzy
+msgid "Bookmarks"
 msgstr "Gemerkte Zimmer"
 
-#: src/converse-bookmarks.js:394
+#: src/converse-bookmarks.js:398
+#, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Wollen Sie dieses Lesezeichen wirklich entfernen \"%1$s\"?"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
-msgstr "Hier klicken um diesen Raum zu öffnen"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
+msgstr "Dieses Lesezeichen entfernen"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Mehr Information über diesen Raum zeigen"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr "Dieses Lesezeichen entfernen"
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Lesezeichen setzen"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Mehr Information über diesen Raum zeigen"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Hier klicken um diesen Raum zu öffnen"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Das Chat-Fenster schließen"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Persönliche Nachricht"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "Ich"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "tippt"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "tippt nicht mehr"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "ist jetzt abwesend"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Dieses Menü anzeigen"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Nachrichten entfernen"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "ist offline gegangen"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "ist beschäftigt"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Alle Nachrichten löschen"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP Benutzername:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Hier klicken um anonym anzumelden"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Anmelden"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr "Benutzername"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "Benutzer@Server"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "passwort"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Anmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Ich bin %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Hier klicken um Statusnachricht zu ändern"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Hier klicken um Status zu ändern"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Statusnachricht"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "beschäftigt"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "länger abwesend"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "abwesend"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "abgemeldet"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Name des Kontakts"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Suche"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr "z.B. benutzer@example.org"
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Hier klicken um neuen Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Kontakt hinzufügen"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Name des Kontakts"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Suche"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr "z.B. benutzer@example.org"
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Keine Benutzer gefunden"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Hier klicken um als Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Chat ein-/ausblenden"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Verbindung wiederherstellen"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 msgid "An error occurred while connecting to the chat server."
 msgstr "Beim Speichern des Formulars ist ein Fehler aufgetreten."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Authentifizierung gescheitert"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 msgid "An error occurred while connecting to the chat server: "
 msgstr ""
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Hier klicken um diese Kontakte zu verstecken"
 
@@ -344,77 +359,77 @@ msgstr "Hier klicken um diese Kontakte zu verstecken"
 msgid "Close this box"
 msgstr "Schließen"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Hier klicken um diesen Chat wiederherzustellen"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimiert"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder an"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder nicht an"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Nachrichten in diesem Raum werden ab jetzt protokolliert"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Nachrichten in diesem Raum werden nicht mehr protokolliert"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 msgid "This room is now no longer anonymous"
 msgstr "Dieses Zimmer ist jetzt nicht anonym"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Dieser Raum ist jetzt teils anonym"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Dieser Raum ist jetzt anonym"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Ein neuer Raum wurde erstellt"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Sie sind aus diesem Raum verbannt worden"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Sie wurden aus diesem Raum hinausgeworfen"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -432,441 +447,455 @@ 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:286
+#: src/converse-muc.js:308
+#, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s ist verbannt worden"
 
-#: src/converse-muc.js:287
+#: src/converse-muc.js:309
+#, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s's Spitzname hat sich geändert"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:310
+#, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s wurde hinausgeworfen"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, 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:290
+#: src/converse-muc.js:312
+#, 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:294
+#: src/converse-muc.js:316
+#, 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:295
+#: src/converse-muc.js:317
+#, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ihr Spitzname wurde geändert zu: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 msgid "Close and leave this room"
 msgstr ""
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 msgid "Configure this room"
 msgstr ""
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Teilnehmerliste ausblenden"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Fehler: Konnte den Befehl nicht ausführen"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Verbanne einen Benutzer aus dem Raum"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Benutzerrolle zu Teilnehmer ändern"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Werfe einen Benutzer aus dem Raum"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Spitznamen ändern"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Besitzrechte an diesem Raum vergeben"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 msgid "Set room subject"
 msgstr "Chatraum Thema festlegen"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Spitznamen ändern"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Passwort: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Abschicken"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ihr Spitzname wurde geändert zu: %1$s"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Die angegebene Begründung lautet: \"%1$s\"."
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Die angegebene Begründung lautet: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 msgid "You are not on the member list of this room."
 msgstr "Sie sind nicht auf der Mitgliederliste dieses Raums."
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 msgid "You have been banned from this room."
 msgstr "Sie sind aus diesem Raum verbannt worden."
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 msgid "No nickname was specified."
 msgstr "Kein Spitzname festgelegt."
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 msgid "You are not allowed to create new rooms."
 msgstr "Es ist Ihnen nicht erlaubt neue Räume anzulegen."
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Ungültiger Spitzname"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 msgid "This room does not (yet) exist."
 msgstr "Dieser Raum existiert (noch) nicht."
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 msgid "This room has reached its maximum number of occupants."
 msgstr "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, 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:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr "Dieser Benutzer ist ein Moderator."
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr "Dieser Benutzer kann Nachrichten in diesem Raum verschicken."
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 msgid "This user can NOT send messages in this room."
 msgstr "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken."
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Teilnehmer"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 msgid "Features"
 msgstr "Funktionen"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderiert"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Nicht anonym"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Passwort: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Öffentlich"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Teils anonym"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Vorübergehender Raum"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Unmoderiert"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Dieser Benutzer ist ein Moderator"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Dieser Raum ist nicht anonym"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Dieser Raum erfordert ein Passwort"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Raumname"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Raum betreten"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Räume anzeigen"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 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:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Keine Räume auf %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Räume auf %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Teilnehmer:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Funktionen:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Authentifizierung erforderlich"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Einladung erforderlich"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Dauerhafter Raum"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Vorübergehender Raum"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -874,11 +903,13 @@ msgstr "%1$s hat Sie in den Raum \"%2$s\" eingeladen. Begründung: \"%3$s\""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -891,19 +922,20 @@ msgstr "Dieser Kontakt ist offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Verschlüsselte Sitzung wiederherstellen"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Generiere privaten Schlüssel."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Ihr Browser könnte langsam reagieren."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -918,45 +950,46 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Die Identität des Benutzers konnte nicht verifiziert werden."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Tausche private Schlüssel mit Kontakt aus."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr ""
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr ""
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Ihre Nachricht konnte nicht gesendet werden"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Wir haben eine unverschlüsselte Nachricht empfangen"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Wir haben eine unlesbare Nachricht empfangen"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -969,7 +1002,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -978,57 +1011,57 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr ""
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr ""
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr ""
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr ""
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr ""
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr ""
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr ""
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr ""
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Was ist das?"
 
@@ -1038,177 +1071,200 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "unverschlüsselt"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "nicht verifiziert"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verifiziert"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "erledigt"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " z. B. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Zurück"
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Zum Aus-/Einklappen klicken"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Offener Raum"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Wollen Sie dieses Lesezeichen wirklich entfernen \"%1$s\"?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Dieser Kontakt ist beschäftigt"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Dieser Kontakt ist online"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Dieser Kontakt ist nicht verfügbar"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Dieser Kontakt ist für längere Zeit abwesend"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Dieser Kontakt ist abwesend"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Gruppen"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Meine Kontakte"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Unbestätigte Kontakte"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Kontaktanfragen"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Ungruppiert"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Hier klicken um diesen Kontakt zu entfernen"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Hier klicken um diese Kontaktanfrage zu akzeptieren"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Hier klicken um diese Kontaktanfrage zu abzulehnen"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Hier klicken um mit diesem Kontakt zu chatten"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Wollen Sie diesen Kontakt wirklich entfernen?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 
diff --git a/locale/es/LC_MESSAGES/converse.po b/locale/es/LC_MESSAGES/converse.po
index 6f6917b91..b5ddbe6c8 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,338 +25,351 @@ 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:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Guardar"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Mostrar más información en esta sala"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Mostrar más información en esta sala"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Eliminar mensajes"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "yo"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Mostrar este menú"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Eliminar mensajes"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Registrar"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Estoy %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Haga click para escribir un mensaje de estatus personalizado"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Haga click para cambiar su estatus de chat"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Personalizar estatus"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "en línea"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "ausente por mucho tiempo"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "En línea"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nombre de contacto"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Búsqueda"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Agregar"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Haga click para agregar nuevos contactos al chat"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Agregar un contacto"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nombre de contacto"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Búsqueda"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Agregar"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Sin usuarios encontrados"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Haga click para agregar como contacto de chat"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Chat"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Reconectando"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "La conexión falló"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Un error ocurrío mientras se guardaba el formulario."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "La autenticación falló"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "La conexión falló"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Un error ocurrío mientras se guardaba el formulario."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Haga click para eliminar este contacto"
@@ -366,75 +379,75 @@ msgstr "Haga click para eliminar este contacto"
 msgid "Close this box"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Esta sala ahora muestra los miembros no disponibles"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Esta sala no muestra los miembros no disponibles"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, 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:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "El registro de la sala ahora está habilitado"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "El registro de la sala ahora está deshabilitado"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Esta sala ahora es pública"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Esta sala ahora es semi-anónima"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Esta sala ahora es completamente anónima"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Una nueva sala ha sido creada"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Usted ha sido bloqueado de esta sala"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Usted ha sido expulsado de esta sala"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -442,7 +455,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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -460,464 +473,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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s ha sido bloqueado"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s ha sido bloqueado"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s ha sido expulsado"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Prohibir usuario de sala de chat."
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Expulsar usuario de sala de chat."
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Usted no está en la lista de miembros de esta sala"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Definir tema de sala de chat"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Apodo"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Su apodo ha sido cambiado"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Usted ha sido bloqueado de esta sala"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Sin apodo especificado"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Usted no esta autorizado para crear nuevas salas"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Esta sala (aún) no existe"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, 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:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema fijado por %1$s a: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Este usuario es un moderador"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Este usuario puede enviar mensajes en esta sala"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Este usuario NO puede enviar mensajes en esta"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Ocupantes"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Características:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "No anónimo"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Contraseña: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi anónimo"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Sin moderar"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, 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:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Este usuario es un moderador"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Esta sala de chat requiere una contraseña."
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nombre de sala"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "Unirse"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Mostrar salas"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Sin salas en %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Salas en %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Descripción"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Servidor"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Características:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Autenticación requerida"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Requiere una invitación"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -925,11 +945,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -942,20 +964,20 @@ msgstr "Este contacto está desconectado"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Re-estableciendo sesión cifrada"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Generando llave privada"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Su navegador podría dejar de responder por un momento"
 
-#: src/converse-otr.js:189
-#, fuzzy
+#: src/converse-otr.js:187
+#, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -970,20 +992,20 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "No se pudo verificar la identidad de este usuario"
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "Intercambiando llaves privadas"
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Sus mensajes han dejado de cifrarse"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -992,29 +1014,30 @@ msgstr ""
 "Sus mensajes están ahora cifrados pero la identidad de su contacto no ha "
 "sido verificada."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "La identidad de su contacto ha sido confirmada"
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Su mensaje no se pudo enviar"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Se recibío un mensaje sin cifrar"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Se recibío un mensaje cifrado corrupto"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1035,7 +1058,7 @@ msgstr ""
 "Después de confirmar los identificadores haga click en OK, cancele si no "
 "concuerdan."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1049,63 +1072,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:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Introduzca su pregunta de seguridad"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Introduzca la respuesta a su pregunta de seguridad"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Esquema de autenticación inválido"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 #, 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:417
+#: src/converse-otr.js:415
 #, 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:419
+#: src/converse-otr.js:417
 #, 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Finalizar sesión cifrada"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Actualizar sesión cifrada"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Iniciar sesión cifrada"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verificar con identificadores"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verificar con SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "¿Qué es esto?"
 
@@ -1115,179 +1138,200 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "texto plano"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "sin verificar"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verificado"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Haga click para abrir esta sala"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Abrir sala"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "¿Esta seguro de querer eliminar este contacto?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Este contacto está ocupado"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Este contacto está en línea"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Este contacto no está disponible"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Este contacto está ausente por un largo periodo de tiempo"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Mis contactos"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Contactos pendientes"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Solicitudes de contacto"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Haga click para conversar con este contacto"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
diff --git a/locale/fr/LC_MESSAGES/converse.po b/locale/fr/LC_MESSAGES/converse.po
index ae07cf4ac..91dfd5205 100644
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+0200\n"
 "PO-Revision-Date: 2017-04-06 11:49+0200\n"
 "Last-Translator: Jean-Baptiste <jean-baptiste@holcroft.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/conversejs/"
@@ -24,84 +24,98 @@ msgstr ""
 "Domain: converse\n"
 "domain: converse\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr "Marquer ce salon"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr "Nom de ce marque-page :"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 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:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr "Quel alias devrait être utilisé pour ce salon ?"
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 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:376
+#: src/converse-bookmarks.js:380
 msgid "Click to toggle the bookmarks list"
 msgstr "Cliquer pour ouvrir la liste des salons"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+#, fuzzy
+msgid "Bookmarks"
 msgstr "Salons en marques-page"
 
-#: src/converse-bookmarks.js:394
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Voulez-vous vraiment supprimer ce marque-page ?"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
-msgstr "Cliquer pour ouvrir ce salon"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
+msgstr "Fermer et quitter ce salon"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Afficher davantage d’informations sur ce salon"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr "Supprimer ce marque-page"
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Marquer ce salon"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Afficher davantage d’informations sur ce salon"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Cliquer pour ouvrir ce salon"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr "Vous avez de nouveaux messages"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Fermer cette fenêtre de discussion"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Message personnel"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "moi"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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."
@@ -109,240 +123,241 @@ 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "écrit"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "a arrêté d’écrire"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "est parti"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Afficher ce menu"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Effacer les messages"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "s’est déconnecté"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "est occupé"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Supprimer tous les messages"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Insérer une émoticône"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Démarrer un appel"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "Nom d’utilisateur XMPP :"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Cliquez ici pour se connecter anonymement"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Se connecter"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr "Nom"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "utilisateur@serveur"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "Mot de passe"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Je suis %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Cliquez ici pour indiquer votre statut personnel"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Cliquez pour changer votre statut"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Statut personnel"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "en ligne"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "occupé"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "absent pour une longue durée"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "En ligne"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nom du contact"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Rechercher"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr "e.g. utilisateur@exemple.org"
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Ajouter"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Cliquez pour ajouter de nouveaux contacts"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Ajouter un contact"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nom du contact"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Rechercher"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr "e.g. utilisateur@exemple.org"
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Ajouter"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Cliquer pour ajouter aux contacts"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Ouvrir IM"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Reconnexion"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr "La connexion a été perdue, tentative de reconnexion en cours."
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 msgid "An error occurred while connecting to the chat server."
 msgstr "Une erreur est survenue lors de la connexion au serveur de discussion."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "L’authentification a échoué"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 msgid "Connection failed"
 msgstr "La connexion a échoué"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 msgid "An error occurred while connecting to the chat server: "
 msgstr ""
 "Une erreur est survenue lors de la connexion au serveur de discussion : "
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 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 "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Ce client ne permet pas les mises à jour de disponibilité"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Cliquez pour cacher ces contacts"
 
@@ -350,71 +365,71 @@ msgstr "Cliquez pour cacher ces contacts"
 msgid "Close this box"
 msgstr "Fermer cette fenêtre"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Réduire cette fenêtre de discussion"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Cliquez pour afficher cette discussion"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Réduit(s)"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Ce salon n’est pas anonyme"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Ce salon affiche maintenant les membres indisponibles"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Ce salon n’affiche pas les membres indisponibles"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr "Les paramètres de ce salon ont été modifiés"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Le logging du salon est activé"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Le logging du salon est désactivé"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 msgid "This room is now no longer anonymous"
 msgstr "Ce salon n’est plus anonyme"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Ce salon est maintenant semi-anonyme"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Ce salon est maintenant entièrement anonyme"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Vous avez été banni de ce salon"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Vous avez été expulsé de ce salon"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -422,7 +437,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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -440,119 +455,126 @@ 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:286
+#: src/converse-muc.js:308
+#, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s a été banni"
 
-#: src/converse-muc.js:287
+#: src/converse-muc.js:309
+#, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "L’alias de %1$s a changé"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:310
+#, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s a été expulsé"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, 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:290
+#: src/converse-muc.js:312
+#, 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:294
+#: src/converse-muc.js:316
+#, 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:295
+#: src/converse-muc.js:317
+#, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Votre alias a été modifié en : %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Message"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 msgid "Close and leave this room"
 msgstr "Fermer et quitter ce salon"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 msgid "Configure this room"
 msgstr "Configurer ce salon"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Cacher la liste des participants"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Erreur : \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Erreur : la commande ne peut pas être exécutée"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Changer le rôle  de l’utilisateur en administrateur"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Bannir l’utilisateur du salon"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Changer le rôle de l’utilisateur en participant"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Expulser l’utilisateur du salon"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Autoriser l’utilisateur à être membre"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Retirer le droit d’envoyer des messages"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Changer votre alias"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Changer le rôle de l’utilisateur en modérateur"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Accorder la propriété à ce salon"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Révoquer l’utilisateur des membres"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 msgid "Set room subject"
 msgstr "Indiquer le sujet du salon"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr "Définir le sujet de la salle (alias pour /subject)"
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Autoriser les utilisateurs muets à poster des messages"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
@@ -560,237 +582,241 @@ msgstr ""
 "L’alias choisi est réservé ou actuellment utilisé, veuillez en choisir un "
 "différent."
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr "Veuillez choisir votre alias"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Alias"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 msgid "Enter room"
 msgstr "Entrer dans le salon"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Ce salon nécessite un mot de passe"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Soumettre"
 
-#: src/converse-muc.js:1703
+#: src/converse-muc.js:1781
+#, 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:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "La raison indiquée est : « %1$s »."
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "La raison indiquée est : \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr " a quitté le salon. \""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 msgid " has left the room"
 msgstr " a quitté le salon"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr " a rejoint le salon. \""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr " a rejoint le salon."
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Vous avez été banni de ce salon"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Aucun alias n’a été indiqué"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Vous n’êtes pas autorisé à créer des salons"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ce salon n’existe pas encore"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ce salon a atteint la limite maximale d’occupants"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, 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:1983
+#: src/converse-muc.js:2065
 msgid "Click to mention "
 msgstr "Cliquer pour citer "
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr "Cet utilisateur est un modérateur."
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr "Cet utilisateur peut envoyer des messages dans ce salon."
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Participants :"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 msgid "Features"
 msgstr "Caractéristiques"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Masqué"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr "Archivage du message"
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr "Membres uniquement"
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Modéré"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Non-anonyme"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 msgid "Open"
 msgstr "Ouvrir"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 msgid "Password protected"
 msgstr "Protégé par mot de passe"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr "Persistant"
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi-anonyme"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 msgid "Temporary"
 msgstr "Temporaire"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Non modéré"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr "Non sécurisé"
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ce salon ne peut pas être recherché publiquement"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr "Les messages sont archivés sur le serveur"
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 msgid "This room is restricted to members only"
 msgstr "Ce salon est restreint aux membres uniquement"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 msgid "This room is being moderated"
 msgstr "Ce salon est modéré"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr "Tous les autres occupants de ce salon peuvent voir votre ID Jabber"
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 msgid "Anyone can join this room"
 msgstr "N’importe qui peut rejoindre ce salon"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 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:2098
+#: src/converse-muc.js:2180
 #, fuzzy
 msgid "This room persists even if it's unoccupied"
 msgstr "Ce salon persiste même s'il est inoccupé"
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Ce salon peut être cherché publiquement"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr "Seuls les modérateurs peuvent voir votre identifiant Jabber"
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 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:2102
+#: src/converse-muc.js:2184
 msgid "This room is not being moderated"
 msgstr "Ce salon n’est pas modéré"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 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:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -798,79 +824,83 @@ msgstr ""
 "Vous pouvez facultativement ajouter un message, expliquant la raison de "
 "cette invitation."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nom du salon"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Serveur"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Rejoindre"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Afficher les salons"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Salons"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Aucun salon dans %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Salons dans %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Description :"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Serveur"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Participants :"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Caractéristiques :"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Nécessite une authentification"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Nécessite une invitation"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Ouvrir un salon"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Salon permanent"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Salon temporaire"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -880,11 +910,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr "Notification depuis %1$s"
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr "%1$s dit"
 
@@ -896,19 +928,20 @@ msgstr "s’est déconnecté"
 msgid "wants to be your contact"
 msgstr "veut être votre contact"
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Rétablissement d’une session chiffrée"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Génération de la clé privée."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Votre navigateur pourrait ne plus répondre."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -924,19 +957,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 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:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Échange de la clef privée avec le contact."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Vos messages ne sont plus chiffrés"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -944,29 +977,30 @@ 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:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "L’identité de votre contact a été vérifiée."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Votre message ne peut pas être envoyé"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Un message non chiffré a été reçu"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Un message chiffré illisible a été reçu"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -988,7 +1022,7 @@ msgstr ""
 "Si vous avez confirmé que les empreintes correspondent, cliquez OK, sinon "
 "cliquez Annuler."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1002,33 +1036,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:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Quelle est votre question de sécurité ?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Quelle est la réponse à la question de sécurité ?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Schéma d’authentification fourni non valide"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 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:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
@@ -1036,27 +1070,27 @@ msgstr ""
 "Votre contact a fermé la session privée de son côté, vous devriez le faire "
 "aussi"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Terminer la conversation chiffrée"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Actualiser la conversation chiffrée"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Démarrer une conversation chiffrée"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Vérifier par empreintes de sécurité"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Vérifier par Question/Réponse"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Qu’est-ce que c’est ?"
 
@@ -1066,47 +1100,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "chiffré"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "non vérifié"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "vérifié"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "terminé"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " e.g. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Votre domaine XMPP :"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Récupération du formulaire d’enregistrement"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Astuce : une liste publique de fournisseurs XMPP est disponible"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "ici"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "S’enregistrer"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1114,11 +1148,12 @@ 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:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Demande du formulaire enregistrement au serveur XMPP"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1126,121 +1161,143 @@ msgstr ""
 "Quelque chose a échoué lors de l’établissement de la connexion avec \"%1$s"
 "\". Existe-t-il vraiment ?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "En cours de connexion"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Enregistré avec succès"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Retourner"
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Cliquer pour ouvrir la liste des salons"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Ouvrir un salon"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Voulez-vous vraiment supprimer ce marque-page ?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Ce contact est occupé"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Ce contact est connecté"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Ce contact est déconnecté"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Ce contact est indisponible"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Ce contact est absent"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Ce contact est absent"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Groupes"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Mes contacts"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Contacts en attente"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Demandes de contacts"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Sans groupe"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr "Filtrer"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr "Status"
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr "Aucun"
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Cliquez pour supprimer ce contact"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Cliquez pour accepter la demande de ce contact"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Cliquez pour refuser la demande de ce contact"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Cliquez pour discuter avec ce contact"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Nom"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Voulez-vous vraiment supprimer ce contact ?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 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 "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Voulez-vous vraiment refuser cette demande de contact ?"
 
diff --git a/locale/he/LC_MESSAGES/converse.po b/locale/he/LC_MESSAGES/converse.po
index 16033af8e..c473869f2 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,332 +20,345 @@ msgstr ""
 "X-Language: he\n"
 "X-Source-Language: en\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "שמור"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "הצג עוד מידע אודות חדר זה"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "לחץ כדי לפתוח את חדר זה"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "הצג עוד מידע אודות חדר זה"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "לחץ כדי לפתוח את חדר זה"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "הסר הודעות"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "הודעה אישית"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "אני"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "מקליד(ה) כעת"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "חדל(ה) להקליד"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "נעדר(ת)"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "הצג את תפריט זה"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "כתוב בגוף השלישי"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "הסר הודעות"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "כבר לא מקוון"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "עסוק(ה) כעת"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "טהר את כל ההודעות"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "הכנס סמיילי"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "התחל שיחה"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "לחץ כאן כדי להתחבר באופן אנונימי"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "כניסה"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "סיסמה"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "התחברות"
 
 # אני במצב
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "מצבי כעת הינו %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "לחץ כאן כדי לכתוב הודעת מצב מותאמת"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "לחץ כדי לשנות את הודעת השיחה שלך"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "מצב מותאם"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "נעדר לזמן מה"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "התנתקות"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:616
+msgid "Click to add new chat contacts"
+msgstr "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
+
+#: src/converse-controlbox.js:617
+msgid "Add a contact"
+msgstr "הוסף איש קשר"
+
+#: src/converse-controlbox.js:652
 msgid "Contact name"
 msgstr "שם איש קשר"
 
-#: src/converse-controlbox.js:609
+#: src/converse-controlbox.js:653
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/converse-controlbox.js:613
+#: src/converse-controlbox.js:657
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "למשל user@example.com"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:658
 msgid "Add"
 msgstr "הוסף"
 
-#: src/converse-controlbox.js:619
-msgid "Click to add new chat contacts"
-msgstr "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
-
-#: src/converse-controlbox.js:620
-msgid "Add a contact"
-msgstr "הוסף איש קשר"
-
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "לא נמצאו משתמשים"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "לחץ כדי להוסיף בתור איש קשר שיחה"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "הפעל שיח"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "כעת מתחבר"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "חיבור נכשל"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "אירעה שגיאה במהלך ניסיון שמירת הטופס."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "כעת מתחבר"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "כעת מאמת"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "אימות נכשל"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "חיבור נכשל"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "אירעה שגיאה במהלך ניסיון שמירת הטופס."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "לקוח זה לא מתיר הרשמות נוכחות"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "לחץ כדי להסתיר את אנשי קשר אלה"
 
@@ -354,80 +367,80 @@ msgstr "לחץ כדי להסתיר את אנשי קשר אלה"
 msgid "Close this box"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "לחץ כדי לשחזר את שיחה זו"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "ממוזער"
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "חדר זה כעת מציג חברים לא זמינים"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "חדר זה לא מציג חברים לא זמינים"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "תצורת חדר אשר לא-קשורה-בפרטיות שונתה"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "יומן חדר הינו מופעל כעת"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "יומן חדר הינו מנוטרל כעת"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "חדר זה אינו אנונימי כעת"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "חדר זה הינו אנונימי-למחצה כעת"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "חדר זה הינו אנונימי-לחלוטין כעת"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "חדר חדש נוצר"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "נאסרת מתוך חדר זה"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "נבעטת מתוך חדר זה"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "הוסרת מתוך חדר זה משום שינוי שיוך"
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -445,472 +458,478 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s נאסר(ה)"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "השם כינוי של%1$s השתנה"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s נבעט(ה)"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s הוסרה(ה) משום שינוי שיוך"
 
 # היותו(ה)
-#: src/converse-muc.js:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "השם כינוי שלך שונה אוטומטית בשם: %1$s"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "השם כינוי שלך שונה בשם: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "הודעה"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "הסתר רשימת משתתפים"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך חדר זה?"
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "שגיאה: לא היתה אפשרות לבצע פקודה"
 
 # שייכות
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "שנה סינוף משתמש למנהל"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "אסור משתמש מתוך חדר"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "שנה תפקיד משתמש למשתתף"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "בעט משתמש מתוך חדר"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "כתוב בגוף שלישי"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "הענק חברות למשתמש"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "הסר יכולת משתמש לפרסם הודעות"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "הענק תפקיד אחראי למשתמש"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "הענק בעלות על חדר זה"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "שלול חברות משתמש"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "קבע נושא חדר"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "התר למשתמש מושתק לפרסם הודעות"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "שם כינוי"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "סיסמה: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "שלח"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "השם כינוי שלך שונה בשם: %1$s"
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "הסיבה שניתנה היא: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "הסיבה שניתנה היא: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "אינך ברשימת החברים של חדר זה"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "נאסרת מתוך חדר זה"
 
 # אף שם כינוי לא צוין
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "לא צוין שום שם כינוי"
 
 # אינך מורשה
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "אין לך רשות ליצור חדרים חדשים"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "השם כינוי שלך לא תואם את המדינויות של חדר זה"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "חדר זה (עדיין) לא קיים"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "נוכחים"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "הזמנה"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "נסתר"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "מבוקר"
 
 # לא-עלום
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "לא-אנונימי"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "סיסמה: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "פומבי"
 
 # עלום-למחצה
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "אנונימי-למחצה"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "לא מבוקר"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
 # חדר זה אינו עלום
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "חדר זה אינו אנונימי"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "חדר שיחה זה מצריך סיסמה"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "שם חדר"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "שרת"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "הצטרף לחדר"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "הצג חדרים"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "חדרים"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "אין חדרים על %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "חדרים על %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "שרת"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "נוכחים:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "מצריך אישור"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "מצריך הזמנה"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "חדר צמיתה"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s"
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -918,11 +937,13 @@ msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s, והשאיר א
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -935,19 +956,20 @@ msgstr "כבר לא מקוון"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "בסס מחדש ישיבה מוצפנת"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "כעת מפיק מפתח פרטי."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "הדפדפן שלך עשוי שלא להגיב."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -962,45 +984,46 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "לא היתה אפשרות לאמת את זהות משתמש זה."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "מחליף מפתח פרטי עם איש קשר."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "ההודעות שלך אינן מוצפנות עוד"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr "ההודעות שלך מוצפנות כעת אך זהות האיש קשר שלך טרם אומתה."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "זהות האיש קשר שלך אומתה."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "האיש קשר סיים הצפנה בקצה שלהם, עליך לעשות זאת גם כן."
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "ההודעה שלך לא היתה יכולה להישלח"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "אנחנו קיבלנו הודעה לא מוצפנת"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "אנחנו קיבלנו הודעה מוצפנת לא קריאה"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1021,7 +1044,7 @@ msgstr ""
 "היה ואימתת כי טביעות האצבע תואמות, לחץ אישור (OK), אחרת לחץ ביטול (Cancel)."
 
 # הקצה השני
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1034,58 +1057,58 @@ msgstr ""
 "האיש קשר יתבקש עובר זאת לאותה שאלת אבטחה ואם אלו יקלידו את אותה התשובה "
 "במדויק (case sensitive), זהותם תאומת."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "מהי שאלת האבטחה שלך?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "מהי התשובה לשאלת האבטחה?"
 
 # תרשים
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "סופקה סכימת אימות שגויה"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr "ההודעות שלך אינן מוצפנות. לחץ כאן כדי לאפשר OTR."
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "ההודעות שלך מוצפנות כעת, אך האיש קשר שלך טרם אומת."
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "ההודעות שלך מוצפנות כעת והאיש קשר שלך אומת."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "האיש קשר סגר את קצה ישיבה פרטית שלהם, עליך לעשות זאת גם כן"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "סיים ישיבה מוצפנת"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "רענן ישיבה מוצפנת"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "התחל ישיבה מוצפנת"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "אמת בעזרת טביעות אצבע"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "אמת בעזרת SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "מה זה?"
 
@@ -1095,180 +1118,203 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "לא מוצפנת"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "לא מאומתת"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "מאומתת"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "מוגמרת"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " למשל conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "שם מתחם של ספק XMPP שלך:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "משוך טופס הרשמה"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "טיפ: רשימה פומבית של ספקי XMPP הינה זמינה"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "כאן"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "הירשם"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 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:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "כעת מבקש טופס הרשמה מתוך שרת XMPP"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, 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:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "כעת מחבר אותך פנימה"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "נרשם בהצלחה"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "חזור"
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "לחץ כדי לפתוח את חדר זה"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "חדר פתוח"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
+
 # איש קשר זה הינו
-#: src/converse-rosterview.js:84
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "איש קשר זה עסוק"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "איש קשר זה מקוון"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "איש קשר זה אינו מקוון"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "איש קשר זה לא זמין"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "איש קשר זה נעדר למשך זמן ממושך"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "איש קשר זה הינו נעדר"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "קבוצות"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "האנשי קשר שלי"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "אנשי קשר ממתינים"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "בקשות איש קשר"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "ללא קבוצה"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "לחץ כדי להסיר את איש קשר זה"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "לחץ כדי לקבל את בקשת איש קשר זה"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "לחץ כדי לסרב את בקשת איש קשר זה"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "לחץ כדי לשוחח עם איש קשר זה"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "שם"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
 
diff --git a/locale/hu/LC_MESSAGES/converse.po b/locale/hu/LC_MESSAGES/converse.po
index a89b91194..746700754 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,330 +20,343 @@ msgstr ""
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.5\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Ment"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 #, 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:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "További információk a csevegőszobáról"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "További információk a csevegőszobáról"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "A csevegés bezárása"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Személyes üzenet"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "Én"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "gépel..."
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "már nem gépel"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "távol van"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Mutasd a menüt"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "kijelentkezett"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "elfoglalt"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Hangulatjel beszúrása"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Hívás indítása"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Kattintson ide a névtelen bejelentkezéshez"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Belépés"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "felhasznalo@szerver"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "jelszó"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "%1$s vagyok"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Egyedi státusz üzenet írása"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Saját státusz beállítása"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Egyedi státusz"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "elérhető"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "elfoglalt"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "hosszú ideje távol"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "távol"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "nem elérhető"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Foglalt"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Távol"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Kilépés"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:616
+msgid "Click to add new chat contacts"
+msgstr "Új csevegőpartner hozzáadása"
+
+#: src/converse-controlbox.js:617
+msgid "Add a contact"
+msgstr "Új partner felvétele"
+
+#: src/converse-controlbox.js:652
 msgid "Contact name"
 msgstr "Partner neve"
 
-#: src/converse-controlbox.js:609
+#: src/converse-controlbox.js:653
 msgid "Search"
 msgstr "Keresés"
 
-#: src/converse-controlbox.js:613
+#: src/converse-controlbox.js:657
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "pl. felhasznalo@pelda.hu"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:658
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/converse-controlbox.js:619
-msgid "Click to add new chat contacts"
-msgstr "Új csevegőpartner hozzáadása"
-
-#: src/converse-controlbox.js:620
-msgid "Add a contact"
-msgstr "Új partner felvétele"
-
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Nincs felhasználó"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Felvétel a csevegőpartnerek közé"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Csevegőablak"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Kapcsolódás"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Hiba történt az adatok mentése közben."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Azonosítási hiba"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Kapcsolódási hiba"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Hiba történt az adatok mentése közben."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "Sajnáljuk, hiba történt a hozzáadás során"
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 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:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "A csevegő partnerek elrejtése"
 
@@ -352,73 +365,73 @@ msgstr "A csevegő partnerek elrejtése"
 msgid "Close this box"
 msgstr "A csevegés bezárása"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "A csevegés minimalizálása"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "A csevegés visszaállítása"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimalizálva"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Ez a szoba mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Ez a szoba nem mutatja az elérhetetlen tagokat"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "A szoba általános konfigurációja módosult"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "A szobába a belépés lehetséges"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "A szobába a belépés szünetel"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ez a szoba most NEM névtelen"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Ez a szoba most félig névtelen"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Ez a szoba most teljesen névtelen"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Létrejött egy új csevegőszoba"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Ki lettél tíltva ebből a szobából"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Ki lettél dobva ebből a szobából"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -426,7 +439,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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -444,461 +457,467 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "A szobából kitíltva: %1$s"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s beceneve módosult"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "A szobából kidobva: %1$s"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, 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:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, 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:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Üzenet"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "A résztvevők listájának elrejtése"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Hiba: a \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Hiba: A parancs nem értelmezett"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "A felhasználó adminisztrátorrá tétele"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Felhasználó kitíltása a csevegőszobából"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "A felhasználó taggá tétele"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Felhasználó kiléptetése a csevegőszobából"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Tagság megadása a felhasználónak"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "A felhasználó nem küldhet üzeneteket"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Moderátori jog adása a felhasználónak"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "A szoba tulajdonjogának megadása"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Tagság megvonása a felhasználótól"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Csevegőszoba téma beállítása"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Elnémított felhasználók is küldhetnek üzeneteket"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Becenév"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "A csevegőszobába belépéshez jelszó szükséges"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Jelszó: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Küldés"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, 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:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Az indok: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Az indok: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, 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:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nem lett megadva becenév"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Nem lehet új csevegőszobát létrehozni"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ez a szoba (még) nem létezik"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, 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:1913
+#: src/converse-muc.js:1991
+#, 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:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Ez a felhasználó egy moderátor"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, 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:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Jelenlevők"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Meghívás"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderált"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "NEM névtelen"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Jelszó: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Nyílvános"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Félig névtelen"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Moderálatlan"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, 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:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Ez a felhasználó egy moderátor"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, 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:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ez a szoba NEM névtelen"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, 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:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 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:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Szoba neve"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Szerver"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Csatlakozás"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Létező szobák"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 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:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Nincs csevegőszoba a(z) %1$s szerveren"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Csevegőszobák a(z) %1$s szerveren:"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Leírás:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Szerver"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Jelenlevők:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Azonosítás szükséges"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Meghívás szükséges"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Állandó szoba"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -906,11 +925,13 @@ msgstr "%1$s meghívott a(z) %2$s csevegőszobába. Indok: \"%3$s\""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -923,19 +944,20 @@ msgstr "kijelentkezett"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Titkosított kapcsolat újraépítése"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Privát kulcs generálása"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Előfordulhat, hogy a böngésző futása megáll."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -950,47 +972,48 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "A felhasználó ellenőrzése sikertelen."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Privát kulcs cseréje..."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Az üzenetek mostantól már nem titkosítottak"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 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:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "A csevegőpartnere hitelesítve lett."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Az üzenet elküldése nem sikerült"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Titkosítatlan üzenet érkezett"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Visszafejthetetlen titkosított üzenet érkezett"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1011,7 +1034,7 @@ msgstr ""
 "Amennyiben az ujjlenyomatok biztosan egyeznek, klikkeljen az OK, ellenkező "
 "esetben a Mégse gombra."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1024,57 +1047,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:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Mi legyen a biztonsági kérdés?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Mi a válasz a biztonsági kérdésre?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Érvénytelen hitelesítési séma."
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Az üzenetek titikosítottak és a csevegőpartnere hitelesített."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Titkosított kapcsolat vége"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "A titkosított kapcsolat frissítése"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Titkosított beszélgetés indítása"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Ellenőrzés újjlenyomattal"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Ellenőrzés SMP-vel"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Mi ez?"
 
@@ -1084,47 +1107,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "titkosítatlan"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "nem hitelesített"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "hitelesített"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "befejezett"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr "pl. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Az XMPP szolgáltató domain neve:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Regisztrációs űrlap"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 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:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "itt"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1132,11 +1155,12 @@ 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:272
+#: src/converse-register.js:280
 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:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1144,19 +1168,19 @@ msgstr ""
 "Hiba történt a(z) \"%1$s\" kapcsolódásakor. Biztos benne, hogy ez létező "
 "kiszolgáló?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "Belépés..."
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Sikeres regisztráció"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Visza"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1164,103 +1188,125 @@ 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Belépés a csevegőszobába"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Nyitott szoba"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+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:85
 msgid "This contact is busy"
 msgstr "Elfoglalt"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Elérhető"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Nincs bejelentkezve"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Elérhetetlen"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Hosszabb ideje távol"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Távol"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Csoportok"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Kapcsolataim"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Függőben levő kapcsolatok"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Kapcsolatnak jelölés"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Nincs csoportosítva"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Partner törlése"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Partner felvételének elfogadása"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Partner felvételének megtagadása"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Csevegés indítása ezzel a partnerünkkel"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Név"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 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:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "Sajnáljuk, hiba történt a törlés során"
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 
diff --git a/locale/id/LC_MESSAGES/converse.po b/locale/id/LC_MESSAGES/converse.po
index 7b40926dd..d972d36ed 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,339 +17,352 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Simpan"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Tampilkan informasi ruangan ini"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Tampilkan informasi ruangan ini"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Hapus pesan"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "saya"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Tampilkan menu ini"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Hapus pesan"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "sibuk"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Teman"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Masuk"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Saya %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Klik untuk menulis status kustom"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Klik untuk mengganti status"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Status kustom"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "terhubung"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "sibuk"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "lama tak di tempat"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "tak di tempat"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Terhubung"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Sibuk"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Pergi"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nama teman"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Cari"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Tambah"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Klik untuk menambahkan teman baru"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Tambah teman"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nama teman"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Cari"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Tambah"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Pengguna tak ditemukan"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Klik untuk menambahkan sebagai teman"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "Menyambung"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Gagal Menyambung"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Kesalahan terjadi saat menyimpan formulir ini."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Menyambung"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Melakukan otentikasi"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Otentikasi gagal"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Gagal Menyambung"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Kesalahan terjadi saat menyimpan formulir ini."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik untuk menghapus teman ini"
@@ -359,74 +372,74 @@ msgstr "Klik untuk menghapus teman ini"
 msgid "Close this box"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Ruangan ini menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Ruangan ini tidak menampilkan anggota yang tak tersedia"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Konfigurasi ruangan yang tak berhubungan dengan privasi telah diubah"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Pencatatan di ruangan ini sekarang dinyalakan"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Pencatatan di ruangan ini sekarang dimatikan"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ruangan ini sekarang tak-anonim"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Ruangan ini sekarang semi-anonim"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Ruangan ini sekarang anonim"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Ruangan baru telah dibuat"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Anda telah dicekal dari ruangan ini"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Anda telah ditendang dari ruangan ini"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -434,7 +447,7 @@ msgstr ""
 "Anda telah dihapus dari ruangan ini karena ruangan ini hanya terbuka untuk "
 "anggota dan anda bukan anggota"
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -452,466 +465,473 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s telah dicekal"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s telah dicekal"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s telah ditendang keluar"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Pesan"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 #, 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Larang pengguna dari ruangan"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Tendang pengguna dari ruangan"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Setel topik ruangan"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Nama panggilan"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Kata sandi: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Kirim"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Nama panggilan anda telah diubah"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Anda bukan anggota dari ruangan ini"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Anda telah dicekal dari ruangan ini"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nama panggilan belum ditentukan"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Anda tak diizinkan untuk membuat ruangan baru"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ruangan ini belum dibuat"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topik diganti oleh %1$s menjadi: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Pengguna ini adalah moderator"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Pengguna ini dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 #, fuzzy
 msgid "Occupants"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Dimoderasi"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Tidak anonim"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Kata sandi: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Umum"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi-anonim"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Tak dimoderasi"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Pengguna ini adalah moderator"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Ruangan ini membutuhkan kata sandi"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nama ruangan"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "Ikuti"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Perlihatkan ruangan"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Ruangan"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Tak ada ruangan di %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Ruangan di %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Membutuhkan otentikasi"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Membutuhkan undangan"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Ruangan permanen"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -919,11 +939,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -936,20 +958,20 @@ msgstr "Teman ini tidak terhubung"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Menyambung kembali sesi terenkripsi"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:189
-#, fuzzy
+#: src/converse-otr.js:187
+#, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -965,19 +987,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Tak dapat melakukan verifikasi identitas pengguna ini."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Pesan anda tidak lagi terenkripsi"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -986,31 +1008,32 @@ msgstr ""
 "Pesan anda sekarang terenkripsi, namun identitas teman anda belum dapat "
 "diverifikasi."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Identitas teman anda telah diverifikasi."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Pesan anda tak dapat dikirim"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Kami menerima pesan terenkripsi"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Kami menerima pesan terenkripsi yang gagal dibaca"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1032,7 +1055,7 @@ msgstr ""
 "Jika anda bisa mengkonfirmasi sidik jadi cocok, klik Lanjutkan, jika tidak "
 "klik Batal."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1048,34 +1071,34 @@ msgstr ""
 "jawaban yang sama (huruf kapital diperhatikan), identitas mereka "
 "diverifikasi."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Apakah pertanyaan keamanan anda?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Apa jawaban dari pertanyaan keamanan tersebut?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Skema otentikasi salah"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 #, 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:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Pesan anda terenkripsi dan teman anda telah diverifikasi."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
@@ -1084,27 +1107,27 @@ msgstr ""
 "Teman anda telah mematikan sesi terenkripsi, dan anda juga sebaiknya "
 "melakukan hal yang sama"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Sudahi percakapan terenkripsi"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Setel ulang percakapan terenkripsi"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Mulai sesi terenkripsi"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verifikasi menggunakan sidik jari"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verifikasi menggunakan SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Apakah ini?"
 
@@ -1114,180 +1137,201 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "tak dienkripsi"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "tak diverifikasi"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "diverifikasi"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "selesai"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Klik untuk membuka ruangan ini"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Ruangan terbuka"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Klik untuk menghapus teman ini"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Teman ini sedang sibuk"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Teman ini terhubung"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Teman ini tidak tersedia"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Teman ini tidak di tempat untuk waktu yang lama"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Teman saya"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Teman yang menunggu"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Permintaan pertemanan"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Klik untuk mulai perbinjangan dengan teman ini"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik untuk menghapus teman ini"
diff --git a/locale/it/LC_MESSAGES/converse.po b/locale/it/LC_MESSAGES/converse.po
index 6d6397d64..e86ca6391 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,82 +23,96 @@ msgstr ""
 "lang: it\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr "Salva questa stanza"
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr "Nome per questo bookmark:"
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 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:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr "Qual è il nickname per questa stanza?"
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Salva"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Si è verificato un errore nel salvataggio del bookmark."
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 msgid "Click to toggle the bookmarks list"
 msgstr "Clicca per aprire/chiudere la lista bookmarks"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+#, fuzzy
+msgid "Bookmarks"
 msgstr "Stanza Salvate"
 
-#: src/converse-bookmarks.js:394
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
-msgstr "Clicca per aprire questa stanza"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
+msgstr "Chiudi e lascia questa stanza"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Mostra più informazioni su questa stanza"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr "Rimuovi questo bookmark"
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Salva questa stanza"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Mostra più informazioni su questa stanza"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Clicca per aprire questa stanza"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr "Hai messaggi non letti"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Chiudi questa chat"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Messaggio personale"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "me"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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."
@@ -107,239 +121,240 @@ msgstr ""
 "attacco destinato a degradare le performance della chat. L'output è stato "
 "accorciato."
 
-#: src/converse-chatview.js:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "sta scrivendo"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "si è allontanato"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Mostra questo menu"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Rimuovi messaggi"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "è andato offline"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "è occupato"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Pulisci tutti i messaggi"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Inserisci uno smiley"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Inizia una chiamata"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Clicca per entrare anonimo"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Entra"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr "Username"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "Password"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Accesso"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Sono %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Clicca qui per scrivere un messaggio di stato personalizzato"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Clicca per cambiare il tuo stato"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Stato personalizzato"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "in linea"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "occupato"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "assente da molto"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "assente"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "offline"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "In linea"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Occupato"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Assente"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Non in linea"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Logo out"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nome del contatto"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Cerca"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr "es. user@example.org"
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Aggiungi"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Clicca per aggiungere nuovi contatti alla chat"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Aggiungi contatti"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nome del contatto"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Cerca"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr "es. user@example.org"
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Aggiungi"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Nessun utente trovato"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Clicca per aggiungere il contatto alla chat"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Attiva/disattiva chat"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Riconnessione"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr "La connessione è caduta, attendi la riconnessione."
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 msgid "An error occurred while connecting to the chat server."
 msgstr "Si è verificato un errore durante la connessione al server."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Autenticazione in corso"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 msgid "Connection failed"
 msgstr "Errore di connessione"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Si è verificato un errore durante la connessione al server. "
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "Si è verificato un errore durante il tentativo di aggiunta "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Questo client non consente sottoscrizioni di presenza"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Clicca per nascondere questi contatti"
 
@@ -347,79 +362,79 @@ msgstr "Clicca per nascondere questi contatti"
 msgid "Close this box"
 msgstr "Chiudi questo box"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Riduci questo chat box"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Clicca per ripristinare questa chat"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Ridotto"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Questa stanza non è anonima"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Questa stanza mostra i membri non disponibili al momento"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Questa stanza non mostra i membri non disponibili"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr "La configurazione della stanza è cambiata"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "La registrazione è abilitata nella stanza"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "La registrazione è disabilitata nella stanza"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 msgid "This room is now no longer anonymous"
 msgstr "Questa stanza è non-anonima"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Questa stanza è semi-anonima"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Questa stanza è completamente-anonima"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Una nuova stanza è stata creata"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Sei stato bandito da questa stanza"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Sei stato espulso da questa stanza"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -437,435 +452,448 @@ 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:286
+#: src/converse-muc.js:308
+#, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s è stato bannato"
 
-#: src/converse-muc.js:287
+#: src/converse-muc.js:309
+#, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s nickname è cambiato"
 
-#: src/converse-muc.js:288
+#: src/converse-muc.js:310
+#, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s è stato espulso"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, 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:290
+#: src/converse-muc.js:312
+#, 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:294
+#: src/converse-muc.js:316
+#, 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:295
+#: src/converse-muc.js:317
+#, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Il tuo nickname è stato cambiato: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 msgid "Close and leave this room"
 msgstr "Chiudi e lascia questa stanza"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 msgid "Configure this room"
 msgstr "Configura questa stanza"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Nascondi la lista degli occupanti"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Errore: il \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Errore: impossibile eseguire il comando"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Bandisci utente dalla stanza"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Espelli utente dalla stanza"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Rimuovi la possibilità di inviare messaggi all'utente"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Cambia il tuo nickname"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr ""
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 msgid "Set room subject"
 msgstr "Cambia oggetto della stanza"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr "Imposta oggetto della stanza (alias per /subject)"
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Abilita l'utente mutato ad inviare nuovamente messaggi"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 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:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr "Scegli il tuo nickname"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 msgid "Enter room"
 msgstr "Entra nella stanza"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Questa stanza richiede una password"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Password: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Invia"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Questa azione è stata fatta da %1$s."
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "La ragione data è: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "La ragione data è: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr " ha lasciato la stanza. \""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 msgid " has left the room"
 msgstr " ha lasciato la stanza"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr " è entrato nella stanza. \""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr " è entrato nella stanza."
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Sei stato bandito da questa stanza"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nessun soprannome specificato"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Non ti è permesso creare nuove stanze"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Questa stanza non esiste (per ora)"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, 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:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic impostato da %1$s a: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 msgid "Click to mention "
 msgstr "Clicca per citare "
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr "Questo utente è un moderatore."
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr "Questo utente può inviare messaggi in questa stanza."
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 msgid "This user can NOT send messages in this room."
 msgstr "Questo utente NON può inviare messaggi in questa stanza."
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Occupanti"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Invita"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 msgid "Features"
 msgstr "Impostazioni"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr "Archivio Messaggi"
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr "Solo membri"
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderata"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Non-anonima"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 msgid "Open"
 msgstr "Aperta"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 msgid "Password protected"
 msgstr "Con Password"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr "Persistente"
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Pubblica"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi-anonima"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 msgid "Temporary"
 msgstr "Temporanea"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Non moderata"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr "Non Sicura"
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Questa stanza non è pubblica"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr "Messaggi sono archiviati sul server"
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 msgid "This room is restricted to members only"
 msgstr "Questa stanza è ristretta ai soli membri"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 msgid "This room is being moderated"
 msgstr "Questa stanza è moderata"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr "Tutti gli occupanti della stanza possono vedere il tuo Jabber ID"
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 msgid "Anyone can join this room"
 msgstr "Chiunque può collegarsi a questa stanza"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 msgid "This room requires a password before entry"
 msgstr "Questa stanza richiede una password"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "La stanza è nella lista delle ricerche pubbliche"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr "Solo il moderatore può vedere il tuo Jabber ID"
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 msgid "This room is not being moderated"
 msgstr "Questa stanza non è moderata"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 msgid "This room does not require a password upon entry"
 msgstr "Questa stanza non richiede una password"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 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:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nome stanza"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Entra nella Stanza"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Mostra stanze"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Stanze"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Nessuna stanza su %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Stanze su %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Utenti presenti:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Funzionalità:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Richiede autenticazione"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Richiede un invito"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Stanza aperta"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Stanza permanente"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Stanza temporanea"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -875,11 +903,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr "Notifica da %1$s"
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr "%1$s dice"
 
@@ -891,19 +921,20 @@ msgstr "è online"
 msgid "wants to be your contact"
 msgstr "vuole essere un tuo contatto"
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Ristabilisci sessione criptata"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Generazione chiave private in corso."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Il tuo browser potrebbe bloccarsi."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -913,19 +944,19 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Non posso verificare l'identità dell'utente."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Scambio la chiave privata col contatto."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "I tuoi messaggi non sono più criptati"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -933,27 +964,28 @@ msgstr ""
 "I tuoi messaggi sono ora criptati ma l'identità del tuo contatto non è "
 "verificata."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "L'identità del contatto è verificata."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Il tuo messaggio non può essere spedito"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Abbiamo ricevuto un messaggio non criptato"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Abbiamo ricevuto un messaggio criptato non leggibile"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -966,7 +998,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -975,58 +1007,58 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Qual è la tua domanda di sicurezza?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Qual è la risposta alla domanda di sicurezza?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Schema di autenticazione non valido"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Il tuoi messaggi sono criptati e il tuo contatto verificato."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Fine della conversazione criptata"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Aggiorna conversazione criptata"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Inizio conversazione criptata"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verifica con fingerprints"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verifica con SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Che cos'è?"
 
@@ -1036,47 +1068,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "non criptato"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "non verificato"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verificato"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "finito"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " es. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Nome del dominio del provider XMPP:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Modulo di registrazione"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Suggerimento: È disponibile un elenco di provider XMPP pubblici"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "qui"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Registra"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1084,11 +1116,12 @@ msgstr ""
 "Siamo spiacenti, il provider specificato non supporta la registrazione di "
 "account. Si prega di provare con un altro provider."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Sto richiedendo un modulo di registrazione al server XMPP"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1096,19 +1129,19 @@ msgstr ""
 "Qualcosa è andato storto durante la connessione con “%1$s”. Sei sicuro che "
 "esiste?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Registrazione riuscita"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Ritorna"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1116,103 +1149,125 @@ msgstr ""
 "Il provider ha respinto il tentativo di registrazione. Controlla i dati "
 "inseriti."
 
-#: src/converse-register.js:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Clicca per aprire/chiudere la lista bookmarks"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Stanza aperta"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+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:85
 msgid "This contact is busy"
 msgstr "Questo contatto è occupato"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Questo contatto è online"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Questo contatto è offline"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Questo contatto non è disponibile"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Il contatto è away da un lungo periodo"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Questo contatto è away"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Gruppi"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "I miei contatti"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Contatti in attesa"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Richieste dei contatti"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Senza Gruppo"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr "Filtri"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr "Stato"
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr "Ogni"
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr "Away estesa"
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Clicca per rimuovere questo contatto"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, 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:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, 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:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Clicca per parlare con questo contatto"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Nome"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Sei sicuro di voler rimuovere questo contatto?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "Si è verificato un errore durante il tentativo di rimozione "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 
diff --git a/locale/ja/LC_MESSAGES/converse.po b/locale/ja/LC_MESSAGES/converse.po
index c1ba12eb2..b4bce28f5 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,339 +17,352 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "この談話室についての詳細を見る"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "この談話室についての詳細を見る"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "メッセージを削除"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "私"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "このメニューを表示"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "第三者に書く"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "メッセージを削除"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "取り込み中"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "相手先"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "サインイン"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "私はいま %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "状況メッセージを入力するには、ここをクリック"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "クリックして、在席状況を変更"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "独自の在席状況"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "在席"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "不在"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "オンライン"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "名前"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "検索"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "追加"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "クリックして新しいチャットの相手先を追加"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "相手先を追加"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "名前"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "検索"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "追加"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "ユーザーが見つかりません"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "クリックしてチャットの相手先として追加"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "接続中です"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "接続に失敗しました"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "フォームを保存する際にエラーが発生しました。"
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "接続中です"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "認証に失敗"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "接続に失敗しました"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "フォームを保存する際にエラーが発生しました。"
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "クリックしてこの相手先を削除"
@@ -359,74 +372,74 @@ msgstr "クリックしてこの相手先を削除"
 msgid "Close this box"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "この談話室はメンバー以外にも見えます"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "この談話室はメンバー以外には見えません"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "談話室の設定(プライバシーに無関係)が変更されました"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "談話室の記録を取りはじめます"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "談話室の記録を止めます"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "この談話室はただいま非匿名です"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "この談話室はただいま半匿名です"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "この談話室はただいま匿名です"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "この談話室から締め出されました"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "この談話室から蹴り出されました"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "分掌の変更のため、この談話室から削除されました"
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -434,7 +447,7 @@ msgstr ""
 "談話室がメンバー制に変更されました。メンバーではないため、この談話室から削除"
 "されました"
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -451,466 +464,473 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s を締め出しました"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s を締め出しました"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s を蹴り出しました"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "分掌の変更のため、%1$s を削除しました"
 
-#: src/converse-muc.js:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "メンバーでなくなったため、%1$s を削除しました"
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "ユーザーを談話室から締め出す"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "ユーザーを談話室から蹴り出す"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "第三者に書く"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "談話室の話題を設定"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "パスワード:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "送信"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "ニックネームを変更しました"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "この談話室のメンバー一覧にいません"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "この談話室から締め出されました"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "ニックネームがありません"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "新しい談話室を作成する権限がありません"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "ニックネームがこの談話室のポリシーに従っていません"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "この談話室は存在しません"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "この談話室は入室者数の上限に達しています"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s が話題を設定しました: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "このユーザーは司会者です"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "このユーザーはこの談話室で発言できます"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "このユーザーはこの談話室で発言できません"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 #, fuzzy
 msgid "Occupants"
 msgstr "入室者:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "特徴:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "非表示"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "発言制限"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "パスワード:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "公開談話室"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "発言制限なし"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "この談話室は入室者数の上限に達しています"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "このユーザーは司会者です"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "この談話室にはパスワードが必要です"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "談話室の名前"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "サーバー"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "入室"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "談話室一覧を見る"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "談話室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "%1$s に談話室はありません"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "%1$s の談話室一覧"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "説明: "
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "サーバー"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "入室者:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "特徴:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "認証の要求"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "招待の要求"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "常設談話室"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -918,11 +938,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -935,20 +957,20 @@ msgstr "この相手先はオフラインです"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "暗号化セッションの再接続"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:189
-#, fuzzy
+#: src/converse-otr.js:187
+#, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -963,19 +985,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "このユーザーの本人性を検証できませんでした。"
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "メッセージはもう暗号化されません"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -983,29 +1005,30 @@ msgid ""
 msgstr ""
 "メッセージは暗号化されますが、相手が本人であることは検証されていません。"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "相手の本人性を検証しました。"
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "相手は、暗号化を終了しました。あなたもそれに合わせる必要があります。"
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "メッセージを送信できませんでした"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "暗号化されていないメッセージを受信しました"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "読めない暗号化メッセージを受信しました"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1026,7 +1049,7 @@ msgstr ""
 "確認して、鍵指紋が正しければ「OK」を、正しくなければ「キャンセル」をクリック"
 "してください。"
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1040,62 +1063,62 @@ msgstr ""
 "相手にも、同じ質問が表示され、正しく同じ答(大文字・小文字は区別されます)を入"
 "力することで、本人性を検証します。"
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "秘密の質問はなんですか?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "秘密の質問の答はなんですか?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "認証の方式が正しくありません"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "メッセージは暗号化されません。OTR 暗号化を有効にするにはここをクリックしてく"
 "ださい。"
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "メッセージは暗号化されますが、相手は検証されていません。"
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "メッセージは暗号化され、相手も検証されています。"
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "相手は私信を終了しました。あなたも同じようにしてください"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "暗号化された会話を終了"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "暗号化された会話をリフレッシュ"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "暗号化された会話を開始"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "鍵指紋で検証"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "SMP で検証"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "これは何ですか?"
 
@@ -1105,180 +1128,201 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "暗号化されていません"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "検証されていません"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "検証されました"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "完了"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "クリックしてこの談話室を開く"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "開放談話室"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "クリックしてこの相手先を削除"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "この相手先は取り込み中です"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "この相手先は在席しています"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "この相手先は不通です"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "この相手先は不在です"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "相手先一覧"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "保留中の相手先"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "会話に呼び出し"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "クリックしてこの相手先とチャット"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "クリックしてこの相手先を削除"
diff --git a/locale/nb/LC_MESSAGES/converse.po b/locale/nb/LC_MESSAGES/converse.po
index 5a043b657..426cd6d71 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,335 +18,348 @@ msgstr ""
 "lang: nb\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Lagre"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Vis mer informasjon om dette rommet"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Vis mer informasjon om dette rommet"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Fjern meldinger"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Personlig melding"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "meg"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "skriver"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "har stoppet å skrive"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "Kontakten er borte"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Viser denne menyen"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Fjern meldinger"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "opptatt"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Fjern alle meldinger"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Start en samtale"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Logg inn"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Innlogging"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Jeg er %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Klikk her for å skrive en personlig statusmelding"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Klikk for å endre din meldingsstatus"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Personlig status"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "pålogget"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "opptatt"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "borte lenge"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "borte"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Opptatt"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Borte"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Logg Av"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Kontaktnavn"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Søk"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Legg Til"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Klikk for å legge til nye meldingskontakter"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Legg til en Kontakt"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Kontaktnavn"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Søk"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Legg Til"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Ingen brukere funnet"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Klikk for å legge til som meldingskontakt"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Endre chatten"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Kobler til igjen"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Kobler til"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "En feil skjedde under lagring av skjemaet."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Godkjenner"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Godkjenning mislyktes"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Kobler til"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "En feil skjedde under lagring av skjemaet."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Klikk for å skjule disse kontaktene"
 
@@ -355,73 +368,73 @@ msgstr "Klikk for å skjule disse kontaktene"
 msgid "Close this box"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Klikk for å gjenopprette denne samtalen"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimert"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Dette rommet viser nå utilgjengelige medlemmer"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Dette rommet viser ikke utilgjengelige medlemmer"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Ikke-personvernsrelatert romkonfigurasjon har blitt endret"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Romlogging er nå aktivert"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Romlogging er nå deaktivert"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Dette rommet er nå ikke-anonymt"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Dette rommet er nå semi-anonymt"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Dette rommet er nå totalt anonymt"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt opprettet"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Du har blitt utestengt fra dette rommet"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Du ble kastet ut av dette rommet"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -429,7 +442,7 @@ msgstr ""
 "Du har blitt fjernet fra dette rommet fordi rommet nå kun tillater "
 "medlemmer, noe du ikke er."
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -447,466 +460,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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s  har blitt utestengt"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s sitt kallenavn er endret"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s  ble kastet ut"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, 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:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, 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:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Melding"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Feil: kunne ikke utføre kommandoen"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Utesteng bruker fra rommet"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Kast ut bruker fra rommet"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Fjern brukerens muligheter til å skrive meldinger"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Du er ikke på medlemslisten til dette rommet"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Endre rommets emne"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Tillat stumme brukere å skrive meldinger"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Kallenavn"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Passord:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Send"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ditt kallenavn har blitt endret til %1$s "
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Årsaken som er oppgitt er: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Årsaken som er oppgitt er: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Du har blitt utestengt fra dette rommet"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Ingen kallenavn var spesifisert"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Du har ikke tillatelse til å opprette nye rom"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Dette rommet eksisterer ikke (enda)"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Dette rommet har nådd maksimalt antall brukere"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, 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:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Denne brukeren er moderator"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Denne brukeren kan skrive meldinger i dette rommet"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Invitér"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderert"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Ikke-Anonym"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Passord:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Alle"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi-anonymt"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Umoderert"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Dette rommet har nådd maksimalt antall brukere"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Denne brukeren er moderator"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Dette rommet krever et passord"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 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:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Romnavn"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "Koble til"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Vis Rom"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Rom"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Ingen rom på %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Rom på %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Krever Godkjenning"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Krever en invitasjon"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Permanent Rom"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -916,11 +935,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -933,19 +954,20 @@ msgstr "Kontakten er avlogget"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Gjenopptar kryptert økt"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Genererer privat nøkkel"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Din nettleser kan bli uresponsiv"
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -961,19 +983,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Kunne ikke bekrefte denne brukerens identitet"
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Bytter private nøkler med kontakt"
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Dine meldinger er ikke kryptert lenger."
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -981,28 +1003,29 @@ msgstr ""
 "Dine meldinger er nå krypterte, men identiteten til din kontakt har ikke "
 "blitt verifisert."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "Din kontakts identitet har blitt verifisert."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Beskjeden din kunne ikke sendes"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Vi mottok en ukryptert beskjed"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Vi mottok en uleselig melding"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1024,7 +1047,7 @@ msgstr ""
 "Om du har bekreftet at avtrykkene matcher, klikk OK. I motsatt fall, trykk "
 "Avbryt."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1039,59 +1062,59 @@ msgstr ""
 "nøyaktig samme svaret (det er forskjell på små og store bokstaver), vil "
 "identiteten verifiseres."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Hva er ditt Sikkerhetsspørsmål?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Hva er svaret på ditt Sikkerhetsspørsmål?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Du har vedlagt en ugyldig godkjenningsplan."
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Dine meldinger er krypterte og din kontakt er verifisert."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Avslutt kryptert økt"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Last inn kryptert samtale på nytt"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Start en kryptert samtale"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verifiser med Avtrykk"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verifiser med SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Hva er dette?"
 
@@ -1101,47 +1124,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "ukryptertß"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "uverifisert"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verifisert"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "ferdig"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Din XMPP-tilbyders domenenavn:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Hent registreringsskjema"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tips: En liste med offentlige XMPP-tilbydere er tilgjengelig"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "her"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Registrér deg"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1149,11 +1172,12 @@ msgstr ""
 "Beklager, den valgte tilbyderen støtter ikke in band kontoregistrering. "
 "Vennligst prøv igjen med en annen tilbyder. "
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Spør etter registreringsskjema fra XMPP-tjeneren"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1161,122 +1185,144 @@ msgstr ""
 "Noe gikk galt under etablering av forbindelse med \"%1$s\". Er du sikker på "
 "at denne eksisterer?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "Logger deg inn"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Registrering var vellykket"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Tilbake"
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Klikk for å åpne dette rommet"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Åpent Rom"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+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:85
 msgid "This contact is busy"
 msgstr "Denne kontakten er opptatt"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Kontakten er pålogget"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Kontakten er utilgjengelig"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Kontakten er borte for en lengre periode"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Kontakten er borte"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Grupper"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Mine Kontakter"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Kontakter som venter på godkjenning"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Kontaktforespørsler"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Ugrupperte"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Klikk for å fjerne denne kontakten"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Klikk for å Godta denne kontaktforespørselen"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Klikk for å avslå denne kontaktforespørselen"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Klikk for å chatte med denne kontakten"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 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:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 
diff --git a/locale/nl/LC_MESSAGES/converse.po b/locale/nl/LC_MESSAGES/converse.po
index 2a23670ae..fa1ef6875 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,341 +22,354 @@ msgstr ""
 "lang: nl\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Klik om room te openen"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Toon meer informatie over deze room"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Klik om room te openen"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Toon meer informatie over deze room"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Klik om room te openen"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Verwijder bericht"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "ikzelf"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "Conact is afwezig"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Toon dit menu"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Verwijder bericht"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "Contact is offline"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "bezet"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Aanmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Ik ben %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om custom status bericht te maken"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Klik hier om status te wijzigen"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "bezet"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "afwezig lange tijd"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "afwezig"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Bezet"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Afwezig"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Contact naam"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Zoeken"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Toevoegen"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Klik om nieuwe contacten toe te voegen"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Voeg contact toe"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Contact naam"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Zoeken"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Toevoegen"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Geen gebruikers gevonden"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Klik om contact toe te voegen"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "Verbinden"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Verbinden mislukt"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Een error tijdens het opslaan van het formulier."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Authenticeren"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Authenticeren mislukt"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Verbinden mislukt"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Een error tijdens het opslaan van het formulier."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik om contact te verwijderen"
@@ -366,79 +379,79 @@ msgstr "Klik om contact te verwijderen"
 msgid "Close this box"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr ""
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr ""
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 msgid "The room configuration has changed"
 msgstr ""
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Deze room is nu niet annoniem"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Deze room is nu semie annoniem"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Deze room is nu volledig annoniem"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Een nieuwe room is gemaakt"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Je bent verbannen uit deze room"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Je bent uit de room gegooid"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -454,464 +467,473 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s is verbannen"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s is verbannen"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s has been kicked out"
 
-#: src/converse-muc.js:289
+#: src/converse-muc.js:311
+#, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr ""
 
-#: src/converse-muc.js:290
+#: src/converse-muc.js:312
+#, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr ""
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Bericht"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 #, 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Ban gebruiker van chatroom"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Goei gebruiker uit chatroom"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Je bent niet een gebruiker van deze room"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Zet chatroom topic"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Je nickname is veranderd"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Je bent verbannen uit deze room"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Geen nickname ingegeven"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Je bent niet toegestaan nieuwe rooms te maken"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Je nickname is niet conform policy"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Deze room bestaat niet"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Deze room heeft het maximale aantal gebruikers"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Dit is een moderator"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Deze gebruiker kan berichten sturen in deze room"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 #, fuzzy
 msgid "Occupants"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Functies:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Gemodereerd"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Niet annoniem"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Open room"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Wachtwoord: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi annoniem"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Niet gemodereerd"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Deze room heeft het maximale aantal gebruikers"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Dit is een moderator"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Chatroom heeft een wachtwoord"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Room naam"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "Deelnemen"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Toon rooms"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Rooms"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Geen room op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Room op %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Beschrijving"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Functies:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Verificatie vereist"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Veriest een uitnodiging"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Blijvend room"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -919,11 +941,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -936,19 +960,20 @@ msgstr "Contact is offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Bezig versleutelde sessie te herstellen"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr ""
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr ""
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -958,48 +983,49 @@ msgid ""
 "%2$s"
 msgstr ""
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Niet kon de identiteit van deze gebruiker niet identificeren."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr ""
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Je berichten zijn niet meer encrypted"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, 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:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Jou contact is geverifieerd"
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Je bericht kon niet worden verzonden"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "We ontvingen een unencrypted bericht "
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "We ontvangen een onleesbaar unencrypted bericht"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1012,7 +1038,7 @@ msgid ""
 "Cancel."
 msgstr ""
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1021,61 +1047,61 @@ msgid ""
 "exact same answer (case sensitive), their identity will be verified."
 msgstr ""
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Wat is jou sericury vraag?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Wat is het antwoord op de security vraag?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr ""
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 #, 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:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Jou bericht is encrypted en jou contact is geverifieerd."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 #, 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Beeindig encrypted gesprek"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Ververs encrypted gesprek"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Start encrypted gesprek"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr ""
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr ""
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Wat is dit?"
 
@@ -1085,180 +1111,201 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "ongecodeerde"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "niet geverifieerd"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "geverifieerd"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "klaar"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Klik om room te openen"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Open room"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Klik om contact te verwijderen"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Contact is bezet"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Contact is online"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Contact is offline"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Contact is niet beschikbaar"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Contact is afwezig voor lange periode"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Conact is afwezig"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Mijn contacts"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Conacten in afwachting van"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Contact uitnodiging"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Klik om te chatten met contact"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik om contact te verwijderen"
diff --git a/locale/pl/LC_MESSAGES/converse.po b/locale/pl/LC_MESSAGES/converse.po
index 8c554c779..662afbe56 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,328 +19,341 @@ 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:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Zachowaj"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 #, 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:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Pokaż więcej informacji o pokoju"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Kliknij aby wejść do pokoju"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Pokaż więcej informacji o pokoju"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Kliknij aby wejść do pokoju"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Zamknij okno rozmowy"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Wiadomość osobista"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "ja"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "pisze"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "przestał pisać"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "uciekł"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Pokaż menu"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Usuń wiadomości"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "wyłączył się"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "zajęty"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Wyczyść wszystkie wiadomości"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Wstaw uśmieszek"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Zadzwoń"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "Nazwa użytkownika XMPP:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Kliknij tutaj aby zalogować się anonimowo"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "użytkownik@serwer"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "hasło"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Jestem %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Kliknij aby wpisać nowy status"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Kliknij aby zmienić status rozmowy"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Własny status"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "dostępny"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "zajęty"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "dłużej nieobecny"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "nieobecny"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 msgid "offline"
 msgstr "rozłączony"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Dostępny"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Zajęty"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Nieobecny"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nazwa kontaktu"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Szukaj"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr "np. użytkownik@przykładowa-domena.pl"
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Kliknij aby dodać nowe kontakty"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Dodaj kontakt"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nazwa kontaktu"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Szukaj"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr "np. użytkownik@przykładowa-domena.pl"
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Dodaj"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Nie znaleziono użytkowników"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Kliknij aby dodać jako kontakt"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Przełącz rozmowę"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Przywracam połączenie"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Łączę się"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Wystąpił błąd w czasie próby zachowania formularza."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Autoryzuję"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powiodła się"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Łączę się"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Wystąpił błąd w czasie próby zachowania formularza."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "Wystąpił błąd w czasie próby dodania "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Klient nie umożliwia subskrybcji obecności"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Kliknij aby schować te kontakty"
 
@@ -348,73 +361,73 @@ msgstr "Kliknij aby schować te kontakty"
 msgid "Close this box"
 msgstr "Zamknij okno"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Zminimalizuj okno czatu"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Kliknij aby powrócić do rozmowy"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Zminimalizowany"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Pokój pokazuje niedostępnych rozmówców"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Ten pokój nie wyświetla niedostępnych członków"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Ustawienia pokoju nie związane z prywatnością zostały zmienione"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Zostało włączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Zostało wyłączone zapisywanie rozmów w pokoju"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Pokój stał się nieanonimowy"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Pokój stał się półanonimowy"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Jesteś niemile widziany w tym pokoju"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Zostałeś wykopany z pokoju"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -422,7 +435,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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -440,379 +453,381 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s został zbanowany"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s zmienił ksywkę"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s został wykopany"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, 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:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, 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:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Ukryj listę rozmówców"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Błąd: \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Błąd: nie potrafię uruchomić polecenia"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Przyznaj prawa administratora"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Zablokuj dostępu do pokoju"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Zmień prawa dostępu na zwykłego uczestnika"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Wykop z pokoju"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Przyznaj członkowstwo "
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Zablokuj człowiekowi możliwość rozmowy"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Zmień ksywkę"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Przyznaj prawa moderatora"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Uczyń właścicielem pokoju"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Usuń z listy członków"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Ustaw temat pokoju"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Pozwól uciszonemu człowiekowi na rozmowę"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 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:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr "Wybierz proszę ksywkę"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Ksywka"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 msgid "Enter room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Hasło:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Wyślij"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Twoja ksywka została zmieniona na: %1$s"
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Podana przyczyna to: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Podana przyczyna to: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, 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:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Jesteś niemile widziany w tym pokoju"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Nie podałeś ksywki"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, 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:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Ten pokój (jeszcze) nie istnieje"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Temat ustawiony przez %1$s na: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 msgid "This user is a moderator."
 msgstr "Ten człowiek jest moderatorem"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 msgid "This user can send messages in this room."
 msgstr "Ten człowiek może rozmawiać w niejszym pokoju"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 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:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Uczestników"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Zaproś"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderowany"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Nieanonimowy"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Hasło:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Publiczny"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Półanonimowy"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Niemoderowany"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Ten człowiek jest moderatorem"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Pokój nie jest anonimowy"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Pokój rozmów wymaga podania hasła"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -820,79 +835,83 @@ msgstr ""
 "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę "
 "zaproszenia."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nazwa pokoju"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Serwer"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Pokaż pokoje"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Pokoje"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Brak jest pokojów na %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Pokoje na %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Serwer"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Uczestnicy:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Wymaga autoryzacji"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Wymaga zaproszenia"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Stały pokój"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, 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:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -900,11 +919,13 @@ msgstr "%1$s zaprosił cię do pokoju: %2$s, podając następujący powód: \"%3
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr "Powiadomienie od %1$s"
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr "%1$s powiedział"
 
@@ -916,19 +937,20 @@ msgstr "połączył się"
 msgid "wants to be your contact"
 msgstr "chce być twoim kontaktem"
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Przywacam sesję szyfrowaną"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Generuję klucz prywatny."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Twoja przeglądarka może nieco zwolnić."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -943,19 +965,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Nie jestem w stanie zweryfikować tożsamości kontaktu."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Wymieniam klucze szyfrujące z kontaktem."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Twoje wiadomości nie są już szyfrowane"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
@@ -963,27 +985,28 @@ msgstr ""
 "Wiadomości są teraz szyfrowane, ale tożsamość kontaktu nie została "
 "zweryfikowana."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "Tożsamość kontaktu została zweryfikowana"
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Twoja wiadomość nie została wysłana"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Otrzymaliśmy niezaszyfrowaną wiadomość"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Otrzymaliśmy nieczytelną zaszyfrowaną wiadomość"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1005,7 +1028,7 @@ msgstr ""
 "Jeśli odciski palców zostały potwierdzone, kliknij OK, w inny wypadku "
 "kliknij Anuluj."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1019,59 +1042,59 @@ msgstr ""
 "jeśli udzieli tej samej odpowiedzi (ważna jest wielkość liter), tożsamość "
 "zostanie zweryfikowana."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Jakie jest pytanie bezpieczeństwa?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Jaka jest odpowiedź na pytanie bezpieczeństwa?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Niewłaściwy schemat autoryzacji"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 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:417
+#: src/converse-otr.js:415
 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:419
+#: src/converse-otr.js:417
 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Zakończ szyfrowaną rozmowę"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Odśwież szyfrowaną rozmowę"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Rozpocznij szyfrowaną rozmowę"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Zweryfikuj za pomocą odcisków palców"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Zweryfikuj za pomocą SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Co to jest?"
 
@@ -1081,47 +1104,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "nieszyfrowane"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "niezweryfikowane"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "zweryfikowane"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "zakończone"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr "np. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Domena twojego dostawcy XMPP:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Pobierz formularz rejestracyjny"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 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:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "tutaj"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1129,11 +1152,12 @@ msgstr ""
 "Przepraszamy, ale podany dostawca nie obsługuje rejestracji. Spróbuj wskazać "
 "innego dostawcę."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Pobieranie formularza rejestracyjnego z serwera XMPP"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1141,19 +1165,19 @@ msgstr ""
 "Coś nie zadziałało przy próbie połączenia z \"%1$s\". Jesteś pewien że "
 "istnieje?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "Jesteś logowany"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Szczęśliwie zarejestrowany"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Powrót"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1161,103 +1185,125 @@ msgstr ""
 "Dostawca odrzucił twoją próbę rejestracji. Sprawdź proszę poprawność danych "
 "które zostały wprowadzone."
 
-#: src/converse-register.js:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Kliknij aby wejść do pokoju"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Otwarty pokój"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Kontakt jest zajęty"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Kontakt jest połączony"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Kontakt jest niepołączony"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Kontakt jest niedostępny"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Kontakt jest nieobecny przez dłuższą chwilę"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Kontakt jest nieobecny"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Grupy"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Moje kontakty"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Kontakty oczekujące"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Zaproszenia do kontaktu"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Niezgrupowane"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr "Filtr"
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr "Stan"
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr "Dowolny"
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr "Gotowy do rozmowy"
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr "Dłuższa nieobecność"
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Kliknij aby usunąć kontakt"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, 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:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, 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:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Kliknij aby porozmawiać z kontaktem"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "Wystąpił błąd w trakcie próby usunięcia "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 
diff --git a/locale/pt_BR/LC_MESSAGES/converse.po b/locale/pt_BR/LC_MESSAGES/converse.po
index 6c6217b11..4fb27e518 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,341 +20,354 @@ msgstr ""
 "lang: pt_BR\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Salvar"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, 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:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Mostrar mais informações nessa sala"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "CLique para abrir a sala"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Mostrar mais informações nessa sala"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "CLique para abrir a sala"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Remover mensagens"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Clique para remover o contato"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "eu"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contato está ausente"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Mostrar o menu"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Remover mensagens"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 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:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contato está offline"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 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:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Estou %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Clique aqui para customizar a mensagem de status"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Clique para mudar seu status no chat"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Status customizado"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "ausente a bastante tempo"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Nome do contato"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Procurar"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Adicionar"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Clique para adicionar novos contatos ao chat"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Adicionar contato"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Nome do contato"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Procurar"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Adicionar"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Não foram encontrados usuários"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Clique para adicionar como um contato do chat"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Alternar bate-papo"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "Conectando"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Falha de conexão"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Ocorreu um erro enquanto tentava salvar o formulário"
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Falha de autenticação"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Falha de conexão"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Ocorreu um erro enquanto tentava salvar o formulário"
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Clique para remover o contato"
@@ -364,74 +377,74 @@ msgstr "Clique para remover o contato"
 msgid "Close this box"
 msgstr "Clique para remover o contato"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "Clique para remover o contato"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Minimizado"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Agora esta sala mostra membros indisponíveis"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Essa sala não mostra membros indisponíveis"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Configuraçõs não relacionadas à privacidade mudaram"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "O log da sala está ativado"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "O log da sala está desativado"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Esse sala é não anônima"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Essa sala agora é semi anônima"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Essa sala agora é totalmente anônima"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Você foi banido dessa sala"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Você foi expulso dessa sala"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 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:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -439,7 +452,7 @@ msgstr ""
 "Você foi removido da sala porque ela foi mudada para somente membrose você "
 "não é um membro"
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -457,466 +470,473 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s foi banido"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s foi banido"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s foi expulso"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, 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:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, 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:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 #, 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:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "Banir usuário do chat"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "Expulsar usuário do chat"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Definir tópico do chat"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Apelido"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Senha: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Enviar"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Seu apelido foi mudado"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Você não é membro dessa sala"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Você foi banido dessa sala"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Você não escolheu um apelido "
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, 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:1792
+#: src/converse-muc.js:1870
 #, 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:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "A sala não existe (ainda)"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, 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:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topico definido por %1$s para: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Esse usuário é o moderador"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Esse usuário pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, 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:2039
+#: src/converse-muc.js:2121
 #, fuzzy
 msgid "Occupants"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Não anônimo"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Senha: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Público"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Semi anônimo"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Sem moderação"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "A sala atingiu o número máximo de ocupantes"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Esse usuário é o moderador"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Esse chat precisa de senha"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Nome da sala"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "Entrar"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Mostar salas"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Sem salas em %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Salas em %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Requer autenticação"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Requer um convite"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -924,11 +944,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -941,20 +963,20 @@ msgstr "Este contato está offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Reestabelecendo sessão criptografada"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Gerando chave-privada."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Seu navegador pode parar de responder."
 
-#: src/converse-otr.js:189
-#, fuzzy
+#: src/converse-otr.js:187
+#, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -970,20 +992,20 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Não foi possível verificar a identidade deste usuário."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "Trocando chave-privada com o contato."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Suas mensagens não estão mais criptografadas"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -992,29 +1014,30 @@ msgstr ""
 "Suas mensagens estão agora criptografadas mas a identidade do contatonão foi "
 "confirmada."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "A identidade do contato foi verificada."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, 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:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Sua mensagem não pode ser enviada"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Recebemos uma mensagem não-criptografada"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Recebemos uma mensagem não-criptografada ilegível"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1036,7 +1059,7 @@ msgstr ""
 "Se você tiver confirmado que as assinaturas conferem, clique OK, caso "
 "contrário, clique Cancelar."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1052,63 +1075,63 @@ msgstr ""
 "corretamente a mesma resposta (caso sensitivo), a identidade dele será "
 "verificada."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Qual é a sua pergunta de segurança?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Qual é a resposta para a pergunta de segurança?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Schema de autenticação fornecido é inválido"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 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:415
+#: src/converse-otr.js:413
 #, 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:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Suas mensagens estão criptografadas e seu contato verificado."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 #, 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:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Finalizar conversa criptografada"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Atualizar conversa criptografada"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Iniciar conversa criptografada"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Verificar com assinatura digital"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Verificar com SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "O que é isso?"
 
@@ -1118,180 +1141,201 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "não-criptografado"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "não-verificado"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "verificado"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "CLique para abrir a sala"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Sala aberta"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Clique para remover o contato"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Este contato está ocupado"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Este contato está online"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Este contato está offline"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Este contato está indisponível"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Este contato está ausente por um longo período"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Este contato está ausente"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Meus contatos"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Contados pendentes"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Solicitação de contatos"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Clique para conversar com o contato"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "Clique para remover o contato"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Clique para remover o contato"
diff --git a/locale/ru/LC_MESSAGES/converse.po b/locale/ru/LC_MESSAGES/converse.po
index a5e4464f5..212e519d0 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,332 +17,345 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 #, fuzzy
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr "Возникла ошибка при удалении "
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Зайти в чат"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Вы уверены, что хотите удалить этот контакт?"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Зайти в чат"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Показать больше информации об этом чате"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Зайти в чат"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Показать больше информации об этом чате"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Зайти в чат"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Удалить сообщения"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 msgid "Close this chat box"
 msgstr "Закрыть это окно чата"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Ваше сообщение"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "Я"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "набирает текст"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "перестал набирать"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "отошёл"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Показать это меню"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Вписать третьего человека"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Удалить сообщения"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Вы уверены, что хотите очистить сообщения из окна чата?"
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "вышел из сети"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "занят"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Очистить все сообщения"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr "Вставить смайлик"
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Инициировать звонок"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 msgid "Click here to log in anonymously"
 msgstr "Нажмите здесь, чтобы войти анонимно"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Войти"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 msgid "password"
 msgstr "пароль"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Вход"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Редактировать произвольный статус"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Изменить ваш статус"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Произвольный статус"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "на связи"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "занят"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "отошёл надолго"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "отошёл"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "В сети"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Занят"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Отошёл"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Выйти"
 
-#: src/converse-controlbox.js:608
+#: src/converse-controlbox.js:616
+msgid "Click to add new chat contacts"
+msgstr "Добавить новый чат"
+
+#: src/converse-controlbox.js:617
+msgid "Add a contact"
+msgstr "Добавть контакт"
+
+#: src/converse-controlbox.js:652
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: src/converse-controlbox.js:609
+#: src/converse-controlbox.js:653
 msgid "Search"
 msgstr "Поиск"
 
-#: src/converse-controlbox.js:613
+#: src/converse-controlbox.js:657
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "например, user@example.com"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:658
 msgid "Add"
 msgstr "Добавить"
 
-#: src/converse-controlbox.js:619
-msgid "Click to add new chat contacts"
-msgstr "Добавить новый чат"
-
-#: src/converse-controlbox.js:620
-msgid "Add a contact"
-msgstr "Добавть контакт"
-
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Пользователи не найдены"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Кликните, чтобы добавить контакт"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Включить чат"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "Соединение"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Не удалось соединится"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "При сохранение формы произошла ошибка."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Авторизация"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Не удалось авторизоваться"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Не удалось соединится"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "При сохранение формы произошла ошибка."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr "Возникла ошибка при добавлении "
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr "Программа не поддерживает уведомления о статусе"
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Кликните, чтобы спрятать эти контакты"
 
@@ -351,79 +364,79 @@ msgstr "Кликните, чтобы спрятать эти контакты"
 msgid "Close this box"
 msgstr "Закрыть это окно чата"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr "Свернуть окно чата"
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Кликните, чтобы развернуть чат"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Свёрнуто"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Этот чат показывает недоступных собеседников"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Этот чат не показывает недоступных собеседников"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Изменились настройки чата, не относящиеся к приватности"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Протокол чата включен"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Протокол чата выключен"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Этот чат больше не анонимный"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Этот чат частично анонимный"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Этот чат стал полностью анонимный"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Появился новый чат"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Вам запрещено подключатся к этому чату"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Вас выкинули из чата"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас удалили из-за изменения прав"
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -439,464 +452,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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s забанен"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s сменил псевдоним"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s выкинут"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s удалён, потому что изменились права"
 
-#: src/converse-muc.js:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s удалён, потому что не участник"
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ваш псевдоним автоматически изменён на: %1$s"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ваш псевдоним изменён на: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr "Спрятать список участников"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr "Ошибка:  \""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Вы уверены, что хотите очистить сообщения из этого чата?"
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Ошибка: невозможно выполнить команду"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Дать права администратора"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Забанить пользователя в этом чате."
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr "Изменить роль пользователя на \"участник\""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Удалить пользователя из чата."
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "Вписать третьего"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Сделать пользователя участником"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Запретить отправку сообщений"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Предоставить права модератора пользователю"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Предоставить права владельца на этот чат"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Отозвать членство пользователя"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Установить тему"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Разрешить заглушенным пользователям отправлять сообщения"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Пароль: "
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Отправить"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ваш псевдоним изменён на: %1$s"
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Причина: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 #, fuzzy
 msgid "The reason given is: \""
 msgstr "Причина: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Вы не участник этого чата"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Вам запрещено подключатся к этому чату"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Вы не указали псевдоним"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Вы не имеете права создавать чаты"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Псевдоним запрещён правилами чата"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Этот чат не существует"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Чат достиг максимального количества участников"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема %2$s устатновлена %1$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Модератор"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Собеседник"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Пользователь не может посылать сообщения в этот чат"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Участники:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Скрыто"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Модерируемая"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Не анонимная"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Пароль: "
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Публичный"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Частично анонимный"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Немодерируемый"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Чат достиг максимального количества участников"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Модератор"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Этот чат не анонимный"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Для доступа в чат необходим пароль."
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Вы можете дополнительно вставить сообщение, объясняющее причину приглашения."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Имя чата"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Присоединться к чату"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Показать чаты"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Чаты"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Нет чатов %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Чаты %1$s:"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Участники:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Требуется авторизация"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Требуется приглашение"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Постоянный чат"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s пригласил вас в чат: %2$s"
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -904,11 +923,13 @@ msgstr "%1$s пригласил вас в чат: %2$s, по следующей
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -921,19 +942,20 @@ msgstr "вышел из сети"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Восстанавливается зашифрованная сессия"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Генерируется секретный ключ"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Ваш браузер может зависнуть."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -949,19 +971,19 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Не удалось проверить подлинность этого пользователя."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Обмен секретным ключом с контактом."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Ваши сообщения больше не шифруются"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
@@ -970,28 +992,29 @@ msgstr ""
 "Ваши сообщения шифруются, но ваша учётная запись не проверена вашим "
 "собеседником."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "Ваша учётная запись проверена вашим собеседником."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "Ваш контакт закончил шифрование у себя, вы должны сделать тоже самое."
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Ваше сообщение не отправлено"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Вы получили незашифрованное сообщение"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Вы получили нечитаемое зашифрованное сообщение"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1012,7 +1035,7 @@ msgstr ""
 "Если вы удостоверились, что отпечатки совпадают, нажмите OK; если нет "
 "нажмите Отмена"
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1025,61 +1048,61 @@ msgstr ""
 "Вашему контакту будет задан этот вопрос, и если ответы совпадут (с учётом "
 "регистра), его подлинность будет подтверждена."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Введите секретный вопрос"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Ответ на секретный вопрос"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Некоррекная схема аутентификации"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Ваши сообщения не шифруются. Нажмите здесь, чтобы настроить шифрование."
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Ваши сообщения шифруются, но ваш контакт не проверен."
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Ваши сообщения шифруются и ваш контакт проверен."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "Ваш контакт закрыл свою часть приватной сессии, вы должны сделать тоже самое."
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Закончить шифрованную беседу"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Обновить шифрованную беседу"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Начать шифрованный разговор"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Проверить при помощи отпечатков"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Проверить при помощи SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Что это?"
 
@@ -1089,47 +1112,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "не зашифровано"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "не проверено"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "проверено"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "закончено"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr "например, conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Получить форму регистрации"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Совет. Список публичных XMPP провайдеров доступен"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "здесь"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1137,11 +1160,12 @@ msgstr ""
 "К сожалению, провайдер не поддерживает регистрацию аккаунта через клиентское "
 "приложение. Пожалуйста попробуйте выбрать другого провайдера."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запрашивается регистрационная форма с XMPP сервера"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1149,19 +1173,19 @@ msgstr ""
 "Что-то пошло не так при установке связи с \"%1$s\". Вы уверены, что такой "
 "адрес существует?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "Осуществляется вход"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Зарегистрирован успешно"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Назад"
 
-#: src/converse-register.js:423
+#: src/converse-register.js:431
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1169,103 +1193,125 @@ msgstr ""
 "Провайдер отклонил вашу попытку зарегистрироваться. Пожалуйста, проверьте, "
 "правильно ли введены значения."
 
-#: src/converse-register.js:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Зайти в чат"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Открыть чат"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Вы уверены, что хотите удалить этот контакт?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Занят"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "В сети"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Не в сети"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Недоступен"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Надолго отошёл"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Отошёл"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Группы"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Контакты"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Собеседники, ожидающие авторизации"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Запросы на авторизацию"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Несгруппированные"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Удалить контакт"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Кликните, чтобы принять запрос этого контакта"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Кликните, чтобы отклонить запрос этого контакта"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Кликните, чтобы начать общение"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr "Имя"
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Вы уверены, что хотите удалить этот контакт?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr "Возникла ошибка при удалении "
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Вы уверены, что хотите отклонить запрос от этого контакта?"
 
diff --git a/locale/uk/LC_MESSAGES/converse.po b/locale/uk/LC_MESSAGES/converse.po
index de86969e6..b83dbd8a2 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,332 +20,345 @@ 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:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "Відміна"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "Ви впевнені, що хочете видалити цей контакт?"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "Показати більше інформації про цю кімату"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "Показати більше інформації про цю кімату"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "Видалити повідомлення"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "Персональна вісточка"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "я"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr "друкує"
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr "припинив друкувати"
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 msgid "has gone away"
 msgstr "пішов геть"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "Показати це меню"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "Писати від третьої особи"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "Видалити повідомлення"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 msgid "has gone offline"
 msgstr "тепер поза мережею"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 msgid "is busy"
 msgstr "зайнятий"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 msgid "Clear all messages"
 msgstr "Очистити всі повідомлення"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr "Почати виклик"
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 msgid "XMPP Username:"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "Ввійти"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "Вступити"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "Клацніть тут, щоб створити власний статус"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "Клацніть, щоб змінити статус в чаті"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "Власний статус"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "на зв'язку"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "зайнятий"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "давно відсутній"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "відсутній"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "На зв'язку"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "Далеко"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 msgid "Log out"
 msgstr "Вийти"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "Назва контакту"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "Пошук"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "Додати"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "Клацніть, щоб додати нові контакти до чату"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "Додати контакт"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "Назва контакту"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "Пошук"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "Додати"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "Жодного користувача не знайдено"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "Клацніть, щоб додати як чат-контакт"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "Включити чат"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 msgid "Reconnecting"
 msgstr "Перепід'єднуюсь"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "Під'єднуюсь"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "Трапилася помилка при спробі зберегти форму."
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "Під'єднуюсь"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "Автентикуюсь"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "Автентикація невдала"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "Під'єднуюсь"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "Трапилася помилка при спробі зберегти форму."
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 msgid "Click to hide these contacts"
 msgstr "Клацніть, щоб приховати ці контакти"
 
@@ -354,73 +367,73 @@ msgstr "Клацніть, щоб приховати ці контакти"
 msgid "Close this box"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 msgid "Click to restore this chat"
 msgstr "Клацніть, щоб відновити цей чат"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "Мінімізовано"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "Ця кімната вже показує недоступних учасників"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "Ця кімната не показує недоступних учасників"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "Змінено конфігурацію кімнати, не повязану з приватністю"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "Журналювання кімнати тепер ввімкнено"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "Журналювання кімнати тепер вимкнено"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "Ця кімната тепер не-анонімна"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "Ця кімната тепер напів-анонімна"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "Ця кімната тепер повністю анонімна"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "Створено нову кімнату"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "Вам заблокували доступ до цієї кімнати"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "Вас викинули з цієї кімнати"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "Вас видалено з кімнати у зв'язку зі змінами власності кімнати"
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 msgid ""
 "You have been removed from this room because the room has changed to members-"
 "only and you're not a member"
@@ -428,7 +441,7 @@ msgstr ""
 "Вас видалено з цієї кімнати, оскільки вона тепер вимагає членства, а Ви ним "
 "не є її членом"
 
-#: src/converse-muc.js:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -444,464 +457,470 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s заблоковано"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "Прізвисько %1$s змінено"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s було викинуто звідси"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "%1$s було видалено через зміни власності кімнати"
 
-#: src/converse-muc.js:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "%1$s було виделано через відсутність членства"
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "Ваше прізвисько було автоматично змінене на: %1$s"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "Ваше прізвисько було змінене на: %1$s"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "Повідомлення"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Сховати список учасників"
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цієї кімнати?"
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr "Помилка: Не можу виконати команду"
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr "Призначити користувача адміністратором"
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 msgid "Ban user from room"
 msgstr "Заблокувати і викинути з кімнати"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 #, fuzzy
 msgid "Change user role to occupant"
 msgstr "Зробити користувача учасником"
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 msgid "Kick user from room"
 msgstr "Викинути з кімнати"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 msgid "Write in 3rd person"
 msgstr "Писати в 3-й особі"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr "Надати членство користувачу"
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr "Забрати можливість слати повідомлення"
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr "Надати права модератора"
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 msgid "Grant ownership of this room"
 msgstr "Передати у власність цю кімнату"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr "Забрати членство в користувача"
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "Встановити тему кімнати"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr "Дозволити безголосому користувачу слати повідомлення"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 #, fuzzy
 msgid "Please choose your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "Прізвисько"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "Пароль:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "Надіслати"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "Ваше прізвисько було змінене на: %1$s"
 
-#: src/converse-muc.js:1706
-#, fuzzy
+#: src/converse-muc.js:1784
+#, fuzzy, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr "Причиною вказано: \""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr "Причиною вказано: \""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "Ви не є у списку членів цієї кімнати"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "Вам заблокували доступ до цієї кімнати"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "Не вказане прізвисько"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "Вам не дозволено створювати нові кімнати"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "Ваше прізвисько не відповідає політиці кімнати"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "Такої кімнати (поки) не існує"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "Ця кімната досягнула максимуму учасників"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема встановлена %1$s: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Цей користувач є модератором"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Цей користувач може слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 msgid "Occupants"
 msgstr "Учасники"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr "Запросіть"
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "Прихована"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "Модерована"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "Не-анонімні"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "Пароль:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "Публічна"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "Напів-анонімна"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "Немодерована"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "Ця кімната досягнула максимуму учасників"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "Цей користувач є модератором"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "Ця кімната вимагає пароль"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, 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:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "Назва кімнати"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 msgid "Join Room"
 msgstr "Приєднатися до кімнати"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "Показати кімнати"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "Кімнати"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "Жодної кімнати на %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "Кімнати на %1$s"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "Опис:"
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "Сервер"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "Присутні:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "Вимагає автентикації"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "Вимагає запрошення"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "Постійна кімната"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s запрошує вас приєднатись до чату: %2$s"
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -910,11 +929,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -927,19 +948,20 @@ msgstr "тепер поза мережею"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "Перевстановлюю криптований сеанс"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "Генерація приватного ключа."
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "Ваш браузер може підвиснути."
 
-#: src/converse-otr.js:189
+#: src/converse-otr.js:187
+#, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -955,47 +977,48 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "Не можу перевірити автентичність цього користувача."
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 msgid "Exchanging private key with contact."
 msgstr "Обмін приватним ключем з контактом."
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "Ваші повідомлення більше не криптуються"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr ""
 "Ваші повідомлення вже криптуються, але особа Вашого контакту не перевірена."
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 msgid "Your contact's identify has been verified."
 msgstr "Особу Вашого контакту перевірено."
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr ""
 "Ваш контакт припинив криптування зі свого боку, Вам слід зробити те саме."
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "Ваше повідомлення не може бути надіслане"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "Ми отримали некриптоване повідомлення"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "Ми отримали нечитабельне криптоване повідомлення"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1016,7 +1039,7 @@ msgstr ""
 "Якщо Ви підтверджуєте відповідність відбитка, клацніть Гаразд, інакше "
 "клацніть Відміна."
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
 "that question.\n"
@@ -1029,60 +1052,60 @@ msgstr ""
 "Потім Вашого контакта запитають те саме питання, і якщо вони введуть ту саму "
 "відповідь (враховуючи регістр), їх особи будуть перевірені."
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "Яке Ваше таємне питання?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "Яка відповідь на таємне питання?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "Надана некоректна схема автентикації"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr ""
 "Ваші повідомлення не криптуються. Клацніть тут, щоб увімкнути OTR-"
 "криптування."
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "Ваші повідомлення криптуються, але Ваш контакт не був перевірений."
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 msgid "Your messages are encrypted and your contact verified."
 msgstr "Ваші повідомлення криптуються і Ваш контакт перевірено."
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr ""
 "Ваш контакт закрив зі свого боку приватну сесію, Вам слід зробити те ж саме"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "Завершити криптовану розмову"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "Оновити криптовану розмову"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "Почати криптовану розмову"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "Перевірити за відбитками"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "Перевірити за SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "Що це?"
 
@@ -1092,47 +1115,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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "некриптовано"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "неперевірено"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "перевірено"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "завершено"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr " напр. conversejs.org"
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr "Домен Вашого провайдера XMPP:"
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr "Отримати форму реєстрації"
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Порада: доступний перелік публічних XMPP-провайдерів"
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr "тут"
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr "Реєстрація"
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -1140,11 +1163,12 @@ msgstr ""
 "Вибачте, вказаний провайдер не підтримує реєстрації онлайн. Спробуйте іншого "
 "провайдера."
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запитую форму реєстрації з XMPP сервера"
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -1152,122 +1176,144 @@ msgstr ""
 "Щось пішло не так при встановленні зв'язку з \"%1$s\". Ви впевнені, що такий "
 "існує?"
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr "Входимо"
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr "Успішно зареєстровано"
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr "Вернутися"
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "Клацніть, щоб увійти в цю кімнату"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "Увійти в кімнату"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "Ви впевнені, що хочете видалити цей контакт?"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "Цей контакт зайнятий"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "Цей контакт на зв'язку"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "Цей контакт поза мережею"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "Цей контакт недоступний"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "Цей контакт відсутній тривалий час"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "Цей контакт відсутній"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr "Групи"
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "Мої контакти"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "Контакти в очікуванні"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "Запити контакту"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr "Негруповані"
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "Клацніть, щоб видалити цей контакт"
 
-#: src/converse-rosterview.js:618
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "Клацніть, щоб прийняти цей запит контакту"
 
-#: src/converse-rosterview.js:619
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "Клацніть, щоб відхилити цей запит контакту"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "Клацніть, щоб почати розмову з цим контактом"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 msgid "Are you sure you want to remove this contact?"
 msgstr "Ви впевнені, що хочете видалити цей контакт?"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Ви впевнені, що хочете відхилити цей запит контакту?"
 
diff --git a/locale/zh/LC_MESSAGES/converse.po b/locale/zh/LC_MESSAGES/converse.po
index b5ab7a06e..aa1ae93a2 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-04-23 16:48+0000\n"
+"POT-Creation-Date: 2017-06-21 22:27+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,339 +19,352 @@ msgstr ""
 "lang: zh\n"
 "plural_forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/converse-bookmarks.js:76 src/converse-bookmarks.js:135
+#: src/converse-bookmarks.js:77 src/converse-bookmarks.js:136
 msgid "Bookmark this room"
 msgstr ""
 
-#: src/converse-bookmarks.js:136
+#: src/converse-bookmarks.js:137
 msgid "The name for this bookmark:"
 msgstr ""
 
-#: src/converse-bookmarks.js:137
+#: src/converse-bookmarks.js:138
 msgid "Would you like this room to be automatically joined upon startup?"
 msgstr ""
 
-#: src/converse-bookmarks.js:138
+#: src/converse-bookmarks.js:139
 msgid "What should your nickname for this room be?"
 msgstr ""
 
-#: src/converse-bookmarks.js:140 src/converse-controlbox.js:516
-#: src/converse-muc.js:1226
+#: src/converse-bookmarks.js:141 src/converse-controlbox.js:526
+#: src/converse-muc.js:1304
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-bookmarks.js:141 src/converse-muc.js:1227
-#: src/converse-register.js:247 src/converse-register.js:385
+#: src/converse-bookmarks.js:142 src/converse-muc.js:1305
+#: src/converse-register.js:255 src/converse-register.js:393
 msgid "Cancel"
 msgstr "取消"
 
-#: src/converse-bookmarks.js:293
+#: src/converse-bookmarks.js:295
 msgid "Sorry, something went wrong while trying to save your bookmark."
 msgstr ""
 
-#: src/converse-bookmarks.js:376
+#: src/converse-bookmarks.js:380
 #, fuzzy
 msgid "Click to toggle the bookmarks list"
 msgstr "打开聊天室"
 
-#: src/converse-bookmarks.js:377
-msgid "Bookmarked Rooms"
+#: src/converse-bookmarks.js:381
+msgid "Bookmarks"
 msgstr ""
 
-#: src/converse-bookmarks.js:394
-#, fuzzy
+#: src/converse-bookmarks.js:398
+#, fuzzy, javascript-format
 msgid "Are you sure you want to remove the bookmark \"%1$s\"?"
 msgstr "确定移除联系人吗？"
 
-#: src/converse-bookmarks.js:403 src/converse-muc.js:2374
-msgid "Click to open this room"
+#: src/converse-bookmarks.js:424 src/converse-roomslist.js:123
+#, fuzzy
+msgid "Leave this room"
 msgstr "打开聊天室"
 
-#: src/converse-bookmarks.js:404 src/converse-muc.js:2375
-msgid "Show more information on this room"
-msgstr "显示次聊天室的更多信息"
-
-#: src/converse-bookmarks.js:405
+#: src/converse-bookmarks.js:425
 msgid "Remove this bookmark"
 msgstr ""
 
-#: src/converse-chatview.js:129 src/converse-headline.js:78
-#: src/converse-muc.js:419
+#: src/converse-bookmarks.js:426 src/converse-roomslist.js:124
+#, fuzzy
+msgid "Unbookmark this room"
+msgstr "打开聊天室"
+
+#: src/converse-bookmarks.js:427 src/converse-muc.js:2472
+#: src/converse-roomslist.js:125
+msgid "Show more information on this room"
+msgstr "显示次聊天室的更多信息"
+
+#: src/converse-bookmarks.js:430 src/converse-muc.js:2471
+#: src/converse-roomslist.js:127
+msgid "Click to open this room"
+msgstr "打开聊天室"
+
+#: src/converse-chatview.js:140 src/converse-headline.js:78
+#: src/converse-muc.js:498
 #, fuzzy
 msgid "You have unread messages"
 msgstr "移除消息"
 
-#: src/converse-chatview.js:130
+#: src/converse-chatview.js:141
 #, fuzzy
 msgid "Close this chat box"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-chatview.js:131
+#: src/converse-chatview.js:142
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:132 src/converse-muc.js:416
+#: src/converse-chatview.js:143 src/converse-muc.js:495
 msgid "Send"
 msgstr ""
 
-#: src/converse-chatview.js:342
+#: src/converse-chatview.js:352
 msgid "me"
 msgstr "我"
 
-#: src/converse-chatview.js:349
+#: src/converse-chatview.js:359
 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:390
+#: src/converse-chatview.js:400
 msgid "Typing from another device"
 msgstr ""
 
-#: src/converse-chatview.js:392
+#: src/converse-chatview.js:402
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:397
+#: src/converse-chatview.js:407
 msgid "Stopped typing on the other device"
 msgstr ""
 
-#: src/converse-chatview.js:399
+#: src/converse-chatview.js:409
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:404 src/converse-chatview.js:675
+#: src/converse-chatview.js:414 src/converse-chatview.js:672
 #: src/converse-notification.js:186
 #, fuzzy
 msgid "has gone away"
 msgstr "对方离开"
 
-#: src/converse-chatview.js:528 src/converse-muc.js:966
+#: src/converse-chatview.js:525 src/converse-muc.js:1044
 msgid "Show this menu"
 msgstr "显示此项菜单"
 
-#: src/converse-chatview.js:529
+#: src/converse-chatview.js:526
 msgid "Write in the third person"
 msgstr "以第三者身份写"
 
-#: src/converse-chatview.js:530 src/converse-muc.js:964
+#: src/converse-chatview.js:527 src/converse-muc.js:1042
 msgid "Remove messages"
 msgstr "移除消息"
 
-#: src/converse-chatview.js:628
+#: src/converse-chatview.js:625
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "你确定清除此次的聊天记录吗？"
 
-#: src/converse-chatview.js:673 src/converse-notification.js:184
+#: src/converse-chatview.js:670 src/converse-notification.js:184
 #, fuzzy
 msgid "has gone offline"
 msgstr "对方已下线"
 
-#: src/converse-chatview.js:677 src/converse-notification.js:188
+#: src/converse-chatview.js:674 src/converse-notification.js:188
 #, fuzzy
 msgid "is busy"
 msgstr "忙碌"
 
-#: src/converse-chatview.js:720
+#: src/converse-chatview.js:717
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:721
+#: src/converse-chatview.js:718
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:722
+#: src/converse-chatview.js:719
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:202 src/converse-core.js:727
-#: src/converse-rosterview.js:91
+#: src/converse-controlbox.js:203 src/converse-core.js:737
+#: src/converse-rosterview.js:92
 msgid "Contacts"
 msgstr "联系人"
 
-#: src/converse-controlbox.js:386
+#: src/converse-controlbox.js:397
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:398
 msgid "Password:"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:388
+#: src/converse-controlbox.js:399
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-controlbox.js:389
+#: src/converse-controlbox.js:400
 msgid "Log In"
 msgstr "登录"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:390
+#: src/converse-controlbox.js:401
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:391
+#: src/converse-controlbox.js:402
 #, fuzzy
 msgid "password"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:398
+#: src/converse-controlbox.js:409
 msgid "Sign in"
 msgstr "登录"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:487 src/converse-controlbox.js:562
+#: src/converse-controlbox.js:497 src/converse-controlbox.js:572
+#, javascript-format
 msgid "I am %1$s"
 msgstr "我现在%1$s"
 
-#: src/converse-controlbox.js:489 src/converse-controlbox.js:567
+#: src/converse-controlbox.js:499 src/converse-controlbox.js:577
 msgid "Click here to write a custom status message"
 msgstr "点击这里，填写状态信息"
 
-#: src/converse-controlbox.js:490 src/converse-controlbox.js:568
+#: src/converse-controlbox.js:500 src/converse-controlbox.js:578
 msgid "Click to change your chat status"
 msgstr "点击这里改变聊天状态"
 
-#: src/converse-controlbox.js:515
+#: src/converse-controlbox.js:525
 msgid "Custom status"
 msgstr "DIY状态"
 
-#: src/converse-controlbox.js:544 src/converse-controlbox.js:554
+#: src/converse-controlbox.js:554 src/converse-controlbox.js:564
 msgid "online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:546
+#: src/converse-controlbox.js:556
 msgid "busy"
 msgstr "忙碌"
 
-#: src/converse-controlbox.js:548
+#: src/converse-controlbox.js:558
 msgid "away for long"
 msgstr "长时间离开"
 
-#: src/converse-controlbox.js:550
+#: src/converse-controlbox.js:560
 msgid "away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:552
+#: src/converse-controlbox.js:562
 #, fuzzy
 msgid "offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:593 src/converse-rosterview.js:159
+#: src/converse-controlbox.js:606 src/converse-rosterview.js:161
 msgid "Online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:594 src/converse-rosterview.js:161
+#: src/converse-controlbox.js:607 src/converse-rosterview.js:163
 msgid "Busy"
 msgstr "忙碌中"
 
-#: src/converse-controlbox.js:595 src/converse-rosterview.js:162
+#: src/converse-controlbox.js:608 src/converse-rosterview.js:164
 msgid "Away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:596 src/converse-rosterview.js:164
+#: src/converse-controlbox.js:609 src/converse-rosterview.js:166
 msgid "Offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:610
 #, fuzzy
 msgid "Log out"
 msgstr "登录"
 
-#: src/converse-controlbox.js:608
-msgid "Contact name"
-msgstr "联系人名称"
-
-#: src/converse-controlbox.js:609
-msgid "Search"
-msgstr "搜索"
-
-#: src/converse-controlbox.js:613
-msgid "e.g. user@example.org"
-msgstr ""
-
-#: src/converse-controlbox.js:614
-msgid "Add"
-msgstr "添加"
-
-#: src/converse-controlbox.js:619
+#: src/converse-controlbox.js:616
 msgid "Click to add new chat contacts"
 msgstr "点击添加新联系人"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:617
 msgid "Add a contact"
 msgstr "添加联系人"
 
-#: src/converse-controlbox.js:647
+#: src/converse-controlbox.js:652
+msgid "Contact name"
+msgstr "联系人名称"
+
+#: src/converse-controlbox.js:653
+msgid "Search"
+msgstr "搜索"
+
+#: src/converse-controlbox.js:657
+msgid "e.g. user@example.org"
+msgstr ""
+
+#: src/converse-controlbox.js:658
+msgid "Add"
+msgstr "添加"
+
+#: src/converse-controlbox.js:679
 msgid "No users found"
 msgstr "未找到用户"
 
-#: src/converse-controlbox.js:653
+#: src/converse-controlbox.js:685
 msgid "Click to add as a chat contact"
 msgstr "点击添加为好友"
 
-#: src/converse-controlbox.js:717
+#: src/converse-controlbox.js:749
 msgid "Toggle chat"
 msgstr "折叠聊天窗口"
 
-#: src/converse-core.js:416
+#: src/converse-core.js:427
 #, fuzzy
 msgid "Reconnecting"
 msgstr "连接中"
 
-#: src/converse-core.js:418
+#: src/converse-core.js:429
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:498
+#: src/converse-core.js:509
 #, fuzzy
 msgid "Connection error"
 msgstr "连接失败"
 
-#: src/converse-core.js:499
+#: src/converse-core.js:510
 #, fuzzy
 msgid "An error occurred while connecting to the chat server."
 msgstr "保存表单是出错。"
 
-#: src/converse-core.js:502
+#: src/converse-core.js:513
 msgid "Connecting"
 msgstr "连接中"
 
-#: src/converse-core.js:504
+#: src/converse-core.js:515
 msgid "Authenticating"
 msgstr "验证中"
 
-#: src/converse-core.js:506
+#: src/converse-core.js:517
 msgid "Authentication Failed"
 msgstr "验证失败"
 
-#: src/converse-core.js:511
+#: src/converse-core.js:522
 #, fuzzy
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/converse-core.js:512
+#: src/converse-core.js:523
 #, fuzzy
 msgid "An error occurred while connecting to the chat server: "
 msgstr "保存表单是出错。"
 
-#: src/converse-core.js:1077
+#: src/converse-core.js:1133
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1229
+#: src/converse-core.js:1285
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
-#: src/converse-core.js:1302
+#: src/converse-core.js:1358
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "点击移除联系人"
@@ -361,80 +374,80 @@ msgstr "点击移除联系人"
 msgid "Close this box"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-minimize.js:179 src/converse-minimize.js:510
+#: src/converse-minimize.js:192 src/converse-minimize.js:503
 msgid "Minimize this chat box"
 msgstr ""
 
-#: src/converse-minimize.js:329
+#: src/converse-minimize.js:334
 #, fuzzy
 msgid "Click to restore this chat"
 msgstr "点击恢复聊天窗口"
 
-#: src/converse-minimize.js:494
+#: src/converse-minimize.js:487
 msgid "Minimized"
 msgstr "最小化的"
 
-#: src/converse-muc.js:255
+#: src/converse-muc.js:277
 msgid "This room is not anonymous"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:256
+#: src/converse-muc.js:278
 msgid "This room now shows unavailable members"
 msgstr "此聊天室显示不可用用户"
 
-#: src/converse-muc.js:257
+#: src/converse-muc.js:279
 msgid "This room does not show unavailable members"
 msgstr "此聊天室不显示不可用用户"
 
-#: src/converse-muc.js:258
+#: src/converse-muc.js:280
 #, fuzzy
 msgid "The room configuration has changed"
 msgstr "此聊天室设置(非私密性)已改变"
 
-#: src/converse-muc.js:259
+#: src/converse-muc.js:281
 msgid "Room logging is now enabled"
 msgstr "聊天室聊天记录已启用"
 
-#: src/converse-muc.js:260
+#: src/converse-muc.js:282
 msgid "Room logging is now disabled"
 msgstr "聊天室聊天记录已禁用"
 
-#: src/converse-muc.js:261
+#: src/converse-muc.js:283
 #, fuzzy
 msgid "This room is now no longer anonymous"
 msgstr "此聊天室非匿名"
 
-#: src/converse-muc.js:262
+#: src/converse-muc.js:284
 msgid "This room is now semi-anonymous"
 msgstr "此聊天室半匿名"
 
-#: src/converse-muc.js:263
+#: src/converse-muc.js:285
 msgid "This room is now fully-anonymous"
 msgstr "此聊天室完全匿名"
 
-#: src/converse-muc.js:264
+#: src/converse-muc.js:286
 msgid "A new room has been created"
 msgstr "新聊天室已创建"
 
-#: src/converse-muc.js:268
+#: src/converse-muc.js:290
 msgid "You have been banned from this room"
 msgstr "您已被此聊天室禁止入内"
 
-#: src/converse-muc.js:269
+#: src/converse-muc.js:291
 msgid "You have been kicked from this room"
 msgstr "您已被踢出次房间"
 
-#: src/converse-muc.js:270
+#: src/converse-muc.js:292
 msgid "You have been removed from this room because of an affiliation change"
 msgstr "由于关系变化，您已被移除此房间"
 
-#: src/converse-muc.js:271
+#: src/converse-muc.js:293
 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:272
+#: src/converse-muc.js:294
 msgid ""
 "You have been removed from this room because the MUC (Multi-user chat) "
 "service is being shut down."
@@ -450,466 +463,473 @@ 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:286
-#, fuzzy
+#: src/converse-muc.js:308
+#, fuzzy, javascript-format
 msgid "%1$s has been banned"
 msgstr "%1$s 已被禁止"
 
-#: src/converse-muc.js:287
-#, fuzzy
+#: src/converse-muc.js:309
+#, fuzzy, javascript-format
 msgid "%1$s's nickname has changed"
 msgstr "%1$s 已被禁止"
 
-#: src/converse-muc.js:288
-#, fuzzy
+#: src/converse-muc.js:310
+#, fuzzy, javascript-format
 msgid "%1$s has been kicked out"
 msgstr "%1$s 已被踢出"
 
-#: src/converse-muc.js:289
-#, fuzzy
+#: src/converse-muc.js:311
+#, fuzzy, javascript-format
 msgid "%1$s has been removed because of an affiliation change"
 msgstr "由于关系解除、%1$s 已被移除"
 
-#: src/converse-muc.js:290
-#, fuzzy
+#: src/converse-muc.js:312
+#, fuzzy, javascript-format
 msgid "%1$s has been removed for not being a member"
 msgstr "由于不是成员、%1$s 已被移除"
 
-#: src/converse-muc.js:294
-#, fuzzy
+#: src/converse-muc.js:316
+#, fuzzy, javascript-format
 msgid "Your nickname has been automatically set to: %1$s"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:295
-#, fuzzy
+#: src/converse-muc.js:317
+#, fuzzy, javascript-format
 msgid "Your nickname has been changed to: %1$s"
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:415
+#: src/converse-muc.js:494
 msgid "Message"
 msgstr "信息"
 
-#: src/converse-muc.js:460
+#: src/converse-muc.js:539
 #, fuzzy
 msgid "Close and leave this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:461
+#: src/converse-muc.js:540
 #, fuzzy
 msgid "Configure this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:506
+#: src/converse-muc.js:584
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-muc.js:900
+#: src/converse-muc.js:978
 msgid "Error: the \""
 msgstr ""
 
-#: src/converse-muc.js:912
+#: src/converse-muc.js:990
 #, fuzzy
 msgid "Are you sure you want to clear the messages from this room?"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:920
+#: src/converse-muc.js:998
 msgid "Error: could not execute the command"
 msgstr ""
 
-#: src/converse-muc.js:962
+#: src/converse-muc.js:1040
 msgid "Change user's affiliation to admin"
 msgstr ""
 
-#: src/converse-muc.js:963
+#: src/converse-muc.js:1041
 #, fuzzy
 msgid "Ban user from room"
 msgstr "阻止此用户进入房间"
 
-#: src/converse-muc.js:965
+#: src/converse-muc.js:1043
 msgid "Change user role to occupant"
 msgstr ""
 
-#: src/converse-muc.js:967
+#: src/converse-muc.js:1045
 #, fuzzy
 msgid "Kick user from room"
 msgstr "把用户踢出房间"
 
-#: src/converse-muc.js:968
+#: src/converse-muc.js:1046
 #, fuzzy
 msgid "Write in 3rd person"
 msgstr "以第三者身份写"
 
-#: src/converse-muc.js:969
+#: src/converse-muc.js:1047
 msgid "Grant membership to a user"
 msgstr ""
 
-#: src/converse-muc.js:970
+#: src/converse-muc.js:1048
 msgid "Remove user's ability to post messages"
 msgstr ""
 
-#: src/converse-muc.js:971
+#: src/converse-muc.js:1049
 msgid "Change your nickname"
 msgstr ""
 
-#: src/converse-muc.js:972
+#: src/converse-muc.js:1050
 msgid "Grant moderator role to user"
 msgstr ""
 
-#: src/converse-muc.js:973
+#: src/converse-muc.js:1051
 #, fuzzy
 msgid "Grant ownership of this room"
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:974
+#: src/converse-muc.js:1052
 msgid "Revoke user's membership"
 msgstr ""
 
-#: src/converse-muc.js:975
+#: src/converse-muc.js:1053
 #, fuzzy
 msgid "Set room subject"
 msgstr "设置房间主题"
 
-#: src/converse-muc.js:976
+#: src/converse-muc.js:1054
 msgid "Set room subject (alias for /subject)"
 msgstr ""
 
-#: src/converse-muc.js:977
+#: src/converse-muc.js:1055
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1627
 msgid ""
 "The nickname you chose is reserved or currently in use, please choose a "
 "different one."
 msgstr ""
 
-#: src/converse-muc.js:1566
+#: src/converse-muc.js:1644
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:1567 src/converse-muc.js:2316
+#: src/converse-muc.js:1645 src/converse-muc.js:2399
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/converse-muc.js:1568
+#: src/converse-muc.js:1646
 #, fuzzy
 msgid "Enter room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1587
+#: src/converse-muc.js:1665
 msgid "This chatroom requires a password"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:1588
+#: src/converse-muc.js:1666
 msgid "Password: "
 msgstr "密码:"
 
-#: src/converse-muc.js:1589
+#: src/converse-muc.js:1667
 msgid "Submit"
 msgstr "发送"
 
-#: src/converse-muc.js:1703
-#, fuzzy
+#: src/converse-muc.js:1781
+#, fuzzy, javascript-format
 msgid "This action was done by %1$s."
 msgstr "您的昵称被更改了"
 
-#: src/converse-muc.js:1706
+#: src/converse-muc.js:1784
+#, javascript-format
 msgid "The reason given is: \"%1$s\"."
 msgstr ""
 
-#: src/converse-muc.js:1715
+#: src/converse-muc.js:1793
 msgid "The reason given is: \""
 msgstr ""
 
-#: src/converse-muc.js:1733
+#: src/converse-muc.js:1811
 msgid " has left the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1735
+#: src/converse-muc.js:1813
 #, fuzzy
 msgid " has left the room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1743
+#: src/converse-muc.js:1821
 msgid " has joined the room. \""
 msgstr ""
 
-#: src/converse-muc.js:1745
+#: src/converse-muc.js:1823
 msgid " has joined the room."
 msgstr ""
 
-#: src/converse-muc.js:1780
+#: src/converse-muc.js:1858
 #, fuzzy
 msgid "You are not on the member list of this room."
 msgstr "您并非此房间成员"
 
-#: src/converse-muc.js:1782
+#: src/converse-muc.js:1860
 #, fuzzy
 msgid "You have been banned from this room."
 msgstr "您已被此聊天室禁止入内"
 
-#: src/converse-muc.js:1786
+#: src/converse-muc.js:1864
 #, fuzzy
 msgid "No nickname was specified."
 msgstr "未指定昵称"
 
-#: src/converse-muc.js:1790
+#: src/converse-muc.js:1868
 #, fuzzy
 msgid "You are not allowed to create new rooms."
 msgstr "您可此创建新房间了"
 
-#: src/converse-muc.js:1792
+#: src/converse-muc.js:1870
 #, fuzzy
 msgid "Your nickname doesn't conform to this room's policies."
 msgstr "您的昵称不符合此房间标准"
 
-#: src/converse-muc.js:1796
+#: src/converse-muc.js:1874
 #, fuzzy
 msgid "This room does not (yet) exist."
 msgstr "此房间不存在"
 
-#: src/converse-muc.js:1798
+#: src/converse-muc.js:1876
 #, fuzzy
 msgid "This room has reached its maximum number of occupants."
 msgstr "此房间人数已达上线"
 
-#: src/converse-muc.js:1913
+#: src/converse-muc.js:1991
+#, javascript-format
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s 设置话题为: %2$s"
 
-#: src/converse-muc.js:1983
+#: src/converse-muc.js:2065
 #, fuzzy
 msgid "Click to mention "
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1984
+#: src/converse-muc.js:2066
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "此用户是主持人"
 
-#: src/converse-muc.js:1985
+#: src/converse-muc.js:2067
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "此用户在这房间里可发消息"
 
-#: src/converse-muc.js:1986
+#: src/converse-muc.js:2068
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "此用户不可在此房间发消息"
 
-#: src/converse-muc.js:2039
+#: src/converse-muc.js:2121
 #, fuzzy
 msgid "Occupants"
 msgstr "成员:"
 
-#: src/converse-muc.js:2056
+#: src/converse-muc.js:2138
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:2077
+#: src/converse-muc.js:2159
 #, fuzzy
 msgid "Features"
 msgstr "特性:"
 
-#: src/converse-muc.js:2078 src/converse-muc.js:2449
+#: src/converse-muc.js:2160 src/converse-muc.js:2546
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: src/converse-muc.js:2079
+#: src/converse-muc.js:2161
 msgid "Message archiving"
 msgstr ""
 
-#: src/converse-muc.js:2080
+#: src/converse-muc.js:2162
 msgid "Members only"
 msgstr ""
 
-#: src/converse-muc.js:2081 src/converse-muc.js:2451
+#: src/converse-muc.js:2163 src/converse-muc.js:2548
 msgid "Moderated"
 msgstr "发言受限"
 
-#: src/converse-muc.js:2082 src/converse-muc.js:2452
+#: src/converse-muc.js:2164 src/converse-muc.js:2549
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:2083
+#: src/converse-muc.js:2165
 #, fuzzy
 msgid "Open"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:2084
+#: src/converse-muc.js:2166
 #, fuzzy
 msgid "Password protected"
 msgstr "密码:"
 
-#: src/converse-muc.js:2085
+#: src/converse-muc.js:2167
 msgid "Persistent"
 msgstr ""
 
-#: src/converse-muc.js:2086 src/converse-muc.js:2455
+#: src/converse-muc.js:2168 src/converse-muc.js:2552
 msgid "Public"
 msgstr "公开的"
 
-#: src/converse-muc.js:2087 src/converse-muc.js:2456
+#: src/converse-muc.js:2169 src/converse-muc.js:2553
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:2088
+#: src/converse-muc.js:2170
 #, fuzzy
 msgid "Temporary"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:2089 src/converse-muc.js:2458
+#: src/converse-muc.js:2171 src/converse-muc.js:2555
 msgid "Unmoderated"
 msgstr "无发言限制"
 
-#: src/converse-muc.js:2090
+#: src/converse-muc.js:2172
 msgid "Unsecured"
 msgstr ""
 
-#: src/converse-muc.js:2091
+#: src/converse-muc.js:2173
 #, fuzzy
 msgid "This room is not publicly searchable"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:2092
+#: src/converse-muc.js:2174
 msgid "Messages are archived on the server"
 msgstr ""
 
-#: src/converse-muc.js:2093
+#: src/converse-muc.js:2175
 #, fuzzy
 msgid "This room is restricted to members only"
 msgstr "此房间人数已达上线"
 
-#: src/converse-muc.js:2094
+#: src/converse-muc.js:2176
 #, fuzzy
 msgid "This room is being moderated"
 msgstr "此用户是主持人"
 
-#: src/converse-muc.js:2095
+#: src/converse-muc.js:2177
 msgid "All other room occupants can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2096
+#: src/converse-muc.js:2178
 #, fuzzy
 msgid "Anyone can join this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:2097
+#: src/converse-muc.js:2179
 #, fuzzy
 msgid "This room requires a password before entry"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:2098
+#: src/converse-muc.js:2180
 msgid "This room persists even if it's unoccupied"
 msgstr ""
 
-#: src/converse-muc.js:2099
+#: src/converse-muc.js:2181
 #, fuzzy
 msgid "This room is publicly searchable"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:2100
+#: src/converse-muc.js:2182
 msgid "Only moderators can see your Jabber ID"
 msgstr ""
 
-#: src/converse-muc.js:2101
+#: src/converse-muc.js:2183
 msgid "This room will disappear once the last person leaves"
 msgstr ""
 
-#: src/converse-muc.js:2102
+#: src/converse-muc.js:2184
 #, fuzzy
 msgid "This room is not being moderated"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-muc.js:2103
+#: src/converse-muc.js:2185
 #, fuzzy
 msgid "This room does not require a password upon entry"
 msgstr "此聊天室需要密码"
 
-#: src/converse-muc.js:2238
+#: src/converse-muc.js:2320
+#, javascript-format
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:2239
+#: src/converse-muc.js:2321
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:2315
+#: src/converse-muc.js:2398
 msgid "Room name"
 msgstr "聊天室名称"
 
-#: src/converse-muc.js:2317
+#: src/converse-muc.js:2400
 msgid "Server"
 msgstr "服务器"
 
-#: src/converse-muc.js:2318
+#: src/converse-muc.js:2401
 #, fuzzy
 msgid "Join Room"
 msgstr "加入"
 
-#: src/converse-muc.js:2319
+#: src/converse-muc.js:2402
 msgid "Show rooms"
 msgstr "显示所有聊天室"
 
-#: src/converse-muc.js:2326
+#: src/converse-muc.js:2419
 msgid "Rooms"
 msgstr "聊天室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:2351
+#: src/converse-muc.js:2448
+#, javascript-format
 msgid "No rooms on %1$s"
 msgstr "%1$s 上没有聊天室"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:2365
+#: src/converse-muc.js:2462
+#, javascript-format
 msgid "Rooms on %1$s"
 msgstr "%1$s 上的聊天室"
 
-#: src/converse-muc.js:2444
+#: src/converse-muc.js:2541
 msgid "Description:"
 msgstr "描述: "
 
-#: src/converse-muc.js:2445
+#: src/converse-muc.js:2542
 #, fuzzy
 msgid "Server:"
 msgstr "服务器"
 
-#: src/converse-muc.js:2446
+#: src/converse-muc.js:2543
 msgid "Occupants:"
 msgstr "成员:"
 
-#: src/converse-muc.js:2447
+#: src/converse-muc.js:2544
 msgid "Features:"
 msgstr "特性:"
 
-#: src/converse-muc.js:2448
+#: src/converse-muc.js:2545
 msgid "Requires authentication"
 msgstr "需要验证"
 
-#: src/converse-muc.js:2450
+#: src/converse-muc.js:2547
 msgid "Requires an invitation"
 msgstr "需要被邀请"
 
-#: src/converse-muc.js:2453
+#: src/converse-muc.js:2550
 msgid "Open room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:2454
+#: src/converse-muc.js:2551
 msgid "Permanent room"
 msgstr "永久聊天室"
 
-#: src/converse-muc.js:2457
+#: src/converse-muc.js:2554
 msgid "Temporary room"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:2546
+#: src/converse-muc.js:2647
+#, javascript-format
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:2551
+#: src/converse-muc.js:2652
+#, javascript-format
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -917,11 +937,13 @@ msgstr ""
 
 #. XXX: workaround for Prosody which doesn't give type "headline"
 #: src/converse-notification.js:138 src/converse-notification.js:144
+#, javascript-format
 msgid "Notification from %1$s"
 msgstr ""
 
 #: src/converse-notification.js:146 src/converse-notification.js:156
 #: src/converse-notification.js:159
+#, javascript-format
 msgid "%1$s says"
 msgstr ""
 
@@ -934,20 +956,20 @@ msgstr "对方已下线"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-otr.js:139
+#: src/converse-otr.js:137
 msgid "Re-establishing encrypted session"
 msgstr "重新建立加密会话"
 
-#: src/converse-otr.js:150
+#: src/converse-otr.js:148
 msgid "Generating private key."
 msgstr "正在生成私钥"
 
-#: src/converse-otr.js:151
+#: src/converse-otr.js:149
 msgid "Your browser might become unresponsive."
 msgstr "您的浏览器可能会暂时无响应"
 
-#: src/converse-otr.js:189
-#, fuzzy
+#: src/converse-otr.js:187
+#, fuzzy, javascript-format
 msgid ""
 "Authentication request from %1$s\n"
 "\n"
@@ -962,49 +984,50 @@ msgstr ""
 "\n"
 "%2$s"
 
-#: src/converse-otr.js:198
+#: src/converse-otr.js:196
 msgid "Could not verify this user's identify."
 msgstr "无法验证对方信息。"
 
-#: src/converse-otr.js:240
+#: src/converse-otr.js:238
 #, fuzzy
 msgid "Exchanging private key with contact."
 msgstr "正在与对方交换私钥"
 
-#: src/converse-otr.js:329
+#: src/converse-otr.js:327
 msgid "Your messages are not encrypted anymore"
 msgstr "您的消息将不再被加密"
 
-#: src/converse-otr.js:331
+#: src/converse-otr.js:329
 #, fuzzy
 msgid ""
 "Your messages are now encrypted but your contact's identity has not been "
 "verified."
 msgstr "您的消息现已加密，但是对方身份尚未验证"
 
-#: src/converse-otr.js:333
+#: src/converse-otr.js:331
 #, fuzzy
 msgid "Your contact's identify has been verified."
 msgstr "对方的身份已通过验证。"
 
-#: src/converse-otr.js:335
+#: src/converse-otr.js:333
 #, fuzzy
 msgid "Your contact has ended encryption on their end, you should do the same."
 msgstr "对方已结束加密，您也需要做同样的操作。"
 
-#: src/converse-otr.js:345
+#: src/converse-otr.js:343
 msgid "Your message could not be sent"
 msgstr "您的消息无法送出"
 
-#: src/converse-otr.js:348
+#: src/converse-otr.js:346
 msgid "We received an unencrypted message"
 msgstr "我们收到了一条未加密的信息"
 
-#: src/converse-otr.js:351
+#: src/converse-otr.js:349
 msgid "We received an unreadable encrypted message"
 msgstr "我们收到一条无法读取的信息"
 
-#: src/converse-otr.js:379
+#: src/converse-otr.js:377
+#, javascript-format
 msgid ""
 "Here are the fingerprints, please confirm them with %1$s, outside of this "
 "chat.\n"
@@ -1024,7 +1047,7 @@ msgstr ""
 "\n"
 "如果确认符合，请点击OK，否则点击取消"
 
-#: src/converse-otr.js:392
+#: src/converse-otr.js:390
 #, fuzzy
 msgid ""
 "You will be prompted to provide a security question and then an answer to "
@@ -1037,60 +1060,60 @@ msgstr ""
 "\n"
 "对方需要回答相同的问题（区分大小写）,如果答案一致，身份将被验证。"
 
-#: src/converse-otr.js:393
+#: src/converse-otr.js:391
 msgid "What is your security question?"
 msgstr "您的安全问题是?"
 
-#: src/converse-otr.js:395
+#: src/converse-otr.js:393
 msgid "What is the answer to the security question?"
 msgstr "此安全问题的答案是?"
 
-#: src/converse-otr.js:399
+#: src/converse-otr.js:397
 msgid "Invalid authentication scheme provided"
 msgstr "非法的认证方式"
 
-#: src/converse-otr.js:413
+#: src/converse-otr.js:411
 msgid "Your messages are not encrypted. Click here to enable OTR encryption."
 msgstr "您的消息未加密。点击这里来启用OTR加密"
 
-#: src/converse-otr.js:415
+#: src/converse-otr.js:413
 #, fuzzy
 msgid "Your messages are encrypted, but your contact has not been verified."
 msgstr "您的消息已加密，但对方未通过验证"
 
-#: src/converse-otr.js:417
+#: src/converse-otr.js:415
 #, fuzzy
 msgid "Your messages are encrypted and your contact verified."
 msgstr "您的消息已加密，对方已验证。"
 
-#: src/converse-otr.js:419
+#: src/converse-otr.js:417
 #, fuzzy
 msgid ""
 "Your contact has closed their end of the private session, you should do the "
 "same"
 msgstr "对方已关闭私有会话，您也应该关闭"
 
-#: src/converse-otr.js:437
+#: src/converse-otr.js:435
 msgid "End encrypted conversation"
 msgstr "结束加密的会话"
 
-#: src/converse-otr.js:438
+#: src/converse-otr.js:436
 msgid "Refresh encrypted conversation"
 msgstr "刷新加密的会话"
 
-#: src/converse-otr.js:439
+#: src/converse-otr.js:437
 msgid "Start encrypted conversation"
 msgstr "开始加密的会话"
 
-#: src/converse-otr.js:440
+#: src/converse-otr.js:438
 msgid "Verify with fingerprints"
 msgstr "验证指纹"
 
-#: src/converse-otr.js:441
+#: src/converse-otr.js:439
 msgid "Verify with SMP"
 msgstr "验证SMP"
 
-#: src/converse-otr.js:442
+#: src/converse-otr.js:440
 msgid "What's this?"
 msgstr "这是什么?"
 
@@ -1100,180 +1123,201 @@ 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:476
+#: src/converse-otr.js:474
 msgid "unencrypted"
 msgstr "未加密"
 
-#: src/converse-otr.js:477
+#: src/converse-otr.js:475
 msgid "unverified"
 msgstr "未验证"
 
-#: src/converse-otr.js:478
+#: src/converse-otr.js:476
 msgid "verified"
 msgstr "已验证"
 
-#: src/converse-otr.js:479
+#: src/converse-otr.js:477
 msgid "finished"
 msgstr "结束了"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:117
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:133
+#: src/converse-register.js:141
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:134
+#: src/converse-register.js:142
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:135
+#: src/converse-register.js:143
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:136
+#: src/converse-register.js:144
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:141 src/converse-register.js:383
+#: src/converse-register.js:149 src/converse-register.js:391
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:186
+#: src/converse-register.js:194
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:272
+#: src/converse-register.js:280
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:305
+#: src/converse-register.js:313
+#, javascript-format
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:324
+#: src/converse-register.js:332
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:327
+#: src/converse-register.js:335
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:388
+#: src/converse-register.js:396
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:423
+#: 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:440
+#: src/converse-register.js:448
 msgid "Retry"
 msgstr ""
 
-#: src/converse-rosterview.js:84
+#: src/converse-roomslist.js:71
+#, fuzzy
+msgid "Click to toggle the rooms list"
+msgstr "打开聊天室"
+
+#: src/converse-roomslist.js:72
+#, fuzzy
+msgid "Open Rooms"
+msgstr "打开聊天室"
+
+#: src/converse-roomslist.js:103
+#, fuzzy, javascript-format
+msgid "Are you sure you want to leave the room \"%1$s\"?"
+msgstr "确定移除联系人吗？"
+
+#: src/converse-rosterview.js:85
 msgid "This contact is busy"
 msgstr "对方忙碌中"
 
-#: src/converse-rosterview.js:85
+#: src/converse-rosterview.js:86
 msgid "This contact is online"
 msgstr "对方在线中"
 
-#: src/converse-rosterview.js:86
+#: src/converse-rosterview.js:87
 msgid "This contact is offline"
 msgstr "对方已下线"
 
-#: src/converse-rosterview.js:87
+#: src/converse-rosterview.js:88
 msgid "This contact is unavailable"
 msgstr "对方免打扰"
 
-#: src/converse-rosterview.js:88
+#: src/converse-rosterview.js:89
 msgid "This contact is away for an extended period"
 msgstr "对方暂时离开"
 
-#: src/converse-rosterview.js:89
+#: src/converse-rosterview.js:90
 msgid "This contact is away"
 msgstr "对方离开"
 
-#: src/converse-rosterview.js:92
+#: src/converse-rosterview.js:93
 msgid "Groups"
 msgstr ""
 
-#: src/converse-rosterview.js:93
+#: src/converse-rosterview.js:94
 msgid "My contacts"
 msgstr "我的好友列表"
 
-#: src/converse-rosterview.js:94
+#: src/converse-rosterview.js:95
 msgid "Pending contacts"
 msgstr "保留中的联系人"
 
-#: src/converse-rosterview.js:95
+#: src/converse-rosterview.js:96
 msgid "Contact requests"
 msgstr "来自好友的请求"
 
-#: src/converse-rosterview.js:96
+#: src/converse-rosterview.js:97
 msgid "Ungrouped"
 msgstr ""
 
-#: src/converse-rosterview.js:154
+#: src/converse-rosterview.js:155
 msgid "Filter"
 msgstr ""
 
-#: src/converse-rosterview.js:157
+#: src/converse-rosterview.js:158
 msgid "State"
 msgstr ""
 
-#: src/converse-rosterview.js:158
+#: src/converse-rosterview.js:159
 msgid "Any"
 msgstr ""
 
 #: src/converse-rosterview.js:160
+msgid "Unread"
+msgstr ""
+
+#: src/converse-rosterview.js:162
 msgid "Chatty"
 msgstr ""
 
-#: src/converse-rosterview.js:163
+#: src/converse-rosterview.js:165
 msgid "Extended Away"
 msgstr ""
 
-#: src/converse-rosterview.js:610 src/converse-rosterview.js:630
-msgid "Click to remove this contact"
+#: src/converse-rosterview.js:578 src/converse-rosterview.js:606
+#, fuzzy, javascript-format
+msgid "Click to remove %1$s as a contact"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:618
-#, fuzzy
-msgid "Click to accept this contact request"
+#: src/converse-rosterview.js:586
+#, fuzzy, javascript-format
+msgid "Click to accept the contact request from %1$s"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:619
-#, fuzzy
-msgid "Click to decline this contact request"
+#: src/converse-rosterview.js:587
+#, fuzzy, javascript-format
+msgid "Click to decline the contact request from %1$s"
 msgstr "点击移除联系人"
 
-#: src/converse-rosterview.js:629
+#: src/converse-rosterview.js:605
 msgid "Click to chat with this contact"
 msgstr "点击与对方交谈"
 
-#: src/converse-rosterview.js:631
+#: src/converse-rosterview.js:607
 msgid "Name"
 msgstr ""
 
-#: src/converse-rosterview.js:686
+#: src/converse-rosterview.js:662
 #, fuzzy
 msgid "Are you sure you want to remove this contact?"
 msgstr "确定移除联系人吗？"
 
-#: src/converse-rosterview.js:697
+#: src/converse-rosterview.js:673
 msgid "Sorry, there was an error while trying to remove "
 msgstr ""
 
-#: src/converse-rosterview.js:716
+#: src/converse-rosterview.js:692
 #, fuzzy
 msgid "Are you sure you want to decline this contact request?"
 msgstr "确定移除联系人吗？"