3.0.0 release

06668d87 · JC Brand · 741f2a6b · 06668d87 · 06668d87 · 06668d87
Commit 06668d87 authored Mar 05, 2017 by JC Brand
44 changed files
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ serve: stamp-npm
 ########################################################################
 ## Translation machinery
-GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.10.1 -c
+GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.0.0 -c
 .PHONY: pot
 pot:
@@ -80,16 +80,16 @@ po2json:
 .PHONY: release
 release:
-	sed -i s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ src/start.frag
+	sed -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ src/start.frag
-	sed -i s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
+	sed -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
-	sed -i s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ bower.json
+	sed -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ bower.json
-	sed -i s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json
+	sed -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json
-	sed -i s/--package-version=[0-9]\+\.[0-9]\+\.[0-9]\+/--package-version=$(VERSION)/ Makefile
+	sed -ri s/--package-version=[0-9]\+\.[0-9]\+\.[0-9]\+/--package-version=$(VERSION)/ Makefile
-	sed -i s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.zip/v$(VERSION)\.zip/ index.html
+	sed -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.zip/v$(VERSION)\.zip/ index.html
-	sed -i s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.gz/v$(VERSION)\.tar\.gz/ index.html
+	sed -ri s/v[0-9]\+\.[0-9]\+\.[0-9]\+\.tar\.gz/v$(VERSION)\.tar\.gz/ index.html
-	sed -i s/version\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py
+	sed -ri s/version\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py
-	sed -i s/release\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/release\ =\ \'$(VERSION)\'/ docs/source/conf.py
+	sed -ri s/release\ =\ \'[0-9]\+\.[0-9]\+\.[0-9]\+\'/release\ =\ \'$(VERSION)\'/ docs/source/conf.py
-	sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.md
+	sed -ri "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.md
 	make pot
 	make po
 	make po2json

--- a/dist/converse-mobile.js
+++ b/dist/converse-mobile.js
--- a/dist/converse-no-dependencies.js
+++ b/dist/converse-no-dependencies.js
--- a/dist/converse.js
+++ b/dist/converse.js
--- a/dist/locales.js
+++ b/dist/locales.js
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
 # Changelog
-## 3.0.0 (Unreleased)
+## 3.0.0 (2017-03-05)
 - **Breaking changes**:
    * Callbacks for `converse.on` now no longer receive an event object as first parameter.

--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.5'
+version = '3.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.5'
+release = '3.0.0'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/locale/af/LC_MESSAGES/converse.json
+++ b/locale/af/LC_MESSAGES/converse.json
@@ -46,6 +46,10 @@
            null,
            ""
         ],
+         "You have unread messages": [
+            null,
+            "U het ongelese boodskappe"
+         ],
         "Close this chat box": [
            null,
            "Sluit hierdie kletskas"
@@ -210,6 +214,10 @@
            null,
            "Soek"
         ],
+         "e.g. user@example.org": [
+            null,
+            "bv. gebruiker@voorbeeld.org"
+         ],
         "Add": [
            null,
            "Voeg by"
@@ -246,6 +254,14 @@
            null,
            ""
         ],
+         "Connection error": [
+            null,
+            "Fout tydens verbinding"
+         ],
+         "An error occurred while connecting to the chat server.": [
+            null,
+            "A fout het voorgekom tydens verbinding met die kletsbediener"
+         ],
         "Connecting": [
            null,
            "Verbind tans"
@@ -258,6 +274,14 @@
            null,
            "Bekragtiging het gefaal"
         ],
+         "Connection failed": [
+            null,
+            "Verbinding het gefaal"
+         ],
+         "An error occurred while connecting to the chat server: ": [
+            null,
+            "A fout het voorgekom tydens verbinding met die kletsbediener: "
+         ],
         "Sorry, there was an error while trying to add ": [
            null,
            ""
@@ -294,6 +318,10 @@
            null,
            "Hierdie vertrek wys nie onbeskikbare lede nie"
         ],
+         "The room configuration has changed": [
+            null,
+            "Die kamer instellings het verander"
+         ],
         "Room logging is now enabled": [
            null,
            "Kamer log is nou aangeskakel"
@@ -302,6 +330,10 @@
            null,
            "Kamer log is nou afgeskakel"
         ],
+         "This room is now no longer anonymous": [
+            null,
+            "Hiedie kamer is nie meer anoniem nie"
+         ],
         "This room is now semi-anonymous": [
            null,
            "Hierdie kamer is nou gedeeltelik anoniem"
@@ -334,33 +366,17 @@
            null,
            "Jy is van hierdie kamer verwyder aangesien die MUC (Multi-user chat) diens nou afgeskakel word."
         ],
-         "<strong>%1$s</strong> has been banned": [
+         "Message": [
-            null,
-            "<strong>%1$s</strong> is verban"
-         ],
-         "<strong>%1$s</strong>'s nickname has changed": [
-            null,
-            "<strong>%1$s</strong> se bynaam het verander"
-         ],
-         "<strong>%1$s</strong> has been kicked out": [
-            null,
-            "<strong>%1$s</strong> is uitgeskop"
-         ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
            null,
-            "<strong>%1$s</strong> is verwyder a.g.v 'n verandering van affiliasie"
+            "Boodskap"
         ],
-         "<strong>%1$s</strong> has been removed for not being a member": [
+         "Close and leave this room": [
            null,
-            "<strong>%1$s</strong> is nie 'n lid nie, en dus verwyder"
+            "Sluit en verlaat hierdie kletskamer"
         ],
-         "Your nickname has been changed to: <strong>%1$s</strong>": [
+         "Configure this room": [
            null,
-            "U bynaam is verander na: <strong>%1$s</strong>"
+            "Konfigureer hierdie kletskamer"
-         ],
-         "Message": [
-            null,
-            "Boodskap"
         ],
         "Hide the list of occupants": [
            null,
@@ -422,9 +438,9 @@
            null,
            "Herroep gebruiker se lidmaatskap"
         ],
-         "Set room topic": [
+         "Set room subject (alias for /subject)": [
            null,
-            "Stel onderwerp vir kletskamer"
+            ""
         ],
         "Allow muted user to post messages": [
            null,
@@ -434,10 +450,18 @@
            null,
            ""
         ],
+         "Please choose your nickname": [
+            null,
+            "Kies asb. u bynaam"
+         ],
         "Nickname": [
            null,
            "Bynaam"
         ],
+         "Enter room": [
+            null,
+            "Betree kletskamer"
+         ],
         "This chatroom requires a password": [
            null,
            "Hiedie kletskamer benodig 'n wagwoord"
@@ -450,10 +474,30 @@
            null,
            "Dien in"
         ],
+         "This action was done by <strong>%1$s</strong>.": [
+            null,
+            "Hierdie aksie is uitgevoer deur: <strong>%1$s</strong>"
+         ],
+         "The reason given is: <em>\"%1$s\"</em>.": [
+            null,
+            "Die gegewe rede is: <em>\"%1$s\"</em>."
+         ],
         "The reason given is: \"": [
            null,
            "Die gegewe rede is: \""
         ],
+         " has left the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room.": [
+            null,
+            ""
+         ],
         "You are not on the member list of this room": [
            null,
            "Jy is nie op die ledelys van hierdie kamer nie"
@@ -482,14 +526,90 @@
            null,
            "Onderwerp deur %1$s bygewerk na: %2$s"
         ],
-         "Invite": [
+         "This user is a moderator.": [
            null,
-            "Nooi uit"
+            "Hierdie gebruiker is 'n moderator"
+         ],
+         "This user can send messages in this room.": [
+            null,
+            "Hierdie gebruiker kan boodskappe na die kamer stuur"
+         ],
+         "This user can NOT send messages in this room.": [
+            null,
+            "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
         ],
         "Occupants": [
            null,
            "Deelnemers"
         ],
+         "Invite": [
+            null,
+            "Nooi uit"
+         ],
+         "Hidden": [
+            null,
+            "Verskuil"
+         ],
+         "Message archiving": [
+            null,
+            ""
+         ],
+         "Members only": [
+            null,
+            ""
+         ],
+         "Moderated": [
+            null,
+            "Gemodereer"
+         ],
+         "Non-anonymous": [
+            null,
+            "Nie-anoniem"
+         ],
+         "Persistent": [
+            null,
+            ""
+         ],
+         "Public": [
+            null,
+            "Publiek"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Deels anoniem"
+         ],
+         "Unmoderated": [
+            null,
+            "Ongemodereer"
+         ],
+         "Unsecured": [
+            null,
+            ""
+         ],
+         "Messages are archived on the server": [
+            null,
+            ""
+         ],
+         "All other room occupants can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room pesists even if it's unoccupied": [
+            null,
+            ""
+         ],
+         "This room is publically searchable": [
+            null,
+            ""
+         ],
+         "Only moderators can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room will disappear once the last person leaves": [
+            null,
+            ""
+         ],
         "You are about to invite %1$s to the chat room \"%2$s\". ": [
            null,
            "U is op die punt om %1$s na die kletskamer \"%2$s\" uit te nooi."
@@ -542,22 +662,10 @@
            null,
            "Benodig magtiging"
         ],
-         "Hidden": [
-            null,
-            "Verskuil"
-         ],
         "Requires an invitation": [
            null,
            "Benodig 'n uitnodiging"
         ],
-         "Moderated": [
-            null,
-            "Gemodereer"
-         ],
-         "Non-anonymous": [
-            null,
-            "Nie-anoniem"
-         ],
         "Open room": [
            null,
            "Oop kletskamer"
@@ -566,22 +674,10 @@
            null,
            "Permanente kamer"
         ],
-         "Public": [
-            null,
-            "Publiek"
-         ],
-         "Semi-anonymous": [
-            null,
-            "Deels anoniem"
-         ],
         "Temporary room": [
            null,
            "Tydelike kamer"
         ],
-         "Unmoderated": [
-            null,
-            "Ongemodereer"
-         ],
         "%1$s has invited you to join a chat room: %2$s": [
            null,
            "%1$s het u uitgenooi om die kletskamer %2$s te besoek"
@@ -636,7 +732,7 @@
         ],
         "Your messages are now encrypted but your contact's identity has not been verified.": [
            null,
-            "U boodskappe is now versleutel maar u gespreksmaat se identiteit is nog onseker."
+            "U boodskappe is nou versleutel maar u gespreksmaat se identiteit is nog onseker."
         ],
         "Your contact's identify has been verified.": [
            null,

--- a/locale/af/LC_MESSAGES/converse.po
+++ b/locale/af/LC_MESSAGES/converse.po
--- a/locale/ca/LC_MESSAGES/converse.json
+++ b/locale/ca/LC_MESSAGES/converse.json
@@ -323,30 +323,6 @@
            null,
            "Se us ha eliminat d'aquesta sala perquè s'està tancant el servei MUC (xat multiusuari)."
         ],
-         "<strong>%1$s</strong> has been banned": [
-            null,
-            "S'ha expulsat <strong>%1$s</strong>"
-         ],
-         "<strong>%1$s</strong>'s nickname has changed": [
-            null,
-            "L'àlies de <strong>%1$s</strong> ha canviat"
-         ],
-         "<strong>%1$s</strong> has been kicked out": [
-            null,
-            "S'ha expulsat <strong>%1$s</strong>"
-         ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
-            null,
-            "S'ha eliminat <strong>%1$s</strong> a causa d'un canvi d'afiliació"
-         ],
-         "<strong>%1$s</strong> has been removed for not being a member": [
-            null,
-            "S'ha eliminat <strong>%1$s</strong> perquè no és membre"
-         ],
-         "Your nickname has been changed to: <strong>%1$s</strong>": [
-            null,
-            "El vostre àlies ha canviat a: <strong>%1$s</strong>"
-         ],
         "Message": [
            null,
            "Missatge"
@@ -411,9 +387,9 @@
            null,
            "Revoca l'afiliació de l'usuari"
         ],
-         "Set room topic": [
+         "Set room subject (alias for /subject)": [
            null,
-            "Defineix un tema per a la sala"
+            ""
         ],
         "Allow muted user to post messages": [
            null,
@@ -443,6 +419,18 @@
            null,
            "El motiu indicat és: \""
         ],
+         " has left the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room.": [
+            null,
+            ""
+         ],
         "You are not on the member list of this room": [
            null,
            "No sou a la llista de membres d'aquesta sala"
@@ -471,6 +459,70 @@
            null,
            "Ocupants"
         ],
+         "Hidden": [
+            null,
+            "Amagat"
+         ],
+         "Message archiving": [
+            null,
+            ""
+         ],
+         "Members only": [
+            null,
+            ""
+         ],
+         "Moderated": [
+            null,
+            "Moderada"
+         ],
+         "Non-anonymous": [
+            null,
+            "No és anònima"
+         ],
+         "Persistent": [
+            null,
+            ""
+         ],
+         "Public": [
+            null,
+            "Pública"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semianònima"
+         ],
+         "Unmoderated": [
+            null,
+            "No moderada"
+         ],
+         "Unsecured": [
+            null,
+            ""
+         ],
+         "Messages are archived on the server": [
+            null,
+            ""
+         ],
+         "All other room occupants can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room pesists even if it's unoccupied": [
+            null,
+            ""
+         ],
+         "This room is publically searchable": [
+            null,
+            ""
+         ],
+         "Only moderators can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room will disappear once the last person leaves": [
+            null,
+            ""
+         ],
         "You are about to invite %1$s to the chat room \"%2$s\". ": [
            null,
            "Esteu a punt de convidar %1$s a la sala de xat \"%2$s\". "
@@ -523,22 +575,10 @@
            null,
            "Cal autenticar-se"
         ],
-         "Hidden": [
-            null,
-            "Amagat"
-         ],
         "Requires an invitation": [
            null,
            "Cal tenir una invitació"
         ],
-         "Moderated": [
-            null,
-            "Moderada"
-         ],
-         "Non-anonymous": [
-            null,
-            "No és anònima"
-         ],
         "Open room": [
            null,
            "Obre la sala"
@@ -547,22 +587,10 @@
            null,
            "Sala permanent"
         ],
-         "Public": [
-            null,
-            "Pública"
-         ],
-         "Semi-anonymous": [
-            null,
-            "Semianònima"
-         ],
         "Temporary room": [
            null,
            "Sala temporal"
         ],
-         "Unmoderated": [
-            null,
-            "No moderada"
-         ],
         "%1$s has invited you to join a chat room: %2$s": [
            null,
            "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"

--- a/locale/ca/LC_MESSAGES/converse.po
+++ b/locale/ca/LC_MESSAGES/converse.po
--- a/locale/converse.pot
+++ b/locale/converse.pot
--- a/locale/de/LC_MESSAGES/converse.json
+++ b/locale/de/LC_MESSAGES/converse.json
@@ -319,30 +319,6 @@
            null,
            "Sie wurden aus diesem Raum entfernt, da der MUC (Multi-User Chat) Dienst gerade heruntergefahren wird."
         ],
-         "<strong>%1$s</strong> has been banned": [
-            null,
-            "<strong>%1$s</strong> ist verbannt worden"
-         ],
-         "<strong>%1$s</strong>'s nickname has changed": [
-            null,
-            "<strong>%1$s</strong> hat den Spitznamen geändert"
-         ],
-         "<strong>%1$s</strong> has been kicked out": [
-            null,
-            "<strong>%1$s</strong> wurde hinausgeworfen"
-         ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
-            null,
-            "<strong>%1$s</strong> wurde wegen einer Zugehörigkeitsänderung entfernt"
-         ],
-         "<strong>%1$s</strong> has been removed for not being a member": [
-            null,
-            "<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"
-         ],
-         "Your nickname has been changed to: <strong>%1$s</strong>": [
-            null,
-            "Ihr Spitzname wurde geändert zu: <strong>%1$s</strong>"
-         ],
         "Message": [
            null,
            "Nachricht"
@@ -399,9 +375,9 @@
            null,
            ""
         ],
-         "Set room topic": [
+         "Set room subject (alias for /subject)": [
            null,
-            "Chatraum Thema festlegen"
+            ""
         ],
         "Allow muted user to post messages": [
            null,
@@ -431,6 +407,18 @@
            null,
            "Die angegebene Begründung lautet: \""
         ],
+         " has left the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room.": [
+            null,
+            ""
+         ],
         "You are not on the member list of this room": [
            null,
            "Sie sind nicht auf der Mitgliederliste dieses Raums"
@@ -455,13 +443,77 @@
            null,
            "%1$s hat das Thema zu \"%2$s\" geändert"
         ],
+         "Occupants": [
+            null,
+            "Teilnehmer"
+         ],
         "Invite": [
            null,
            "Einladen"
         ],
-         "Occupants": [
+         "Hidden": [
            null,
-            "Teilnehmer"
+            "Versteckt"
+         ],
+         "Message archiving": [
+            null,
+            ""
+         ],
+         "Members only": [
+            null,
+            ""
+         ],
+         "Moderated": [
+            null,
+            "Moderiert"
+         ],
+         "Non-anonymous": [
+            null,
+            "Nicht anonym"
+         ],
+         "Persistent": [
+            null,
+            ""
+         ],
+         "Public": [
+            null,
+            "Öffentlich"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Teils anonym"
+         ],
+         "Unmoderated": [
+            null,
+            "Unmoderiert"
+         ],
+         "Unsecured": [
+            null,
+            ""
+         ],
+         "Messages are archived on the server": [
+            null,
+            ""
+         ],
+         "All other room occupants can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room pesists even if it's unoccupied": [
+            null,
+            ""
+         ],
+         "This room is publically searchable": [
+            null,
+            ""
+         ],
+         "Only moderators can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room will disappear once the last person leaves": [
+            null,
+            ""
         ],
         "You are about to invite %1$s to the chat room \"%2$s\". ": [
            null,
@@ -515,22 +567,10 @@
            null,
            "Authentifizierung erforderlich"
         ],
-         "Hidden": [
-            null,
-            "Versteckt"
-         ],
         "Requires an invitation": [
            null,
            "Einladung erforderlich"
         ],
-         "Moderated": [
-            null,
-            "Moderiert"
-         ],
-         "Non-anonymous": [
-            null,
-            "Nicht anonym"
-         ],
         "Open room": [
            null,
            "Offener Raum"
@@ -539,22 +579,10 @@
            null,
            "Dauerhafter Raum"
         ],
-         "Public": [
-            null,
-            "Öffentlich"
-         ],
-         "Semi-anonymous": [
-            null,
-            "Teils anonym"
-         ],
         "Temporary room": [
            null,
            "Vorübergehender Raum"
         ],
-         "Unmoderated": [
-            null,
-            "Unmoderiert"
-         ],
         "%1$s has invited you to join a chat room: %2$s": [
            null,
            "%1$s hat Sie in den Raum \"%2$s\" eingeladen"

--- a/locale/de/LC_MESSAGES/converse.po
+++ b/locale/de/LC_MESSAGES/converse.po
--- a/locale/en/LC_MESSAGES/converse.json
+++ b/locale/en/LC_MESSAGES/converse.json
@@ -347,31 +347,7 @@
            null,
            "You have been removed from this room because the MUC (Multi-user chat) service is being shut down."
         ],
-         "<strong>%1$s</strong> has been banned": [
+         "Your nickname has been automatically set to: %1$s": [
-            null,
-            "<strong>%1$s</strong> has been banned"
-         ],
-         "<strong>%1$s</strong>'s nickname has changed": [
-            null,
-            ""
-         ],
-         "<strong>%1$s</strong> has been kicked out": [
-            null,
-            "<strong>%1$s</strong> has been kicked out"
-         ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
-            null,
-            "<strong>%1$s</strong> has been removed because of an affiliation change"
-         ],
-         "<strong>%1$s</strong> has been removed for not being a member": [
-            null,
-            "<strong>%1$s</strong> has been removed for not being a member"
-         ],
-         "Your nickname has been automatically set to: <strong>%1$s</strong>": [
-            null,
-            ""
-         ],
-         "Your nickname has been changed to: <strong>%1$s</strong>": [
            null,
            ""
         ],
@@ -439,7 +415,11 @@
            null,
            ""
         ],
-         "Set room topic": [
+         "Set room subject": [
+            null,
+            ""
+         ],
+         "Set room subject (alias for /subject)": [
            null,
            ""
         ],
@@ -483,6 +463,18 @@
            null,
            ""
         ],
+         " has left the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room.": [
+            null,
+            ""
+         ],
         "You are not on the member list of this room": [
            null,
            "You are not on the member list of this room"
@@ -507,11 +499,75 @@
            null,
            "Topic set by %1$s to: %2$s"
         ],
+         "Occupants": [
+            null,
+            ""
+         ],
         "Invite": [
            null,
            ""
         ],
-         "Occupants": [
+         "Hidden": [
+            null,
+            "Hidden"
+         ],
+         "Message archiving": [
+            null,
+            ""
+         ],
+         "Members only": [
+            null,
+            ""
+         ],
+         "Moderated": [
+            null,
+            "Moderated"
+         ],
+         "Non-anonymous": [
+            null,
+            "Non-anonymous"
+         ],
+         "Persistent": [
+            null,
+            ""
+         ],
+         "Public": [
+            null,
+            "Public"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonymous"
+         ],
+         "Unmoderated": [
+            null,
+            "Unmoderated"
+         ],
+         "Unsecured": [
+            null,
+            ""
+         ],
+         "Messages are archived on the server": [
+            null,
+            ""
+         ],
+         "All other room occupants can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room pesists even if it's unoccupied": [
+            null,
+            ""
+         ],
+         "This room is publically searchable": [
+            null,
+            ""
+         ],
+         "Only moderators can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room will disappear once the last person leaves": [
            null,
            ""
         ],
@@ -567,22 +623,10 @@
            null,
            "Requires authentication"
         ],
-         "Hidden": [
-            null,
-            "Hidden"
-         ],
         "Requires an invitation": [
            null,
            "Requires an invitation"
         ],
-         "Moderated": [
-            null,
-            "Moderated"
-         ],
-         "Non-anonymous": [
-            null,
-            "Non-anonymous"
-         ],
         "Open room": [
            null,
            "Open room"
@@ -591,22 +635,10 @@
            null,
            "Permanent room"
         ],
-         "Public": [
-            null,
-            "Public"
-         ],
-         "Semi-anonymous": [
-            null,
-            "Semi-anonymous"
-         ],
         "Temporary room": [
            null,
            "Temporary room"
         ],
-         "Unmoderated": [
-            null,
-            "Unmoderated"
-         ],
         "%1$s has invited you to join a chat room: %2$s": [
            null,
            ""

--- a/locale/en/LC_MESSAGES/converse.po
+++ b/locale/en/LC_MESSAGES/converse.po
--- a/locale/es/LC_MESSAGES/converse.json
+++ b/locale/es/LC_MESSAGES/converse.json
@@ -291,22 +291,6 @@
            null,
            "Usted ha sido eliminado de esta sala debido a que el servicio MUC (Multi-user chat) está deshabilitado."
         ],
-         "<strong>%1$s</strong> has been banned": [
-            null,
-            "<strong>%1$s</strong> ha sido bloqueado"
-         ],
-         "<strong>%1$s</strong> has been kicked out": [
-            null,
-            "<strong>%1$s</strong> ha sido expulsado"
-         ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
-            null,
-            "<strong>%1$s</strong> ha sido eliminado debido a un cambio de afiliación"
-         ],
-         "<strong>%1$s</strong> has been removed for not being a member": [
-            null,
-            "<strong>%1$s</strong> ha sido eliminado debido a que no es miembro"
-         ],
         "Message": [
            null,
            "Mensaje"
@@ -355,6 +339,10 @@
            null,
            ""
         ],
+         "Set room subject (alias for /subject)": [
+            null,
+            ""
+         ],
         "Allow muted user to post messages": [
            null,
            ""
@@ -391,6 +379,18 @@
            null,
            ""
         ],
+         " has left the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room. \"": [
+            null,
+            ""
+         ],
+         " has joined the room.": [
+            null,
+            ""
+         ],
         "You are not on the member list of this room": [
            null,
            "Usted no está en la lista de miembros de esta sala"
@@ -415,13 +415,77 @@
            null,
            "Tema fijado por %1$s a: %2$s"
         ],
+         "Occupants": [
+            null,
+            "Ocupantes"
+         ],
         "Invite": [
            null,
            ""
         ],
-         "Occupants": [
+         "Hidden": [
            null,
-            "Ocupantes"
+            "Oculto"
+         ],
+         "Message archiving": [
+            null,
+            ""
+         ],
+         "Members only": [
+            null,
+            ""
+         ],
+         "Moderated": [
+            null,
+            "Moderado"
+         ],
+         "Non-anonymous": [
+            null,
+            "No anónimo"
+         ],
+         "Persistent": [
+            null,
+            ""
+         ],
+         "Public": [
+            null,
+            "Pública"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi anónimo"
+         ],
+         "Unmoderated": [
+            null,
+            "Sin moderar"
+         ],
+         "Unsecured": [
+            null,
+            ""
+         ],
+         "Messages are archived on the server": [
+            null,
+            ""
+         ],
+         "All other room occupants can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room pesists even if it's unoccupied": [
+            null,
+            ""
+         ],
+         "This room is publically searchable": [
+            null,
+            ""
+         ],
+         "Only moderators can see your Jabber ID": [
+            null,
+            ""
+         ],
+         "This room will disappear once the last person leaves": [
+            null,
+            ""
         ],
         "You are about to invite %1$s to the chat room \"%2$s\". ": [
            null,
@@ -471,22 +535,10 @@
            null,
            "Autenticación requerida"
         ],
-         "Hidden": [
-            null,
-            "Oculto"
-         ],
         "Requires an invitation": [
            null,
            "Requiere una invitación"
         ],
-         "Moderated": [
-            null,
-            "Moderado"
-         ],
-         "Non-anonymous": [
-            null,
-            "No anónimo"
-         ],
         "Open room": [
            null,
            "Abrir sala"
@@ -495,22 +547,10 @@
            null,
            "Sala permanente"
         ],
-         "Public": [
-            null,
-            "Pública"
-         ],
-         "Semi-anonymous": [
-            null,
-            "Semi anónimo"
-         ],
         "Temporary room": [
            null,
            "Sala temporal"
         ],
-         "Unmoderated": [
-            null,
-            "Sin moderar"
-         ],
         "%1$s has invited you to join a chat room: %2$s": [
            null,
            ""

--- a/locale/es/LC_MESSAGES/converse.po
+++ b/locale/es/LC_MESSAGES/converse.po
--- a/locale/fr/LC_MESSAGES/converse.json
+++ b/locale/fr/LC_MESSAGES/converse.json
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po
--- a/locale/he/LC_MESSAGES/converse.json
+++ b/locale/he/LC_MESSAGES/converse.json
--- a/locale/he/LC_MESSAGES/converse.po
+++ b/locale/he/LC_MESSAGES/converse.po
--- a/locale/hu/LC_MESSAGES/converse.json
+++ b/locale/hu/LC_MESSAGES/converse.json
--- a/locale/hu/LC_MESSAGES/converse.po
+++ b/locale/hu/LC_MESSAGES/converse.po
--- a/locale/id/LC_MESSAGES/converse.json
+++ b/locale/id/LC_MESSAGES/converse.json
--- a/locale/id/LC_MESSAGES/converse.po
+++ b/locale/id/LC_MESSAGES/converse.po
--- a/locale/it/LC_MESSAGES/converse.json
+++ b/locale/it/LC_MESSAGES/converse.json
--- a/locale/it/LC_MESSAGES/converse.po
+++ b/locale/it/LC_MESSAGES/converse.po
--- a/locale/ja/LC_MESSAGES/converse.json
+++ b/locale/ja/LC_MESSAGES/converse.json
--- a/locale/ja/LC_MESSAGES/converse.po
+++ b/locale/ja/LC_MESSAGES/converse.po
--- a/locale/nb/LC_MESSAGES/converse.json
+++ b/locale/nb/LC_MESSAGES/converse.json
--- a/locale/nb/LC_MESSAGES/converse.po
+++ b/locale/nb/LC_MESSAGES/converse.po
--- a/locale/nl/LC_MESSAGES/converse.json
+++ b/locale/nl/LC_MESSAGES/converse.json
--- a/locale/nl/LC_MESSAGES/converse.po
+++ b/locale/nl/LC_MESSAGES/converse.po
--- a/locale/pl/LC_MESSAGES/converse.json
+++ b/locale/pl/LC_MESSAGES/converse.json
--- a/locale/pl/LC_MESSAGES/converse.po
+++ b/locale/pl/LC_MESSAGES/converse.po
--- a/locale/pt_BR/LC_MESSAGES/converse.json
+++ b/locale/pt_BR/LC_MESSAGES/converse.json
--- a/locale/pt_BR/LC_MESSAGES/converse.po
+++ b/locale/pt_BR/LC_MESSAGES/converse.po
--- a/locale/ru/LC_MESSAGES/converse.json
+++ b/locale/ru/LC_MESSAGES/converse.json
--- a/locale/ru/LC_MESSAGES/converse.po
+++ b/locale/ru/LC_MESSAGES/converse.po
--- a/locale/uk/LC_MESSAGES/converse.json
+++ b/locale/uk/LC_MESSAGES/converse.json
--- a/locale/uk/LC_MESSAGES/converse.po
+++ b/locale/uk/LC_MESSAGES/converse.po
--- a/locale/zh/LC_MESSAGES/converse.json
+++ b/locale/zh/LC_MESSAGES/converse.json
--- a/locale/zh/LC_MESSAGES/converse.po
+++ b/locale/zh/LC_MESSAGES/converse.po