Release candicate for 3.2.0

COPYRIGHT

@@ -2,7 +2,7 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 3.1.0
+ *  Version: 3.2.0-rc
  *
  *  Copyright: JC Brand 2012-2017
  *  Except for 3rd party dependencies.

Makefile

@@ -61,7 +61,7 @@ serve_bg: dev
 ########################################################################
 ## Translation machinery
 
-GETTEXT = xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot src/*.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=3.1.0 -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.2.0-rc -c
 
 .PHONY: pot
 pot:

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "3.1.1",
+  "version": "3.2.0-rc",
   "license": "MPL-2.0",
   "devDependencies": {},
   "dependencies": {},

docs/source/conf.py

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

locale/af/LC_MESSAGES/converse.json

@@ -255,54 +255,6 @@
             null,
             "Geen gebruikers gevind"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Klik om as kletskontak by te voeg"
-         ],
-         "Toggle chat": [
-            null,
-            "Klets"
-         ],
-         "Reconnecting": [
-            null,
-            "Herkonnekteer"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            "Die konneksie is onderbreek, probeer tans tans om te herkonnekteer."
-         ],
-         "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"
-         ],
-         "Authenticating": [
-            null,
-            "Besig om te bekragtig"
-         ],
-         "Authentication Failed": [
-            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,
-            "Jammer, 'n ander fout het voorgekom tydens byvoeging. "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
@@ -431,9 +383,9 @@
             null,
             "Verskuil die lys van deelnemers"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Fout: die \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -535,9 +487,9 @@
             null,
             "Die gegewe rede is: \"%1$s\"."
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Die gegewe rede is: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -587,10 +539,6 @@
             null,
             "Onderwerp deur %1$s bygewerk na: %2$s"
          ],
-         "Click to mention ": [
-            null,
-            "Klik om te noem "
-         ],
          "This user is a moderator.": [
             null,
             "Hierdie gebruiker is 'n moderator."
@@ -683,10 +631,6 @@
             null,
             "Hierdie kletskamer word gemodereer"
          ],
-         "All other room occupants can see your Jabber ID": [
-            null,
-            "Alle ander deelnemers can u Jabber ID sien"
-         ],
          "Anyone can join this room": [
             null,
             "Enige iemand kan hierdie kletskamer binnekom"
@@ -703,10 +647,6 @@
             null,
             "Hierdie kletskamer is publiek opspoorbaar"
          ],
-         "Only moderators can see your Jabber ID": [
-            null,
-            "Slegs moderators kan u Jabber ID sien"
-         ],
          "This room will disappear once the last person leaves": [
             null,
             "Hierdie kletskamer sal verdwyn sodra die laaste persoon dit verlaat"
@@ -727,6 +667,10 @@
             null,
             "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te staaf."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Kamer naam"
@@ -751,17 +695,13 @@
             null,
             "Geen kletskamers op %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Kletskamers op %1$s"
-         ],
          "Description:": [
             null,
             "Beskrywing:"
          ],
-         "Server:": [
+         "Room Address (JID):": [
             null,
-            "Bediener:"
+            ""
          ],
          "Occupants:": [
             null,
@@ -987,10 +927,6 @@
             null,
             "Suksesvol geregistreer"
          ],
-         "Return": [
-            null,
-            "Terug"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "Die verskaffer het u registrasieversoek verwerp. Kontrolleer asb. jou gegewe waardes vir korrektheid."
@@ -1079,10 +1015,6 @@
             null,
             "Is u seker u wil hierdie gespreksmaat verwyder?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Jammer, 'n fout het voorgekom tydens die verwydering van "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Is u seker dat u hierdie persoon se versoek wil afkeur?"

locale/ca/LC_MESSAGES/converse.json

@@ -235,34 +235,6 @@
             null,
             "No s'ha trobat cap usuari"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Feu clic per afegir com a contacte del xat"
-         ],
-         "Toggle chat": [
-            null,
-            "Canvia de xat"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "S'està establint la connexió"
-         ],
-         "Authenticating": [
-            null,
-            "S'està efectuant l'autenticació"
-         ],
-         "Authentication Failed": [
-            null,
-            "Error d'autenticació"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "S'ha produït un error en intentar afegir "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Aquest client no admet les subscripcions de presència"
@@ -343,9 +315,9 @@
             null,
             "Amaga la llista d'ocupants"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Error: el \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -427,9 +399,9 @@
             null,
             "Envia"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "El motiu indicat és: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -495,7 +467,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -503,7 +475,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -519,6 +491,10 @@
             null,
             "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nom de la sala"
@@ -543,14 +519,14 @@
             null,
             "No hi ha cap sala a %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Sales a %1$s"
-         ],
          "Description:": [
             null,
             "Descripció:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Ocupants:"
@@ -771,10 +747,6 @@
             null,
             "Registre correcte"
          ],
-         "Return": [
-            null,
-            "Torna"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "El proveïdor ha rebutjat l'intent de registre. Comproveu que els valors que heu introduït siguin correctes."
@@ -863,10 +835,6 @@
             null,
             "Segur que voleu eliminar aquest contacte?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "S'ha produït un error en intentar eliminar "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Segur que voleu rebutjar aquesta sol·licitud de contacte?"

locale/de/LC_MESSAGES/converse.json

@@ -255,54 +255,6 @@
             null,
             "Keine Benutzer gefunden"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Hier klicken um als Kontakt hinzuzufügen"
-         ],
-         "Toggle chat": [
-            null,
-            "Chat ein-/ausblenden"
-         ],
-         "Reconnecting": [
-            null,
-            "Verbindung wiederherstellen"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            "Die Verbindung wurde unterbrochen. Versuche neu zu verbinden."
-         ],
-         "Connection error": [
-            null,
-            "Verbindungsfehler"
-         ],
-         "An error occurred while connecting to the chat server.": [
-            null,
-            "Beim Speichern des Formulars ist ein Fehler aufgetreten."
-         ],
-         "Connecting": [
-            null,
-            "Verbindungsaufbau"
-         ],
-         "Authenticating": [
-            null,
-            "Authentifizierung"
-         ],
-         "Authentication Failed": [
-            null,
-            "Authentifizierung gescheitert"
-         ],
-         "Connection failed": [
-            null,
-            "Verbindung fehlgeschlagen"
-         ],
-         "An error occurred while connecting to the chat server: ": [
-            null,
-            "Es trat ein Fehler während des Verbindungsvorgangs mit dem Chat-Server auf: "
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Entschuldige, es kam zu einem Fehler bei der Hinzufügung von "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Dieser Kontakt erlaubt die Abonnieren des Status nicht"
@@ -431,9 +383,9 @@
             null,
             "Teilnehmerliste ausblenden"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Fehler: Das \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -535,9 +487,9 @@
             null,
             "Die angegebene Begründung lautet: \"%1$s\"."
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Die angegebene Begründung lautet: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -587,10 +539,6 @@
             null,
             "%1$s hat das Thema zu \"%2$s\" geändert"
          ],
-         "Click to mention ": [
-            null,
-            "Drücke um zu erwähnen "
-         ],
          "This user is a moderator.": [
             null,
             "Dieser Benutzer ist ein Moderator."
@@ -683,10 +631,6 @@
             null,
             "Dieser Raum ist moderiert"
          ],
-         "All other room occupants can see your Jabber ID": [
-            null,
-            "Jeder in dem Raum kann deine Jabber ID sehen"
-         ],
          "Anyone can join this room": [
             null,
             "Jeder kann diesen Raum betreten"
@@ -703,10 +647,6 @@
             null,
             "Dieser Raum ist per Suche auffindbar"
          ],
-         "Only moderators can see your Jabber ID": [
-            null,
-            "Nur Moderatoren können deine Jabber ID sehen"
-         ],
          "This room will disappear once the last person leaves": [
             null,
             "Dieser Raum verschwindet sobald diesen die letzte Person verlassen hat"
@@ -727,6 +667,10 @@
             null,
             "Du kannst optional eine Nachricht mit den Gründen der Einladung mitsenden."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Raumname"
@@ -751,17 +695,13 @@
             null,
             "Keine Räume auf %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Räume auf %1$s"
-         ],
          "Description:": [
             null,
             "Beschreibung:"
          ],
-         "Server:": [
+         "Room Address (JID):": [
             null,
-            "Server:"
+            ""
          ],
          "Occupants:": [
             null,
@@ -987,10 +927,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            "Zurück"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -1079,10 +1015,6 @@
             null,
             "Wollen Sie diesen Kontakt wirklich entfernen?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"

locale/es/LC_MESSAGES/converse.json

@@ -203,38 +203,6 @@
             null,
             "Sin usuarios encontrados"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Haga click para agregar como contacto de chat"
-         ],
-         "Toggle chat": [
-            null,
-            "Chat"
-         ],
-         "Reconnecting": [
-            null,
-            "Reconectando"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Conectando"
-         ],
-         "Authenticating": [
-            null,
-            "Autenticando"
-         ],
-         "Authentication Failed": [
-            null,
-            "La autenticación falló"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -311,7 +279,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -387,7 +355,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -459,7 +427,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -467,7 +435,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -483,6 +451,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nombre de sala"
@@ -503,14 +475,14 @@
             null,
             "Sin salas en %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Salas en %1$s"
-         ],
          "Description:": [
             null,
             "Descripción"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Ocupantes:"
@@ -695,10 +667,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -786,10 +754,6 @@
          "Are you sure you want to remove this contact?": [
             null,
             "¿Esta seguro de querer eliminar este contacto?"
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

locale/fr/LC_MESSAGES/converse.json

@@ -251,54 +251,6 @@
             null,
             "Aucun utilisateur trouvé"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Cliquer pour ajouter aux contacts"
-         ],
-         "Toggle chat": [
-            null,
-            "Ouvrir IM"
-         ],
-         "Reconnecting": [
-            null,
-            "Reconnexion"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            "La connexion a été perdue, tentative de reconnexion en cours."
-         ],
-         "Connection error": [
-            null,
-            "Erreur de connexion"
-         ],
-         "An error occurred while connecting to the chat server.": [
-            null,
-            "Une erreur est survenue lors de la connexion au serveur de discussion."
-         ],
-         "Connecting": [
-            null,
-            "Connexion"
-         ],
-         "Authenticating": [
-            null,
-            "Authentification"
-         ],
-         "Authentication Failed": [
-            null,
-            "L’authentification a échoué"
-         ],
-         "Connection failed": [
-            null,
-            "La connexion a échoué"
-         ],
-         "An error occurred while connecting to the chat server: ": [
-            null,
-            "Une erreur est survenue lors de la connexion au serveur de discussion : "
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Désolé, il y a eu une erreur lors de la tentative d’ajout "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Ce client ne permet pas les mises à jour de disponibilité"
@@ -427,9 +379,9 @@
             null,
             "Cacher la liste des participants"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Erreur : \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -531,9 +483,9 @@
             null,
             "La raison indiquée est : « %1$s »."
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "La raison indiquée est : \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -555,10 +507,6 @@
             null,
             "Le sujet « %2$s » a été défini par %1$s"
          ],
-         "Click to mention ": [
-            null,
-            "Cliquer pour citer "
-         ],
          "This user is a moderator.": [
             null,
             "Cet utilisateur est un modérateur."
@@ -647,10 +595,6 @@
             null,
             "Ce salon est modéré"
          ],
-         "All other room occupants can see your Jabber ID": [
-            null,
-            "Tous les autres occupants de ce salon peuvent voir votre ID Jabber"
-         ],
          "Anyone can join this room": [
             null,
             "N’importe qui peut rejoindre ce salon"
@@ -659,10 +603,6 @@
             null,
             "Ce salon nécessite un mot de passe pour y accéder"
          ],
-         "Only moderators can see your Jabber ID": [
-            null,
-            "Seuls les modérateurs peuvent voir votre identifiant Jabber"
-         ],
          "This room will disappear once the last person leaves": [
             null,
             "Ce salon disparaîtra au départ de la dernière personne"
@@ -683,6 +623,10 @@
             null,
             "Vous pouvez facultativement ajouter un message, expliquant la raison de cette invitation."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nom du salon"
@@ -707,14 +651,14 @@
             null,
             "Aucun salon dans %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Salons dans %1$s"
-         ],
          "Description:": [
             null,
             "Description :"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Participants :"
@@ -939,10 +883,6 @@
             null,
             "Enregistré avec succès"
          ],
-         "Return": [
-            null,
-            "Retourner"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "Le fournisseur a rejeté votre demande d’enregistrement."
@@ -1031,10 +971,6 @@
             null,
             "Voulez-vous vraiment supprimer ce contact ?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Désolé, il y a eu une erreur lors de la tentative de retrait "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Voulez-vous vraiment refuser cette demande de contact ?"

locale/he/LC_MESSAGES/converse.json

@@ -231,38 +231,6 @@
             null,
             "לא נמצאו משתמשים"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "לחץ כדי להוסיף בתור איש קשר שיחה"
-         ],
-         "Toggle chat": [
-            null,
-            "הפעל שיח"
-         ],
-         "Reconnecting": [
-            null,
-            "כעת מתחבר"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "כעת מתחבר"
-         ],
-         "Authenticating": [
-            null,
-            "כעת מאמת"
-         ],
-         "Authentication Failed": [
-            null,
-            "אימות נכשל"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "לקוח זה לא מתיר הרשמות נוכחות"
@@ -339,7 +307,7 @@
             null,
             "הודעה"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -419,9 +387,9 @@
             null,
             "שלח"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "הסיבה שניתנה היא: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -491,7 +459,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -499,7 +467,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -515,6 +483,10 @@
             null,
             "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "שם חדר"
@@ -539,14 +511,14 @@
             null,
             "אין חדרים על %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "חדרים על %1$s"
-         ],
          "Description:": [
             null,
             "תיאור:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "נוכחים:"
@@ -767,10 +739,6 @@
             null,
             "נרשם בהצלחה"
          ],
-         "Return": [
-            null,
-            "חזור"
-         ],
          "Retry": [
             null,
             ""
@@ -855,10 +823,6 @@
             null,
             "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"

locale/hu/LC_MESSAGES/converse.json

@@ -234,38 +234,6 @@
             null,
             "Nincs felhasználó"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Felvétel a csevegőpartnerek közé"
-         ],
-         "Toggle chat": [
-            null,
-            "Csevegőablak"
-         ],
-         "Reconnecting": [
-            null,
-            "Kapcsolódás"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Kapcsolódás"
-         ],
-         "Authenticating": [
-            null,
-            "Azonosítás"
-         ],
-         "Authentication Failed": [
-            null,
-            "Azonosítási hiba"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Sajnáljuk, hiba történt a hozzáadás során"
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Ez a kliens nem engedélyezi a jelenlét követését"
@@ -346,9 +314,9 @@
             null,
             "A résztvevők listájának elrejtése"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Hiba: a \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -430,9 +398,9 @@
             null,
             "Küldés"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Az indok: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -502,7 +470,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -510,7 +478,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -526,6 +494,10 @@
             null,
             "Megadhat egy üzenet a meghívás okaként."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Szoba neve"
@@ -550,14 +522,14 @@
             null,
             "Nincs csevegőszoba a(z) %1$s szerveren"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Csevegőszobák a(z) %1$s szerveren:"
-         ],
          "Description:": [
             null,
             "Leírás:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Jelenlevők:"
@@ -778,10 +750,6 @@
             null,
             "Sikeres regisztráció"
          ],
-         "Return": [
-            null,
-            "Visza"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "A szolgáltató visszautasította a regisztrációs kérelmet. Kérem ellenőrízze a bevitt adatok pontosságát."
@@ -870,10 +838,6 @@
             null,
             "Valóban törölni szeretné a csevegőpartnerét?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Sajnáljuk, hiba történt a törlés során"
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Valóban elutasítja ezt a partnerkérelmet?"

locale/id/LC_MESSAGES/converse.json

@@ -202,34 +202,6 @@
             null,
             "Pengguna tak ditemukan"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Klik untuk menambahkan sebagai teman"
-         ],
-         "Toggle chat": [
-            null,
-            ""
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Menyambung"
-         ],
-         "Authenticating": [
-            null,
-            "Melakukan otentikasi"
-         ],
-         "Authentication Failed": [
-            null,
-            "Otentikasi gagal"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -302,7 +274,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -374,7 +346,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -442,7 +414,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -450,7 +422,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -466,6 +438,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nama ruangan"
@@ -486,14 +462,14 @@
             null,
             "Tak ada ruangan di %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Ruangan di %1$s"
-         ],
          "Description:": [
             null,
             "Keterangan:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Penghuni:"
@@ -682,10 +658,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -769,10 +741,6 @@
          "Name": [
             null,
             ""
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

locale/it/LC_MESSAGES/converse.json

@@ -255,54 +255,6 @@
             null,
             "Nessun utente trovato"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Clicca per aggiungere il contatto alla chat"
-         ],
-         "Toggle chat": [
-            null,
-            "Attiva/disattiva chat"
-         ],
-         "Reconnecting": [
-            null,
-            "Riconnessione"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            "La connessione è caduta, attendi la riconnessione."
-         ],
-         "Connection error": [
-            null,
-            "Errore di connessione"
-         ],
-         "An error occurred while connecting to the chat server.": [
-            null,
-            "Si è verificato un errore durante la connessione al server."
-         ],
-         "Connecting": [
-            null,
-            "Connessione in corso"
-         ],
-         "Authenticating": [
-            null,
-            "Autenticazione in corso"
-         ],
-         "Authentication Failed": [
-            null,
-            "Autenticazione fallita"
-         ],
-         "Connection failed": [
-            null,
-            "Errore di connessione"
-         ],
-         "An error occurred while connecting to the chat server: ": [
-            null,
-            "Si è verificato un errore durante la connessione al server. "
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Si è verificato un errore durante il tentativo di aggiunta "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Questo client non consente sottoscrizioni di presenza"
@@ -431,9 +383,9 @@
             null,
             "Nascondi la lista degli occupanti"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Errore: il \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -527,9 +479,9 @@
             null,
             "Invia"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "La ragione data è: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -551,10 +503,6 @@
             null,
             "Topic impostato da %1$s a: %2$s"
          ],
-         "Click to mention ": [
-            null,
-            "Clicca per citare "
-         ],
          "This user is a moderator.": [
             null,
             "Questo utente è un moderatore."
@@ -643,10 +591,6 @@
             null,
             "Questa stanza è moderata"
          ],
-         "All other room occupants can see your Jabber ID": [
-            null,
-            "Tutti gli occupanti della stanza possono vedere il tuo Jabber ID"
-         ],
          "Anyone can join this room": [
             null,
             "Chiunque può collegarsi a questa stanza"
@@ -659,10 +603,6 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
-            null,
-            "Solo il moderatore può vedere il tuo Jabber ID"
-         ],
          "This room will disappear once the last person leaves": [
             null,
             ""
@@ -683,6 +623,10 @@
             null,
             "Puoi includere un messaggio per spiegare le ragioni dell'invito."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nome stanza"
@@ -707,14 +651,14 @@
             null,
             "Nessuna stanza su %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Stanze su %1$s"
-         ],
          "Description:": [
             null,
             "Descrizione:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Utenti presenti:"
@@ -939,10 +883,6 @@
             null,
             "Registrazione riuscita"
          ],
-         "Return": [
-            null,
-            "Ritorna"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "Il provider ha respinto il tentativo di registrazione. Controlla i dati inseriti."
@@ -1031,10 +971,6 @@
             null,
             "Sei sicuro di voler rimuovere questo contatto?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Si è verificato un errore durante il tentativo di rimozione "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Sei sicuro dirifiutare questa richiesta di contatto?"

locale/ja/LC_MESSAGES/converse.json

@@ -203,34 +203,6 @@
             null,
             "ユーザーが見つかりません"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "クリックしてチャットの相手先として追加"
-         ],
-         "Toggle chat": [
-            null,
-            ""
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "接続中です"
-         ],
-         "Authenticating": [
-            null,
-            "認証中"
-         ],
-         "Authentication Failed": [
-            null,
-            "認証に失敗"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -303,7 +275,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -375,7 +347,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -443,7 +415,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -451,7 +423,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -467,6 +439,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "談話室の名前"
@@ -487,14 +463,14 @@
             null,
             "%1$s に談話室はありません"
          ],
-         "Rooms on %1$s": [
-            null,
-            "%1$s の談話室一覧"
-         ],
          "Description:": [
             null,
             "説明: "
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "入室者:"
@@ -683,10 +659,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -770,10 +742,6 @@
          "Name": [
             null,
             ""
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

locale/nb/LC_MESSAGES/converse.json

@@ -215,38 +215,6 @@
             null,
             "Ingen brukere funnet"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Klikk for å legge til som meldingskontakt"
-         ],
-         "Toggle chat": [
-            null,
-            "Endre chatten"
-         ],
-         "Reconnecting": [
-            null,
-            "Kobler til igjen"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Kobler til"
-         ],
-         "Authenticating": [
-            null,
-            "Godkjenner"
-         ],
-         "Authentication Failed": [
-            null,
-            "Godkjenning mislyktes"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -323,7 +291,7 @@
             null,
             "Melding"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -399,9 +367,9 @@
             null,
             "Send"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Årsaken som er oppgitt er: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -471,7 +439,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -479,7 +447,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -495,6 +463,10 @@
             null,
             "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Romnavn"
@@ -515,14 +487,14 @@
             null,
             "Ingen rom på %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Rom på %1$s"
-         ],
          "Description:": [
             null,
             "Beskrivelse:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Brukere her:"
@@ -743,10 +715,6 @@
             null,
             "Registrering var vellykket"
          ],
-         "Return": [
-            null,
-            "Tilbake"
-         ],
          "Retry": [
             null,
             ""
@@ -831,10 +799,6 @@
             null,
             "Er du sikker på at du vil fjerne denne kontakten?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Er du sikker på at du vil avslå denne kontaktforespørselen?"

locale/nl/LC_MESSAGES/converse.json

@@ -195,34 +195,6 @@
             null,
             "Geen gebruikers gevonden"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Klik om contact toe te voegen"
-         ],
-         "Toggle chat": [
-            null,
-            ""
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Verbinden"
-         ],
-         "Authenticating": [
-            null,
-            "Authenticeren"
-         ],
-         "Authentication Failed": [
-            null,
-            "Authenticeren mislukt"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -307,7 +279,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -379,7 +351,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -447,7 +419,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -455,7 +427,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -471,6 +443,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Room naam"
@@ -491,14 +467,14 @@
             null,
             "Geen room op %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Room op %1$s"
-         ],
          "Description:": [
             null,
             "Beschrijving"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Deelnemers:"
@@ -695,10 +671,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -782,10 +754,6 @@
          "Name": [
             null,
             ""
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

locale/pl/LC_MESSAGES/converse.json

@@ -247,38 +247,6 @@
             null,
             "Nie znaleziono użytkowników"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Kliknij aby dodać jako kontakt"
-         ],
-         "Toggle chat": [
-            null,
-            "Przełącz rozmowę"
-         ],
-         "Reconnecting": [
-            null,
-            "Przywracam połączenie"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Łączę się"
-         ],
-         "Authenticating": [
-            null,
-            "Autoryzuję"
-         ],
-         "Authentication Failed": [
-            null,
-            "Autoryzacja nie powiodła się"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Wystąpił błąd w czasie próby dodania "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Klient nie umożliwia subskrybcji obecności"
@@ -363,9 +331,9 @@
             null,
             "Ukryj listę rozmówców"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Błąd: \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -455,9 +423,9 @@
             null,
             "Wyślij"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Podana przyczyna to: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -539,7 +507,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -547,7 +515,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -563,6 +531,10 @@
             null,
             "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę zaproszenia."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nazwa pokoju"
@@ -587,14 +559,14 @@
             null,
             "Brak jest pokojów na %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Pokoje na %1$s"
-         ],
          "Description:": [
             null,
             "Opis:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Uczestnicy:"
@@ -819,10 +791,6 @@
             null,
             "Szczęśliwie zarejestrowany"
          ],
-         "Return": [
-            null,
-            "Powrót"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "Dostawca odrzucił twoją próbę rejestracji. Sprawdź proszę poprawność danych które zostały wprowadzone."
@@ -911,10 +879,6 @@
             null,
             "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Wystąpił błąd w trakcie próby usunięcia "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"

locale/pt_BR/LC_MESSAGES/converse.json

@@ -195,34 +195,6 @@
             null,
             "Não foram encontrados usuários"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Clique para adicionar como um contato do chat"
-         ],
-         "Toggle chat": [
-            null,
-            "Alternar bate-papo"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Conectando"
-         ],
-         "Authenticating": [
-            null,
-            "Autenticando"
-         ],
-         "Authentication Failed": [
-            null,
-            "Falha de autenticação"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -295,7 +267,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -367,7 +339,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -435,7 +407,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -443,7 +415,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -459,6 +431,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Nome da sala"
@@ -479,14 +455,14 @@
             null,
             "Sem salas em %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Salas em %1$s"
-         ],
          "Description:": [
             null,
             "Descrição:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Ocupantes:"
@@ -671,10 +647,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -758,10 +730,6 @@
          "Name": [
             null,
             ""
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

locale/ru/LC_MESSAGES/converse.json

@@ -230,34 +230,6 @@
             null,
             "Пользователи не найдены"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Кликните, чтобы добавить контакт"
-         ],
-         "Toggle chat": [
-            null,
-            "Включить чат"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Соединение"
-         ],
-         "Authenticating": [
-            null,
-            "Авторизация"
-         ],
-         "Authentication Failed": [
-            null,
-            "Не удалось авторизоваться"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            "Возникла ошибка при добавлении "
-         ],
          "This client does not allow presence subscriptions": [
             null,
             "Программа не поддерживает уведомления о статусе"
@@ -338,9 +310,9 @@
             null,
             "Спрятать список участников"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
-            "Ошибка:  \""
+            ""
          ],
          "Are you sure you want to clear the messages from this room?": [
             null,
@@ -418,6 +390,10 @@
             null,
             "Отправить"
          ],
+         "${notification.reason}": [
+            null,
+            ""
+         ],
          " has left the room. \"": [
             null,
             ""
@@ -486,7 +462,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -494,7 +470,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -510,6 +486,10 @@
             null,
             "Вы можете дополнительно вставить сообщение, объясняющее причину приглашения."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Имя чата"
@@ -534,14 +514,14 @@
             null,
             "Нет чатов %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Чаты %1$s:"
-         ],
          "Description:": [
             null,
             "Описание:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Участники:"
@@ -746,10 +726,6 @@
             null,
             "Зарегистрирован успешно"
          ],
-         "Return": [
-            null,
-            "Назад"
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             "Провайдер отклонил вашу попытку зарегистрироваться. Пожалуйста, проверьте, правильно ли введены значения."
@@ -838,10 +814,6 @@
             null,
             "Вы уверены, что хотите удалить этот контакт?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            "Возникла ошибка при удалении "
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Вы уверены, что хотите отклонить запрос от этого контакта?"

locale/uk/LC_MESSAGES/converse.json

@@ -227,38 +227,6 @@
             null,
             "Жодного користувача не знайдено"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "Клацніть, щоб додати як чат-контакт"
-         ],
-         "Toggle chat": [
-            null,
-            "Включити чат"
-         ],
-         "Reconnecting": [
-            null,
-            "Перепід'єднуюсь"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "Під'єднуюсь"
-         ],
-         "Authenticating": [
-            null,
-            "Автентикуюсь"
-         ],
-         "Authentication Failed": [
-            null,
-            "Автентикація невдала"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -335,7 +303,7 @@
             null,
             "Повідомлення"
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -415,9 +383,9 @@
             null,
             "Надіслати"
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
-            "Причиною вказано: \""
+            ""
          ],
          " has left the room. \"": [
             null,
@@ -487,7 +455,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -495,7 +463,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -511,6 +479,10 @@
             null,
             "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "Назва кімнати"
@@ -535,14 +507,14 @@
             null,
             "Жодної кімнати на %1$s"
          ],
-         "Rooms on %1$s": [
-            null,
-            "Кімнати на %1$s"
-         ],
          "Description:": [
             null,
             "Опис:"
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "Присутні:"
@@ -763,10 +735,6 @@
             null,
             "Успішно зареєстровано"
          ],
-         "Return": [
-            null,
-            "Вернутися"
-         ],
          "Retry": [
             null,
             ""
@@ -851,10 +819,6 @@
             null,
             "Ви впевнені, що хочете видалити цей контакт?"
          ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
-         ],
          "Are you sure you want to decline this contact request?": [
             null,
             "Ви впевнені, що хочете відхилити цей запит контакту?"

locale/zh/LC_MESSAGES/converse.json

@@ -202,34 +202,6 @@
             null,
             "未找到用户"
          ],
-         "Click to add as a chat contact": [
-            null,
-            "点击添加为好友"
-         ],
-         "Toggle chat": [
-            null,
-            "折叠聊天窗口"
-         ],
-         "The connection has dropped, attempting to reconnect.": [
-            null,
-            ""
-         ],
-         "Connecting": [
-            null,
-            "连接中"
-         ],
-         "Authenticating": [
-            null,
-            "验证中"
-         ],
-         "Authentication Failed": [
-            null,
-            "验证失败"
-         ],
-         "Sorry, there was an error while trying to add ": [
-            null,
-            ""
-         ],
          "This client does not allow presence subscriptions": [
             null,
             ""
@@ -302,7 +274,7 @@
             null,
             ""
          ],
-         "Error: the \"": [
+         "${command}": [
             null,
             ""
          ],
@@ -374,7 +346,7 @@
             null,
             ""
          ],
-         "The reason given is: \"": [
+         "${notification.reason}": [
             null,
             ""
          ],
@@ -442,7 +414,7 @@
             null,
             ""
          ],
-         "All other room occupants can see your Jabber ID": [
+         "All other room occupants can see your XMPP username": [
             null,
             ""
          ],
@@ -450,7 +422,7 @@
             null,
             ""
          ],
-         "Only moderators can see your Jabber ID": [
+         "Only moderators can see your XMPP username": [
             null,
             ""
          ],
@@ -466,6 +438,10 @@
             null,
             ""
          ],
+         "Please enter a valid XMPP username": [
+            null,
+            ""
+         ],
          "Room name": [
             null,
             "聊天室名称"
@@ -486,14 +462,14 @@
             null,
             "%1$s 上没有聊天室"
          ],
-         "Rooms on %1$s": [
-            null,
-            "%1$s 上的聊天室"
-         ],
          "Description:": [
             null,
             "描述: "
          ],
+         "Room Address (JID):": [
+            null,
+            ""
+         ],
          "Occupants:": [
             null,
             "成员:"
@@ -678,10 +654,6 @@
             null,
             ""
          ],
-         "Return": [
-            null,
-            ""
-         ],
          "The provider rejected your registration attempt. Please check the values you entered for correctness.": [
             null,
             ""
@@ -765,10 +737,6 @@
          "Name": [
             null,
             ""
-         ],
-         "Sorry, there was an error while trying to remove ": [
-            null,
-            ""
          ]
       }
    }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "3.1.1",
+  "version": "3.2.0-rc",
   "lockfileVersion": 1,
   "dependencies": {
     "@greenkeeper/flags": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "3.1.1",
+  "version": "3.2.0-rc",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {

src/start.frag

@@ -2,7 +2,7 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 3.1.1
+ *  Version: 3.2.0-rc
  */
 
 /* jshint ignore:start */