New release 1.0.0

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "0.10.1",
+  "version": "1.0.0",
   "license": "MPL-2.0",
   "devDependencies": {
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",

dist/templates.js

@@ -933,14 +933,77 @@ return __p
 
 this["templates"]["roster"] = function(obj) {
 obj || (obj = {});
-var __t, __p = '', __e = _.escape;
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
 with (obj) {
-__p += '<form class="pure-form roster-filter-group input-button-group">\n    <input style="display: none;" class="roster-filter" placeholder="' +
+__p += '<form class="pure-form roster-filter-group input-button-group">\n    <input value="' +
+((__t = (filter_text)) == null ? '' : __t) +
+'" class="roster-filter"\n           placeholder="' +
 ((__t = (placeholder)) == null ? '' : __t) +
-'">\n    <select style="display: none;" class="filter-type">\n        <option value="contacts">' +
+'"\n           ';
+ if (filter_type === 'state') { ;
+__p += '  style="display: none" ';
+ } ;
+__p += ' >\n    <select class="state-type" ';
+ if (filter_type !== 'state') { ;
+__p += '  style="display: none" ';
+ } ;
+__p += ' >\n        <option value="">' +
+((__t = (label_any)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'online') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="online">' +
+((__t = (label_online)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'chatty') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="chatty">' +
+((__t = (label_chatty)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'dnd') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="dnd">' +
+((__t = (label_busy)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'away') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="away">' +
+((__t = (label_away)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'xa') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="xa">' +
+((__t = (label_xa)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (chat_state === 'offline') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n            value="offline">' +
+((__t = (label_offline)) == null ? '' : __t) +
+'</option>\n    </select>\n    <select class="filter-type">\n        <option ';
+ if (filter_type === 'contacts') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n                value="contacts">' +
 ((__t = (label_contacts)) == null ? '' : __t) +
-'</option>\n        <option value="groups">' +
+'</option>\n        <option ';
+ if (filter_type === 'groups') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n                value="groups">' +
 ((__t = (label_groups)) == null ? '' : __t) +
+'</option>\n        <option ';
+ if (filter_type === 'state') { ;
+__p += ' selected="selected" ';
+ } ;
+__p += '\n                value="state">' +
+((__t = (label_state)) == null ? '' : __t) +
 '</option>\n    </select>\n</form>\n';
 
 }

docs/CHANGES.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## 1.0.0 (Unreleased)
+## 1.0.0 (2016-05-03)
 
-- Add catalan language
+- Add catalan language [JoseMariaRubioMoral]
 - Split converse.js up into different plugin modules. [jcbrand]
 - Better Sass/CSS for responsive/mobile views. New mobile-only build. [jcbrand]
 - Roster contacts can now be filtered by chat state and roster filters are

locale/af/LC_MESSAGES/converse.json

@@ -202,14 +202,10 @@
             null,
             "Klets"
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Ontkoppel"
-         ],
          "Error": [
             null,
             "Fout"

locale/af/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:34+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Afrikaans\n"
@@ -40,7 +40,7 @@ msgid "has stopped typing"
 msgstr "het opgehou tik"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "het weggegaan"
 
@@ -61,11 +61,11 @@ msgstr "Verwyder boodskappe"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Is u seker u wil die boodskappe in hierdie kletskas uitvee?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "is nou aflyn"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "is besig"
 
@@ -85,171 +85,167 @@ msgstr "Voeg 'n emotikon by"
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Verbind tans"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP Gebruikersnaam:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Wagwoord"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Klik hier om anoniem aan te meld"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Meld aan"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr "gebruiker@bediener"
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "wagwoord"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Teken in"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Ek is %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om jou eie statusboodskap te skryf"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Klik om jou klets-status te verander"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Doelgemaakte status"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Stoor"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "aangemeld"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "besig"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "vir lank afwesig"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "afwesig"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr "afgemeld"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Aangemeld"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Besig"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Afwesig"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Afgemeld"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Meld af"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Kontaknaam"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Soek"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "bv. gebruiker@voorbeeld.org"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Voeg by"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Klik om nuwe kletskontakte by te voeg"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Voeg 'n kontak by"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Geen gebruikers gevind"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Klik om as kletskontak by te voeg"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Klets"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Ontkoppel"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Fout"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Besig om te bekragtig"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Bekragtiging het gefaal"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
 
@@ -341,8 +337,8 @@ msgstr "Stel onderwerp vir kletskamer"
 msgid "Allow muted user to post messages"
 msgstr "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Kanseleer"
 
@@ -653,19 +649,19 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr "Kennisgewing van %1$s"
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr "%1$s sê"
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 msgid "has come online"
 msgstr "het aanlyn gekom"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr "wil jou kontak wees"
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr "'n Fout het voorgekom"
 
@@ -855,31 +851,31 @@ msgstr "privaat"
 msgid "finished"
 msgstr "afgesluit"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "bv. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "U XMPP-verskaffer se domein naam:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Haal die registrasie form"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Wenk: A lys van publieke XMPP-verskaffers is beskikbaar"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "hier"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Registreer"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -887,11 +883,11 @@ msgstr ""
 "Jammer, die gekose verskaffer ondersteun nie in-band registrasie nie.Probeer "
 "weer met 'n ander verskaffer."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Vra tans die XMPP-bediener vir 'n registrasie vorm"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -899,19 +895,19 @@ msgstr ""
 "Iets het fout geloop tydens koppeling met \"%1$s\". Is u seker dat dit "
 "bestaan?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "U word nou aangemeld"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Suksesvol geregistreer"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Terug"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1019,6 +1015,9 @@ msgstr "Jammer, 'n fout het voorgekom tydens die verwydering van "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Is u seker dat u hierdie persoon se versoek wil afkeur?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Ontkoppel"
+
 #~ msgid "Type to filter"
 #~ msgstr "Tik om te filtreer"
 

locale/ca/LC_MESSAGES/converse.json

@@ -7,142 +7,14 @@
             "plural_forms": "nplurals=2; plural=(n != 1);",
             "lang": "ca"
          },
-         " e.g. conversejs.org": [
-            null,
-            "p. ex. conversejs.org"
-         ],
-         "unencrypted": [
-            null,
-            "sense xifrar"
-         ],
-         "unverified": [
-            null,
-            "sense verificar"
-         ],
-         "verified": [
-            null,
-            "verificat"
-         ],
-         "finished": [
-            null,
-            "acabat"
-         ],
-         "This contact is busy": [
-            null,
-            "Aquest contacte està ocupat"
-         ],
-         "This contact is online": [
-            null,
-            "Aquest contacte està en línia"
-         ],
-         "This contact is offline": [
-            null,
-            "Aquest contacte està desconnectat"
-         ],
-         "This contact is unavailable": [
-            null,
-            "Aquest contacte no està disponible"
-         ],
-         "This contact is away for an extended period": [
-            null,
-            "Aquest contacte està absent durant un període prolongat"
-         ],
-         "This contact is away": [
-            null,
-            "Aquest contacte està absent"
-         ],
-         "Click to hide these contacts": [
-            null,
-            "Feu clic per amagar aquests contactes"
-         ],
-         "My contacts": [
-            null,
-            "Els meus contactes"
-         ],
-         "Pending contacts": [
-            null,
-            "Contactes pendents"
-         ],
-         "Contact requests": [
-            null,
-            "Sol·licituds de contacte"
-         ],
-         "Ungrouped": [
-            null,
-            "Sense agrupar"
-         ],
-         "Contacts": [
-            null,
-            "Contactes"
-         ],
-         "Groups": [
-            null,
-            "Grups"
-         ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            "S'intentarà tornar a establir la connexió en 5 segons"
-         ],
-         "Error": [
-            null,
-            "Error"
-         ],
-         "Connecting": [
-            null,
-            "S'està establint la connexió"
-         ],
-         "Authenticating": [
-            null,
-            "S'està efectuant l'autenticació"
-         ],
-         "Authentication Failed": [
-            null,
-            "Error d'autenticació"
-         ],
-         "Re-establishing encrypted session": [
-            null,
-            "S'està tornant a establir la sessió xifrada"
-         ],
-         "Generating private key.": [
-            null,
-            "S'està generant la clau privada"
-         ],
-         "Your browser might become unresponsive.": [
-            null,
-            "És possible que el navegador no respongui."
-         ],
-         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
-            null,
-            "Sol·licitud d'autenticació de %1$s\n\nEl contacte del xat està intentant verificar la vostra identitat mitjançant la pregunta següent.\n\n%2$s"
-         ],
-         "Could not verify this user's identify.": [
-            null,
-            "No s'ha pogut verificar la identitat d'aquest usuari."
-         ],
-         "Exchanging private key with contact.": [
-            null,
-            "S'està intercanviant la clau privada amb el contacte."
-         ],
          "Close this chat box": [
             null,
             "Tanca aquest quadre del xat"
          ],
-         "Minimize this chat box": [
-            null,
-            "Minimitza aquest quadre del xat"
-         ],
-         "View more information on this person": [
-            null,
-            "Mostra més informació d'aquesta persona"
-         ],
          "Personal message": [
             null,
             "Missatge personal"
          ],
-         "Are you sure you want to clear the messages from this room?": [
-            null,
-            "Segur que voleu esborrar els missatges d'aquesta sala?"
-         ],
          "me": [
             null,
             "jo"
@@ -175,38 +47,6 @@
             null,
             "Segur que voleu esborrar els missatges d'aquest quadre del xat?"
          ],
-         "Your message could not be sent": [
-            null,
-            "No s'ha pogut enviar el missatge"
-         ],
-         "We received an unencrypted message": [
-            null,
-            "Hem rebut un missatge sense xifrar"
-         ],
-         "We received an unreadable encrypted message": [
-            null,
-            "Hem rebut un missatge xifrat il·legible"
-         ],
-         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
-            null,
-            "Aquí es mostren les empremtes. Confirmeu-les amb %1$s fora d'aquest xat.\n\nEmpremta de l'usuari %2$s: %3$s\n\nEmpremta de %1$s: %4$s\n\nSi heu confirmat que les empremtes coincideixen, feu clic a D'acord; en cas contrari, feu clic a Cancel·la."
-         ],
-         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
-            null,
-            "Se us demanarà que indiqueu una pregunta de seguretat i la resposta corresponent.\n\nEs farà la mateixa pregunta al vostre contacte i, si escriu exactament la mateixa resposta (es distingeix majúscules de minúscules), se'n verificarà la identitat."
-         ],
-         "What is your security question?": [
-            null,
-            "Quina és la vostra pregunta de seguretat?"
-         ],
-         "What is the answer to the security question?": [
-            null,
-            "Quina és la resposta a la pregunta de seguretat?"
-         ],
-         "Invalid authentication scheme provided": [
-            null,
-            "S'ha indicat un esquema d'autenticació no vàlid"
-         ],
          "has gone offline": [
             null,
             "s'ha desconnectat"
@@ -215,253 +55,181 @@
             null,
             "està ocupat"
          ],
-         "Your messages are not encrypted anymore": [
-            null,
-            "Els vostres missatges ja no estan xifrats"
-         ],
-         "Your messages are now encrypted but your contact's identity has not been verified.": [
-            null,
-            "Ara, els vostres missatges estan xifrats, però no s'ha verificat la identitat del contacte."
-         ],
-         "Your contact's identify has been verified.": [
-            null,
-            "S'ha verificat la identitat del contacte."
-         ],
-         "Your contact has ended encryption on their end, you should do the same.": [
-            null,
-            "El contacte ha conclòs el xifratge; cal que feu el mateix."
-         ],
-         "Your messages are not encrypted. Click here to enable OTR encryption.": [
-            null,
-            "Els vostres missatges no estan xifrats. Feu clic aquí per habilitar el xifratge OTR."
-         ],
-         "Your messages are encrypted, but your contact has not been verified.": [
-            null,
-            "Els vostres missatges estan xifrats, però no s'ha verificat el contacte."
-         ],
-         "Your messages are encrypted and your contact verified.": [
-            null,
-            "Els vostres missatges estan xifrats i s'ha verificat el contacte."
-         ],
-         "Your contact has closed their end of the private session, you should do the same": [
-            null,
-            "El vostre contacte ha tancat la seva sessió privada; cal que feu el mateix."
-         ],
          "Clear all messages": [
             null,
             "Esborra tots els missatges"
          ],
-         "End encrypted conversation": [
-            null,
-            "Finalitza la conversa xifrada"
-         ],
-         "Insert a smiley": [
-            null,
-            "Insereix una cara somrient"
-         ],
          "Hide the list of occupants": [
             null,
             "Amaga la llista d'ocupants"
          ],
-         "Refresh encrypted conversation": [
+         "Insert a smiley": [
             null,
-            "Actualitza la conversa xifrada"
+            "Insereix una cara somrient"
          ],
          "Start a call": [
             null,
             "Inicia una trucada"
          ],
-         "Start encrypted conversation": [
-            null,
-            "Comença la conversa xifrada"
-         ],
-         "Verify with fingerprints": [
-            null,
-            "Verifica amb empremtes"
-         ],
-         "Verify with SMP": [
-            null,
-            "Verifica amb SMP"
-         ],
-         "What's this?": [
-            null,
-            "Què és això?"
-         ],
-         "Online": [
-            null,
-            "En línia"
-         ],
-         "Busy": [
-            null,
-            "Ocupat"
-         ],
-         "Away": [
-            null,
-            "Absent"
-         ],
-         "Offline": [
-            null,
-            "Desconnectat"
-         ],
-         "Log out": [
+         "Contacts": [
             null,
-            "Tanca la sessió"
+            "Contactes"
          ],
-         "Contact name": [
+         "Connecting": [
             null,
-            "Nom del contacte"
+            "S'està establint la connexió"
          ],
-         "Search": [
+         "XMPP Username:": [
             null,
-            "Cerca"
+            "Nom d'usuari XMPP:"
          ],
-         "e.g. user@example.com": [
+         "Password:": [
             null,
-            "p. ex. usuari@exemple.com"
+            "Contrasenya:"
          ],
-         "Add": [
+         "Click here to log in anonymously": [
             null,
-            "Afegeix"
+            "Feu clic aquí per iniciar la sessió de manera anònima"
          ],
-         "Click to add new chat contacts": [
+         "Log In": [
             null,
-            "Feu clic per afegir contactes nous al xat"
+            "Inicia la sessió"
          ],
-         "Add a contact": [
+         "user@server": [
             null,
-            "Afegeix un contacte"
+            "usuari@servidor"
          ],
-         "No users found": [
+         "password": [
             null,
-            "No s'ha trobat cap usuari"
+            "contrasenya"
          ],
-         "Click to add as a chat contact": [
+         "Sign in": [
             null,
-            "Feu clic per afegir com a contacte del xat"
+            "Inicia la sessió"
          ],
-         "Room name": [
+         "I am %1$s": [
             null,
-            "Nom de la sala"
+            "Estic %1$s"
          ],
-         "Nickname": [
+         "Click here to write a custom status message": [
             null,
-            "Àlies"
+            "Feu clic aquí per escriure un missatge d'estat personalitzat"
          ],
-         "Server": [
+         "Click to change your chat status": [
             null,
-            "Servidor"
+            "Feu clic per canviar l'estat del xat"
          ],
-         "Join Room": [
+         "Custom status": [
             null,
-            "Uneix-me a la sala"
+            "Estat personalitzat"
          ],
-         "Show rooms": [
+         "Save": [
             null,
-            "Mostra les sales"
+            "Desa"
          ],
-         "Rooms": [
+         "online": [
             null,
-            "Sales"
+            "en línia"
          ],
-         "No rooms on %1$s": [
+         "busy": [
             null,
-            "No hi ha cap sala a %1$s"
+            "ocupat"
          ],
-         "Rooms on %1$s": [
+         "away for long": [
             null,
-            "Sales a %1$s"
+            "absent durant una estona"
          ],
-         "Click to open this room": [
+         "away": [
             null,
-            "Feu clic per obrir aquesta sala"
+            "absent"
          ],
-         "Show more information on this room": [
+         "offline": [
             null,
-            "Mostra més informació d'aquesta sala"
+            "desconnectat"
          ],
-         "Description:": [
+         "Online": [
             null,
-            "Descripció:"
+            "En línia"
          ],
-         "Occupants:": [
+         "Busy": [
             null,
-            "Ocupants:"
+            "Ocupat"
          ],
-         "Features:": [
+         "Away": [
             null,
-            "Característiques:"
+            "Absent"
          ],
-         "Requires authentication": [
+         "Offline": [
             null,
-            "Cal autenticar-se"
+            "Desconnectat"
          ],
-         "Hidden": [
+         "Log out": [
             null,
-            "Amagat"
+            "Tanca la sessió"
          ],
-         "Requires an invitation": [
+         "Contact name": [
             null,
-            "Cal tenir una invitació"
+            "Nom del contacte"
          ],
-         "Moderated": [
+         "Search": [
             null,
-            "Moderada"
+            "Cerca"
          ],
-         "Non-anonymous": [
+         "Add": [
             null,
-            "No és anònima"
+            "Afegeix"
          ],
-         "Open room": [
+         "Click to add new chat contacts": [
             null,
-            "Obre la sala"
+            "Feu clic per afegir contactes nous al xat"
          ],
-         "Permanent room": [
+         "Add a contact": [
             null,
-            "Sala permanent"
+            "Afegeix un contacte"
          ],
-         "Public": [
+         "No users found": [
             null,
-            "Pública"
+            "No s'ha trobat cap usuari"
          ],
-         "Semi-anonymous": [
+         "Click to add as a chat contact": [
             null,
-            "Semianònima"
+            "Feu clic per afegir com a contacte del xat"
          ],
-         "Temporary room": [
+         "Toggle chat": [
             null,
-            "Sala temporal"
+            "Canvia de xat"
          ],
-         "Unmoderated": [
+         "Error": [
             null,
-            "No moderada"
+            "Error"
          ],
-         "This user is a moderator": [
+         "Authenticating": [
             null,
-            "Aquest usuari és un moderador"
+            "S'està efectuant l'autenticació"
          ],
-         "This user can send messages in this room": [
+         "Authentication Failed": [
             null,
-            "Aquest usuari pot enviar missatges a aquesta sala"
+            "Error d'autenticació"
          ],
-         "This user can NOT send messages in this room": [
+         "Sorry, there was an error while trying to add ": [
             null,
-            "Aquest usuari NO pot enviar missatges a aquesta sala"
+            "S'ha produït un error en intentar afegir "
          ],
-         "Invite...": [
+         "This client does not allow presence subscriptions": [
             null,
-            "Convida..."
+            "Aquest client no admet les subscripcions de presència"
          ],
-         "Occupants": [
+         "Click to restore this chat": [
             null,
-            "Ocupants"
+            "Feu clic per restaurar aquest xat"
          ],
-         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+         "Minimized": [
             null,
-            "Esteu a punt de convidar %1$s a la sala de xat \"%2$s\". "
+            "Minimitzat"
          ],
-         "You may optionally include a message, explaining the reason for the invitation.": [
+         "Minimize this chat box": [
             null,
-            "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
+            "Minimitza aquest quadre del xat"
          ],
          "Message": [
             null,
@@ -475,6 +243,10 @@
             null,
             "Error: el \""
          ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "Segur que voleu esborrar els missatges d'aquesta sala?"
+         ],
          "Change user's affiliation to admin": [
             null,
             "Canvia l'afiliació de l'usuari a administrador"
@@ -527,10 +299,6 @@
             null,
             "Permet que un usuari silenciat publiqui missatges"
          ],
-         "Save": [
-            null,
-            "Desa"
-         ],
          "Cancel": [
             null,
             "Cancel·la"
@@ -593,183 +361,359 @@
          ],
          "You have been banned from this room": [
             null,
-            "Se us ha expulsat d'aquesta sala"
+            "Se us ha expulsat d'aquesta sala"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Se us ha expulsat d'aquesta sala"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Se us ha eliminat d'aquesta sala a causa d'un canvi d'afiliació"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Se us ha eliminat d'aquesta sala perquè ara només permet membres i no en sou membre"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            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 automatically changed to: <strong>%1$s</strong>": [
+            null,
+            "El vostre àlies ha canviat automàticament a: <strong>%1$s</strong>"
+         ],
+         "Your nickname has been changed to: <strong>%1$s</strong>": [
+            null,
+            "El vostre àlies ha canviat a: <strong>%1$s</strong>"
+         ],
+         "The reason given is: \"": [
+            null,
+            "El motiu indicat és: \""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "No sou a la llista de membres d'aquesta sala"
+         ],
+         "No nickname was specified": [
+            null,
+            "No s'ha especificat cap àlies"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "No teniu permís per crear sales noves"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "El vostre àlies ja està en ús"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Aquesta sala (encara) no existeix"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Tema definit per %1$s en: %2$s"
+         ],
+         "This user is a moderator": [
+            null,
+            "Aquest usuari és un moderador"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Aquest usuari pot enviar missatges a aquesta sala"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Aquest usuari NO pot enviar missatges a aquesta sala"
+         ],
+         "Occupants": [
+            null,
+            "Ocupants"
+         ],
+         "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\". "
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
+         ],
+         "Room name": [
+            null,
+            "Nom de la sala"
+         ],
+         "Nickname": [
+            null,
+            "Àlies"
+         ],
+         "Server": [
+            null,
+            "Servidor"
+         ],
+         "Join Room": [
+            null,
+            "Uneix-me a la sala"
+         ],
+         "Show rooms": [
+            null,
+            "Mostra les sales"
+         ],
+         "Rooms": [
+            null,
+            "Sales"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "No hi ha cap sala a %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Sales a %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Feu clic per obrir aquesta sala"
+         ],
+         "Show more information on this room": [
+            null,
+            "Mostra més informació d'aquesta sala"
+         ],
+         "Description:": [
+            null,
+            "Descripció:"
+         ],
+         "Occupants:": [
+            null,
+            "Ocupants:"
+         ],
+         "Features:": [
+            null,
+            "Característiques:"
+         ],
+         "Requires authentication": [
+            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"
          ],
-         "You have been kicked from this room": [
+         "Permanent room": [
             null,
-            "Se us ha expulsat d'aquesta sala"
+            "Sala permanent"
          ],
-         "You have been removed from this room because of an affiliation change": [
+         "Public": [
             null,
-            "Se us ha eliminat d'aquesta sala a causa d'un canvi d'afiliació"
+            "Pública"
          ],
-         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+         "Semi-anonymous": [
             null,
-            "Se us ha eliminat d'aquesta sala perquè ara només permet membres i no en sou membre"
+            "Semianònima"
          ],
-         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+         "Temporary room": [
             null,
-            "Se us ha eliminat d'aquesta sala perquè s'està tancant el servei MUC (xat multiusuari)."
+            "Sala temporal"
          ],
-         "<strong>%1$s</strong> has been banned": [
+         "Unmoderated": [
             null,
-            "S'ha expulsat <strong>%1$s</strong>"
+            "No moderada"
          ],
-         "<strong>%1$s</strong>'s nickname has changed": [
+         "%1$s has invited you to join a chat room: %2$s": [
             null,
-            "L'àlies de <strong>%1$s</strong> ha canviat"
+            "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"
          ],
-         "<strong>%1$s</strong> has been kicked out": [
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
             null,
-            "S'ha expulsat <strong>%1$s</strong>"
+            "%1$s us ha convidat a unir-vos a una sala de xat (%2$s) i ha deixat el següent motiu: \"%3$s\""
          ],
-         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+         "Notification from %1$s": [
             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": [
+         "%1$s says": [
             null,
-            "S'ha eliminat <strong>%1$s</strong> perquè no és membre"
+            ""
          ],
-         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
+         "wants to be your contact": [
             null,
-            "El vostre àlies ha canviat automàticament a: <strong>%1$s</strong>"
+            ""
          ],
-         "Your nickname has been changed to: <strong>%1$s</strong>": [
+         "An error has occured": [
             null,
-            "El vostre àlies ha canviat a: <strong>%1$s</strong>"
+            ""
          ],
-         "The reason given is: \"": [
+         "Re-establishing encrypted session": [
             null,
-            "El motiu indicat és: \""
+            "S'està tornant a establir la sessió xifrada"
          ],
-         "You are not on the member list of this room": [
+         "Generating private key.": [
             null,
-            "No sou a la llista de membres d'aquesta sala"
+            "S'està generant la clau privada"
          ],
-         "No nickname was specified": [
+         "Your browser might become unresponsive.": [
             null,
-            "No s'ha especificat cap àlies"
+            "És possible que el navegador no respongui."
          ],
-         "You are not allowed to create new rooms": [
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
             null,
-            "No teniu permís per crear sales noves"
+            "Sol·licitud d'autenticació de %1$s\n\nEl contacte del xat està intentant verificar la vostra identitat mitjançant la pregunta següent.\n\n%2$s"
          ],
-         "Your nickname doesn't conform to this room's policies": [
+         "Could not verify this user's identify.": [
             null,
-            "El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
+            "No s'ha pogut verificar la identitat d'aquest usuari."
          ],
-         "Your nickname is already taken": [
+         "Exchanging private key with contact.": [
             null,
-            "El vostre àlies ja està en ús"
+            "S'està intercanviant la clau privada amb el contacte."
          ],
-         "This room does not (yet) exist": [
+         "Your messages are not encrypted anymore": [
             null,
-            "Aquesta sala (encara) no existeix"
+            "Els vostres missatges ja no estan xifrats"
          ],
-         "This room has reached it's maximum number of occupants": [
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
             null,
-            "Aquesta sala ha assolit el nombre màxim d'ocupants"
+            "Ara, els vostres missatges estan xifrats, però no s'ha verificat la identitat del contacte."
          ],
-         "Topic set by %1$s to: %2$s": [
+         "Your contact's identify has been verified.": [
             null,
-            "Tema definit per %1$s en: %2$s"
+            "S'ha verificat la identitat del contacte."
          ],
-         "%1$s has invited you to join a chat room: %2$s": [
+         "Your contact has ended encryption on their end, you should do the same.": [
             null,
-            "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"
+            "El contacte ha conclòs el xifratge; cal que feu el mateix."
          ],
-         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+         "Your message could not be sent": [
             null,
-            "%1$s us ha convidat a unir-vos a una sala de xat (%2$s) i ha deixat el següent motiu: \"%3$s\""
+            "No s'ha pogut enviar el missatge"
          ],
-         "Click to restore this chat": [
+         "We received an unencrypted message": [
             null,
-            "Feu clic per restaurar aquest xat"
+            "Hem rebut un missatge sense xifrar"
          ],
-         "Minimized": [
+         "We received an unreadable encrypted message": [
             null,
-            "Minimitzat"
+            "Hem rebut un missatge xifrat il·legible"
          ],
-         "Click to remove this contact": [
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
             null,
-            "Feu clic per eliminar aquest contacte"
+            "Aquí es mostren les empremtes. Confirmeu-les amb %1$s fora d'aquest xat.\n\nEmpremta de l'usuari %2$s: %3$s\n\nEmpremta de %1$s: %4$s\n\nSi heu confirmat que les empremtes coincideixen, feu clic a D'acord; en cas contrari, feu clic a Cancel·la."
          ],
-         "Click to accept this contact request": [
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
             null,
-            "Feu clic per acceptar aquesta sol·licitud de contacte"
+            "Se us demanarà que indiqueu una pregunta de seguretat i la resposta corresponent.\n\nEs farà la mateixa pregunta al vostre contacte i, si escriu exactament la mateixa resposta (es distingeix majúscules de minúscules), se'n verificarà la identitat."
          ],
-         "Click to decline this contact request": [
+         "What is your security question?": [
             null,
-            "Feu clic per rebutjar aquesta sol·licitud de contacte"
+            "Quina és la vostra pregunta de seguretat?"
          ],
-         "Click to chat with this contact": [
+         "What is the answer to the security question?": [
             null,
-            "Feu clic per conversar amb aquest contacte"
+            "Quina és la resposta a la pregunta de seguretat?"
          ],
-         "Name": [
+         "Invalid authentication scheme provided": [
             null,
-            "Nom"
+            "S'ha indicat un esquema d'autenticació no vàlid"
          ],
-         "Are you sure you want to remove this contact?": [
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
             null,
-            "Segur que voleu eliminar aquest contacte?"
+            "Els vostres missatges no estan xifrats. Feu clic aquí per habilitar el xifratge OTR."
          ],
-         "Sorry, there was an error while trying to remove ": [
+         "Your messages are encrypted, but your contact has not been verified.": [
             null,
-            "S'ha produït un error en intentar eliminar "
+            "Els vostres missatges estan xifrats, però no s'ha verificat el contacte."
          ],
-         "Are you sure you want to decline this contact request?": [
+         "Your messages are encrypted and your contact verified.": [
             null,
-            "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
+            "Els vostres missatges estan xifrats i s'ha verificat el contacte."
          ],
-         "Sorry, there was an error while trying to add ": [
+         "Your contact has closed their end of the private session, you should do the same": [
             null,
-            "S'ha produït un error en intentar afegir "
+            "El vostre contacte ha tancat la seva sessió privada; cal que feu el mateix."
          ],
-         "This client does not allow presence subscriptions": [
+         "End encrypted conversation": [
             null,
-            "Aquest client no admet les subscripcions de presència"
+            "Finalitza la conversa xifrada"
          ],
-         "Type to filter": [
+         "Refresh encrypted conversation": [
             null,
-            "Escriviu per filtrar"
+            "Actualitza la conversa xifrada"
          ],
-         "I am %1$s": [
+         "Start encrypted conversation": [
             null,
-            "Estic %1$s"
+            "Comença la conversa xifrada"
          ],
-         "Click here to write a custom status message": [
+         "Verify with fingerprints": [
             null,
-            "Feu clic aquí per escriure un missatge d'estat personalitzat"
+            "Verifica amb empremtes"
          ],
-         "Click to change your chat status": [
+         "Verify with SMP": [
             null,
-            "Feu clic per canviar l'estat del xat"
+            "Verifica amb SMP"
          ],
-         "Custom status": [
+         "What's this?": [
             null,
-            "Estat personalitzat"
+            "Què és això?"
          ],
-         "online": [
+         "unencrypted": [
             null,
-            "en línia"
+            "sense xifrar"
          ],
-         "busy": [
+         "unverified": [
             null,
-            "ocupat"
+            "sense verificar"
          ],
-         "away for long": [
+         "verified": [
             null,
-            "absent durant una estona"
+            "verificat"
          ],
-         "away": [
+         "finished": [
             null,
-            "absent"
+            "acabat"
          ],
-         "offline": [
+         " e.g. conversejs.org": [
             null,
-            "desconnectat"
+            "p. ex. conversejs.org"
          ],
          "Your XMPP provider's domain name:": [
             null,
@@ -819,37 +763,105 @@
             null,
             "El proveïdor ha rebutjat l'intent de registre. Comproveu que els valors que heu introduït siguin correctes."
          ],
-         "XMPP Username:": [
+         "This contact is busy": [
             null,
-            "Nom d'usuari XMPP:"
+            "Aquest contacte està ocupat"
          ],
-         "Password:": [
+         "This contact is online": [
             null,
-            "Contrasenya:"
+            "Aquest contacte està en línia"
          ],
-         "Click here to log in anonymously": [
+         "This contact is offline": [
             null,
-            "Feu clic aquí per iniciar la sessió de manera anònima"
+            "Aquest contacte està desconnectat"
          ],
-         "Log In": [
+         "This contact is unavailable": [
             null,
-            "Inicia la sessió"
+            "Aquest contacte no està disponible"
          ],
-         "user@server": [
+         "This contact is away for an extended period": [
             null,
-            "usuari@servidor"
+            "Aquest contacte està absent durant un període prolongat"
          ],
-         "password": [
+         "This contact is away": [
             null,
-            "contrasenya"
+            "Aquest contacte està absent"
          ],
-         "Sign in": [
+         "Click to hide these contacts": [
             null,
-            "Inicia la sessió"
+            "Feu clic per amagar aquests contactes"
          ],
-         "Toggle chat": [
+         "Groups": [
             null,
-            "Canvia de xat"
+            "Grups"
+         ],
+         "My contacts": [
+            null,
+            "Els meus contactes"
+         ],
+         "Pending contacts": [
+            null,
+            "Contactes pendents"
+         ],
+         "Contact requests": [
+            null,
+            "Sol·licituds de contacte"
+         ],
+         "Ungrouped": [
+            null,
+            "Sense agrupar"
+         ],
+         "Filter": [
+            null,
+            ""
+         ],
+         "State": [
+            null,
+            ""
+         ],
+         "Any": [
+            null,
+            ""
+         ],
+         "Chatty": [
+            null,
+            ""
+         ],
+         "Extended Away": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Feu clic per eliminar aquest contacte"
+         ],
+         "Click to accept this contact request": [
+            null,
+            "Feu clic per acceptar aquesta sol·licitud de contacte"
+         ],
+         "Click to decline this contact request": [
+            null,
+            "Feu clic per rebutjar aquesta sol·licitud de contacte"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Feu clic per conversar amb aquest contacte"
+         ],
+         "Name": [
+            null,
+            "Nom"
+         ],
+         "Are you sure you want to remove this contact?": [
+            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/converse.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,7 +38,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr ""
 
@@ -58,11 +58,11 @@ msgstr ""
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr ""
 
@@ -82,170 +82,166 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr ""
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr ""
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr ""
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr ""
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr ""
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr ""
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr ""
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr ""
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr ""
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr ""
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr ""
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr ""
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr ""
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr ""
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr ""
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr ""
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr ""
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr ""
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr ""
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr ""
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr ""
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -337,8 +333,8 @@ msgstr ""
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr ""
 
@@ -641,19 +637,19 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 msgid "has come online"
 msgstr ""
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -816,59 +812,59 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."

locale/de/LC_MESSAGES/converse.json

@@ -183,11 +183,7 @@
             null,
             "Chat ein-/ausblenden"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            ""
-         ],
-         "Disconnected": [
+         "Attempting to reconnect": [
             null,
             ""
          ],

locale/de/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:20+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: German\n"
@@ -42,7 +42,7 @@ msgid "has stopped typing"
 msgstr "tippt nicht mehr"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "ist jetzt abwesend"
 
@@ -63,12 +63,12 @@ msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Sind Sie sicher, dass Sie alle Nachrichten dieses Chats löschen möchten?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "ist beschäftigt"
 
@@ -89,173 +89,169 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Verbindungsaufbau …"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP Benutzername"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Hier klicken um anonym anzumelden"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Anmelden"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Benutzername"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Anmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Ich bin %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Hier klicken um Statusnachricht zu ändern"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Hier klicken um Status zu ändern"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Statusnachricht"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Speichern"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "beschäftigt"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "länger abwesend"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "abwesend"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Suche"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Hier klicken um neuen Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Kontakt hinzufügen"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Keine Benutzer gefunden"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Hier klicken um als Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Chat ein-/ausblenden"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Fehler"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Authentifizierung gescheitert"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -351,8 +347,8 @@ msgstr "Chatraum Thema festlegen"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -659,20 +655,20 @@ msgstr "%1$s hat Sie in den Raum \"%2$s\" eingeladen. Begründung: \"%3$s\""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -840,59 +836,59 @@ msgstr "verifiziert"
 msgid "finished"
 msgstr "erledigt"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "z. B. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Zurück"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."

locale/en/LC_MESSAGES/converse.json

@@ -199,11 +199,7 @@
             null,
             ""
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            ""
-         ],
-         "Disconnected": [
+         "Attempting to reconnect": [
             null,
             ""
          ],

locale/en/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2015-05-01 12:37+0200\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: English\n"
@@ -38,7 +38,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr ""
 
@@ -58,11 +58,11 @@ msgstr "Remove messages"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr ""
 
@@ -82,172 +82,168 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr ""
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Click here to log in anonymously"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Log In"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Sign in"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "I am %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Click here to write a custom status message"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Click to change your chat status"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Custom status"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Save"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "busy"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "away for long"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "away"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr ""
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr ""
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr ""
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr ""
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr ""
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr ""
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -339,8 +335,8 @@ msgstr ""
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -649,19 +645,19 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 msgid "has come online"
 msgstr ""
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -824,59 +820,59 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."

locale/es/LC_MESSAGES/converse.json

@@ -163,14 +163,10 @@
             null,
             "Chat"
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Desconectado"
-         ],
          "Error": [
             null,
             "Error"

locale/es/LC_MESSAGES/converse.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Javier Lopez <m@javier.io>\n"
 "Language-Team: ES <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contacto está ausente"
@@ -68,12 +68,12 @@ msgstr "Eliminar mensajes"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "¿Está seguro de querer limpiar los mensajes de esta conversación?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
@@ -95,176 +95,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Registrar"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Estoy %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Haga click para escribir un mensaje de estatus personalizado"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Haga click para cambiar su estatus de chat"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Personalizar estatus"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Guardar"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "en línea"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "ausente por mucho tiempo"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "En línea"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Agregar"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Haga click para agregar nuevos contactos al chat"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Agregar un contacto"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Sin usuarios encontrados"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Haga click para agregar como contacto de chat"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Chat"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Error"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "La autenticación falló"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -363,8 +359,8 @@ msgstr "Definir tema de sala de chat"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -679,20 +675,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -886,59 +882,59 @@ msgstr "verificado"
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1048,6 +1044,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Desconectado"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostrar más información en esta sala"

locale/fr/LC_MESSAGES/converse.json

@@ -187,14 +187,10 @@
             null,
             "Ouvrir IM"
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Déconnecté"
-         ],
          "Error": [
             null,
             "Erreur"

locale/fr/LC_MESSAGES/converse.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Language-Team: FR <LL@li.org>\n"
 "Language: fr\n"
@@ -42,7 +42,7 @@ msgid "has stopped typing"
 msgstr "a arrêté d'écrire"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "est parti"
 
@@ -62,11 +62,11 @@ msgstr "Effacer les messages"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Êtes-vous sûr de vouloir supprimer les messages de cette conversation?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "s'est déconnecté"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "est occupé"
 
@@ -87,173 +87,169 @@ msgstr ""
 msgid "Start a call"
 msgstr "Démarrer un appel"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "Nom d'utilisateur XMPP/Jabber"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Cliquez ici pour se connecter anonymement"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Se connecter"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "Nom d'utilisateur XMPP/Jabber"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Mot de passe:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "S'inscrire"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Je suis %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Cliquez ici pour indiquer votre statut personnel"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Cliquez pour changer votre statut"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Statut personnel"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "en ligne"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "occupé"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "absent pour une longue durée"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "En ligne"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Cliquez pour ajouter de nouveaux contacts"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Ajouter un contact"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Cliquer pour ajouter aux contacts"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Ouvrir IM"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Déconnecté"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Erreur"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "L'authentification a échoué"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -348,8 +344,8 @@ msgstr "Indiquer le sujet du salon"
 msgid "Allow muted user to post messages"
 msgstr "Autoriser les utilisateurs muets à poster des messages"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -661,20 +657,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "s'est déconnecté"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -863,31 +859,31 @@ msgstr "vérifié"
 msgid "finished"
 msgstr "terminé"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Votre domaine XMPP:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Récupération du formulaire d'enregistrement"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Astuce: Une liste publique de fournisseurs XMPP est disponible"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "ici"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -895,11 +891,11 @@ msgstr ""
 "Désolé, le fournisseur indiqué ne supporte pas l'enregistrement de compte en "
 "ligne. Merci d'essayer avec un autre fournisseur."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Demande du formulaire enregistrement au serveur XMPP"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -907,19 +903,19 @@ msgstr ""
 "Quelque chose a échoué lors de l'établissement de la connexion avec \"%1$s"
 "\". Êtes-vous sure qu'il existe ?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "En cours de connexion"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Enregistré avec succès"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Retourner"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
@@ -1026,6 +1022,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Êtes-vous sûr de vouloir refuser la demande de ce contact?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Déconnecté"
+
 #~ msgid "Type to filter"
 #~ msgstr "Filtrer"
 

locale/he/LC_MESSAGES/converse.json

@@ -191,14 +191,6 @@
             null,
             "הפעל שיח"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            "מנסה להתחבר בעוד 5 שניות"
-         ],
-         "Disconnected": [
-            null,
-            "מנותק"
-         ],
          "Error": [
             null,
             "שגיאה"

locale/he/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: GreenLunar <https://github.com/GreenLunar>\n"
 "Language-Team: Rahut <http://sourceforge.net/projects/rahut/>\n"
@@ -42,7 +42,7 @@ msgid "has stopped typing"
 msgstr "חדל(ה) להקליד"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "נעדר(ת)"
 
@@ -62,11 +62,11 @@ msgstr "הסר הודעות"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "כבר לא מקוון"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "עסוק(ה) כעת"
 
@@ -87,173 +87,170 @@ msgstr "הכנס סמיילי"
 msgid "Start a call"
 msgstr "התחל שיחה"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "כעת מתחבר"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "לחץ כאן כדי להתחבר באופן אנונימי"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "כניסה"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "סיסמה"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "התחברות"
 
 # אני במצב
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "מצבי כעת הינו %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "לחץ כאן כדי לכתוב הודעת מצב מותאמת"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "לחץ כדי לשנות את הודעת השיחה שלך"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "מצב מותאם"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "שמור"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "נעדר לזמן מה"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "התנתקות"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "שם איש קשר"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "למשל user@example.com"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "הוסף"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "הוסף איש קשר"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "לא נמצאו משתמשים"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "לחץ כדי להוסיף בתור איש קשר שיחה"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "הפעל שיח"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+#, fuzzy
+msgid "Attempting to reconnect"
 msgstr "מנסה להתחבר בעוד 5 שניות"
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "מנותק"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "כעת מאמת"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "אימות נכשל"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "לקוח זה לא מתיר הרשמות נוכחות"
 
@@ -349,8 +346,8 @@ msgstr "קבע נושא חדר"
 msgid "Allow muted user to post messages"
 msgstr "התר למשתמש מושתק לפרסם הודעות"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -663,20 +660,20 @@ msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s, והשאיר א
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "כבר לא מקוון"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -857,60 +854,60 @@ msgstr "מאומתת"
 msgid "finished"
 msgstr "מוגמרת"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr " למשל conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "שם מתחם של ספק XMPP שלך:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "משוך טופס הרשמה"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "טיפ: רשימה פומבית של ספקי XMPP הינה זמינה"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "כאן"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "הירשם"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 "מצטערים, הספק שניתן לא תומך ברישום חשבונות in band. אנא נסה עם ספק אחר."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "כעת מבקש טופס הרשמה מתוך שרת XMPP"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr "משהו השתבש במהלך ביסוס חיבור עם \"%1$s\". האם אתה בטוח כי זה קיים?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "כעת מחבר אותך פנימה"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "נרשם בהצלחה"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "חזור"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
@@ -1018,6 +1015,9 @@ msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר
 msgid "Are you sure you want to decline this contact request?"
 msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
 
+#~ msgid "Disconnected"
+#~ msgstr "מנותק"
+
 #~ msgid "Type to filter"
 #~ msgstr "הקלד כדי לסנן"
 

locale/hu/LC_MESSAGES/converse.json

@@ -198,14 +198,6 @@
             null,
             "Csevegőablak"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            "Újrakapcsolódás 5 másodperc múlva"
-         ],
-         "Disconnected": [
-            null,
-            "Szétkapcsolva"
-         ],
          "Error": [
             null,
             "Hiba"

locale/hu/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.8.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian\n"
@@ -41,7 +41,7 @@ msgid "has stopped typing"
 msgstr "már nem gépel"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "távol van"
 
@@ -61,11 +61,11 @@ msgstr "Üzenetek törlése"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Törölni szeretné az eddigi üzeneteket?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "kijelentkezett"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "elfoglalt"
 
@@ -85,172 +85,169 @@ msgstr "Hangulatjel beszúrása"
 msgid "Start a call"
 msgstr "Hívás indítása"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Kattintson ide a névtelen bejelentkezéshez"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Belépés"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr "felhasznalo@szerver"
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "jelszó"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Belépés"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "%1$s vagyok"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Egyedi státusz üzenet írása"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Saját státusz beállítása"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Egyedi státusz"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Ment"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "elérhető"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "elfoglalt"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "hosszú ideje távol"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "távol"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr "nem elérhető"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Foglalt"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Távol"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Kilépés"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Partner neve"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Keresés"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "pl. felhasznalo@pelda.hu"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Új csevegőpartner hozzáadása"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Új partner felvétele"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Nincs felhasználó"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Felvétel a csevegőpartnerek közé"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Csevegőablak"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+#, fuzzy
+msgid "Attempting to reconnect"
 msgstr "Újrakapcsolódás 5 másodperc múlva"
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Szétkapcsolva"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Hiba"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Azonosítási hiba"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr "Sajnáljuk, hiba történt a hozzáadás során"
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "Ez a kliens nem engedélyezi a jelenlét követését"
 
@@ -344,8 +341,8 @@ msgstr "Csevegőszoba téma beállítása"
 msgid "Allow muted user to post messages"
 msgstr "Elnémított felhasználók is küldhetnek üzeneteket"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -654,20 +651,20 @@ msgstr "%1$s meghívott a(z) %2$s csevegőszobába. Indok: \"%3$s\""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "kijelentkezett"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -849,31 +846,31 @@ msgstr "hitelesített"
 msgid "finished"
 msgstr "befejezett"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "pl. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Az XMPP szolgáltató domain neve:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Regisztrációs űrlap"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tipp: A nyílvános XMPP szolgáltatókról egy lista elérhető"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "itt"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -881,11 +878,11 @@ msgstr ""
 "A megadott szolgáltató nem támogatja a csevegőn keresztüli regisztrációt. "
 "Próbáljon meg egy másikat."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Regisztrációs űrlap lekérése az XMPP szervertől"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -893,19 +890,19 @@ msgstr ""
 "Hiba történt a(z) \"%1$s\" kapcsolódásakor. Biztos benne, hogy ez létező "
 "kiszolgáló?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "Belépés..."
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Sikeres regisztráció"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Visza"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1013,6 +1010,9 @@ msgstr "Sajnáljuk, hiba történt a törlés során"
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Szétkapcsolva"
+
 #~ msgid "Type to filter"
 #~ msgstr "Írjon be pár betűt"
 

locale/id/LC_MESSAGES/converse.json

@@ -162,14 +162,10 @@
             null,
             ""
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Terputus"
-         ],
          "Error": [
             null,
             "Kesalahan"

locale/id/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2014-01-25 21:30+0700\n"
 "Last-Translator: Priyadi Iman Nurcahyo <priyadi@priyadi.net>\n"
 "Language-Team: Bahasa Indonesia\n"
@@ -39,7 +39,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "Teman ini tidak di tempat"
@@ -60,12 +60,12 @@ msgstr "Hapus pesan"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "sibuk"
@@ -87,176 +87,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Teman"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Menyambung"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Masuk"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Saya %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Klik untuk menulis status kustom"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Klik untuk mengganti status"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Status kustom"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Simpan"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "terhubung"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "sibuk"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "lama tak di tempat"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "tak di tempat"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Terhubung"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Sibuk"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Pergi"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nama teman"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Cari"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Tambah"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Klik untuk menambahkan teman baru"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Tambah teman"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Pengguna tak ditemukan"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Klik untuk menambahkan sebagai teman"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Terputus"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Melakukan otentikasi"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Otentikasi gagal"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -356,8 +352,8 @@ msgstr "Setel topik ruangan"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Batal"
 
@@ -670,20 +666,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -882,59 +878,59 @@ msgstr "diverifikasi"
 msgid "finished"
 msgstr "selesai"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1045,6 +1041,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik untuk menghapus teman ini"
 
+#~ msgid "Disconnected"
+#~ msgstr "Terputus"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Tampilkan informasi ruangan ini"

locale/it/LC_MESSAGES/converse.json

@@ -195,14 +195,6 @@
             null,
             "Attiva/disattiva chat"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            "Attendi riconversione in 5 secondi"
-         ],
-         "Disconnected": [
-            null,
-            "Disconnesso"
-         ],
          "Error": [
             null,
             "Errore"

locale/it/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Fabio Bas <ctrlaltca@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -43,7 +43,7 @@ msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr ""
 
@@ -63,11 +63,11 @@ msgstr "Rimuovi messaggi"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "è occupato"
 
@@ -87,172 +87,169 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Clicca per entrare anonimo"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Entra"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "Password"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Accesso"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Sono %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Clicca qui per scrivere un messaggio di stato personalizzato"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Clicca per cambiare il tuo stato"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Stato personalizzato"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Salva"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "in linea"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "occupato"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "assente da molto"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "assente"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr "offline"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "In linea"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Occupato"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Assente"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Non in linea"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Logo out"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nome del contatto"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "es. user@example.com"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Clicca per aggiungere nuovi contatti alla chat"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Aggiungi contatti"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Nessun utente trovato"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Clicca per aggiungere il contatto alla chat"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Attiva/disattiva chat"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+#, fuzzy
+msgid "Attempting to reconnect"
 msgstr "Attendi riconversione in 5 secondi"
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Errore"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Autenticazione in corso"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr "Si è verificato un errore durante il tentativo di aggiunta"
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "Questo client non consente sottoscrizioni di presenza"
 
@@ -347,8 +344,8 @@ msgstr "Cambia oggetto della stanza"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -661,20 +658,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Questo contatto è online"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -837,31 +834,31 @@ msgstr "verificato"
 msgid "finished"
 msgstr "finito"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "es. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Nome del dominio del provider XMPP:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Modulo di registrazione"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Suggerimento: È disponibile un elenco di provider XMPP pubblici"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "qui"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Registra"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -869,11 +866,11 @@ msgstr ""
 "Siamo spiacenti, il provider specificato non supporta la registrazione di "
 "account. Si prega di provare con un altro provider."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Sto richiedendo un modulo di registrazione al server XMPP"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -881,19 +878,19 @@ msgstr ""
 "Qualcosa è andato storto durante la connessione con “%1$s”. Sei sicuro che "
 "esiste?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Registrazione riuscita"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
@@ -1000,6 +997,9 @@ msgstr "Si è verificato un errore durante il tentativo di rimozione"
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Sei sicuro dirifiutare questa richiesta di contatto?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Disconnesso"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostra più informazioni su questa stanza"

locale/ja/LC_MESSAGES/converse.json

@@ -163,14 +163,10 @@
             null,
             ""
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "切断中"
-         ],
          "Error": [
             null,
             "エラー"

locale/ja/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2014-01-07 11:32+0900\n"
 "Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Language JA\n"
@@ -39,7 +39,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "この相手先は離席中です"
@@ -60,12 +60,12 @@ msgstr "メッセージを削除"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "取り込み中"
@@ -87,176 +87,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "相手先"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "接続中です"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "サインイン"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "私はいま %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "状況メッセージを入力するには、ここをクリック"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "クリックして、在席状況を変更"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "独自の在席状況"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "在席"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "不在"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "オンライン"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "名前"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "検索"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "追加"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "クリックして新しいチャットの相手先を追加"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "相手先を追加"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "ユーザーが見つかりません"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "クリックしてチャットの相手先として追加"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "切断中"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "エラー"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "認証に失敗"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -356,8 +352,8 @@ msgstr "談話室の話題を設定"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -669,20 +665,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -873,59 +869,59 @@ msgstr "検証されました"
 msgid "finished"
 msgstr "完了"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1036,6 +1032,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "クリックしてこの相手先を削除"
 
+#~ msgid "Disconnected"
+#~ msgstr "切断中"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "この談話室についての詳細を見る"

locale/nb/LC_MESSAGES/converse.json

@@ -171,11 +171,7 @@
             null,
             "Endre chatten"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            ""
-         ],
-         "Disconnected": [
+         "Attempting to reconnect": [
             null,
             ""
          ],

locale/nb/LC_MESSAGES/converse.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse JS 0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Andreas Lorentsen <andreas.lorentsen@gmail.com>\n"
 "Language-Team: \n"
@@ -40,7 +40,7 @@ msgid "has stopped typing"
 msgstr "har stoppet å skrive"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "Kontakten er borte"
@@ -61,12 +61,12 @@ msgstr "Fjern meldinger"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Er du sikker på at du vil fjerne meldingene fra denne meldingsboksen?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "opptatt"
@@ -88,174 +88,170 @@ msgstr ""
 msgid "Start a call"
 msgstr "Start en samtale"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Logg inn"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Innlogging"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Jeg er %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Klikk her for å skrive en personlig statusmelding"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Klikk for å endre din meldingsstatus"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Personlig status"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Lagre"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "pålogget"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "opptatt"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "borte lenge"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "borte"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Opptatt"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Borte"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Logg Av"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Kontaktnavn"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Søk"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Legg Til"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Klikk for å legge til nye meldingskontakter"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Legg til en Kontakt"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Ingen brukere funnet"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Klikk for å legge til som meldingskontakt"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Endre chatten"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Feil"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Godkjenner"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Godkjenning mislyktes"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -351,8 +347,8 @@ msgstr "Endre rommets emne"
 msgid "Allow muted user to post messages"
 msgstr "Tillat stumme brukere å skrive meldinger"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -666,20 +662,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -868,31 +864,31 @@ msgstr "verifisert"
 msgid "finished"
 msgstr "ferdig"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Din XMPP-tilbyders domenenavn:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Hent registreringsskjema"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Tips: En liste med offentlige XMPP-tilbydere er tilgjengelig"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "her"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Registrér deg"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -900,11 +896,11 @@ msgstr ""
 "Beklager, den valgte tilbyderen støtter ikke in band kontoregistrering. "
 "Vennligst prøv igjen med en annen tilbyder. "
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Spør etter registreringsskjema fra XMPP-tjeneren"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -912,19 +908,19 @@ msgstr ""
 "Noe gikk galt under etablering av forbindelse med \"%1$s\". Er du sikker på "
 "at denne eksisterer?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "Logger deg inn"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Registrering var vellykket"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Tilbake"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "

locale/nl/LC_MESSAGES/converse.json

@@ -155,14 +155,10 @@
             null,
             ""
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Verbinding verbroken."
-         ],
          "Error": [
             null,
             "Error"

locale/nl/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Maarten Kling <maarten@fourdigits.nl>\n"
 "Language-Team: Dutch\n"
@@ -44,7 +44,7 @@ msgid "has stopped typing"
 msgstr "%1$s is aan typen"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "Conact is afwezig"
@@ -65,12 +65,12 @@ msgstr "Verwijder bericht"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Contact is offline"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "bezet"
@@ -92,176 +92,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Aanmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Ik ben %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om custom status bericht te maken"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Klik hier om status te wijzigen"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "bezet"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "afwezig lange tijd"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "afwezig"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Bezet"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Afwezig"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Contact naam"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Klik om nieuwe contacten toe te voegen"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Voeg contact toe"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Geen gebruikers gevonden"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Klik om contact toe te voegen"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Verbinding verbroken."
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Error"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Authenticeren"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Authenticeren mislukt"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -361,8 +357,8 @@ msgstr "Zet chatroom topic"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -671,20 +667,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Contact is offline"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -854,59 +850,59 @@ msgstr "geverifieerd"
 msgid "finished"
 msgstr "klaar"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1017,6 +1013,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik om contact te verwijderen"
 
+#~ msgid "Disconnected"
+#~ msgstr "Verbinding verbroken."
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Toon meer informatie over deze room"

locale/pl/LC_MESSAGES/converse.json

@@ -191,11 +191,7 @@
             null,
             "Przełącz rozmowę"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            ""
-         ],
-         "Disconnected": [
+         "Attempting to reconnect": [
             null,
             ""
          ],

locale/pl/LC_MESSAGES/converse.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.9.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Serge Victor <converse.js@random.re>\n"
 "Language-Team: Polish\n"
@@ -41,7 +41,7 @@ msgid "has stopped typing"
 msgstr "przestał pisać"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "uciekł"
 
@@ -62,11 +62,11 @@ msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z okienka rozmowy?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "wyłączył się"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "zajęty"
 
@@ -87,172 +87,168 @@ msgstr "Wstaw uśmieszek"
 msgid "Start a call"
 msgstr "Zadzwoń"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "Nazwa użytkownika XMPP:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Kliknij tutaj aby zalogować się anonimowo"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "Nazwa użytkownika XMPP:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "hasło"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Zarejestruj się"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Jestem %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Kliknij aby wpisać nowy status"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Kliknij aby zmienić status rozmowy"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Własny status"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Zachowaj"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "dostępny"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "zajęty"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "dłużej nieobecny"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "nieobecny"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 msgid "offline"
 msgstr "rozłączony"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Dostępny"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Zajęty"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Nieobecny"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Wyloguj"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "np. user@example.com"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Kliknij aby dodać nowe kontakty"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Dodaj kontakt"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Nie znaleziono użytkowników"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Kliknij aby dodać jako kontakt"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Przełącz rozmowę"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Błąd"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Autoryzacja"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powiodła się"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr "Wystąpił błąd w czasie próby dodania "
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "Klient nie umożliwia subskrybcji obecności"
 
@@ -347,8 +343,8 @@ msgstr "Ustaw temat pokoju"
 msgid "Allow muted user to post messages"
 msgstr "Pozwól uciszonemu człowiekowi na rozmowę"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -659,20 +655,20 @@ msgstr "%1$s zaprosił cię do pokoju: %2$s, podając następujący powód: \"%3
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "wyłączył się"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -858,31 +854,31 @@ msgstr "zweryfikowane"
 msgid "finished"
 msgstr "zakończone"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "np. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Domena twojego dostawcy XMPP:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Pobierz formularz rejestracyjny"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Wskazówka: dostępna jest lista publicznych dostawców XMPP"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "tutaj"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -890,11 +886,11 @@ msgstr ""
 "Przepraszamy, ale podany dostawca nie obsługuje rejestracji. Spróbuj wskazać "
 "innego dostawcę."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Pobieranie formularza rejestracyjnego z serwera XMPP"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -902,19 +898,19 @@ msgstr ""
 "Coś nie zadziałało przy próbie połączenia z \"%1$s\". Jesteś pewien że "
 "istnieje?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "Teraz jesteś logowany"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Szczęśliwie zarejestrowany"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Powrót"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."

locale/pt_BR/LC_MESSAGES/converse.json

@@ -155,14 +155,10 @@
             null,
             "Alternar bate-papo"
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "Desconectado"
-         ],
          "Error": [
             null,
             "Erro"

locale/pt_BR/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Alan Meira <alan@engarte.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -44,7 +44,7 @@ msgid "has stopped typing"
 msgstr "%1$s está digitando"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contato está ausente"
@@ -65,12 +65,12 @@ msgstr "Remover mensagens"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Tem certeza que deseja limpar as mensagens dessa caixa?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contato está offline"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
@@ -92,176 +92,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Conectar-se"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Estou %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Clique aqui para customizar a mensagem de status"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Clique para mudar seu status no chat"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Status customizado"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Salvar"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "ausente a bastante tempo"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Procurar"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Clique para adicionar novos contatos ao chat"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Adicionar contato"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Não foram encontrados usuários"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Clique para adicionar como um contato do chat"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Alternar bate-papo"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Erro"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Falha de autenticação"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -362,8 +358,8 @@ msgstr "Definir tópico do chat"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -676,20 +672,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "Este contato está offline"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -887,59 +883,59 @@ msgstr "verificado"
 msgid "finished"
 msgstr "finalizado"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1050,6 +1046,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Clique para remover o contato"
 
+#~ msgid "Disconnected"
+#~ msgstr "Desconectado"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostrar mais informações nessa sala"

locale/ru/LC_MESSAGES/converse.json

@@ -194,10 +194,6 @@
             null,
             "Включить чат"
          ],
-         "Disconnected": [
-            null,
-            "Отключено"
-         ],
          "Error": [
             null,
             "Ошибка"

locale/ru/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Laconic Team <info@laconic.website>\n"
 "Language-Team: Laconic Team <info@laconic.website>\n"
@@ -38,7 +38,7 @@ msgid "has stopped typing"
 msgstr "перестал набирать"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "отошёл"
 
@@ -58,11 +58,11 @@ msgstr "Удалить сообщения"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Вы уверены, что хотите очистить сообщения из окна чата?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "вышел из сети"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "занят"
 
@@ -82,174 +82,170 @@ msgstr "Вставить смайлик"
 msgid "Start a call"
 msgstr "Инициировать звонок"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 msgid "Click here to log in anonymously"
 msgstr "Нажмите здесь, чтобы войти анонимно"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Войти"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 msgid "password"
 msgstr "пароль"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Вход"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Редактировать произвольный статус"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Изменить ваш статус"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Произвольный статус"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "на связи"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "занят"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "отошёл надолго"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "отошёл"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "В сети"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Занят"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Отошёл"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Выйти"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Поиск"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "например, user@example.com"
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Добавить"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Добавить новый чат"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Добавть контакт"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Пользователи не найдены"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Кликните, чтобы добавить контакт"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Включить чат"
 
-#: src/converse-core.js:428
+#: src/converse-core.js:431
 #, fuzzy
-msgid "Attempting to reconnect in 5 seconds"
+msgid "Attempting to reconnect"
 msgstr "Попытка восстановить соединение через 5 секунд"
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "Отключено"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Авторизация"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Не удалось авторизоваться"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr "Возникла ошибка при добавлении "
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr "Программа не поддерживает уведомления о статусе"
 
@@ -345,8 +341,8 @@ msgstr "Установить тему"
 msgid "Allow muted user to post messages"
 msgstr "Разрешить заглушенным пользователям отправлять сообщения"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -653,20 +649,20 @@ msgstr "%1$s пригласил вас в чат: %2$s, по следующей
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "вышел из сети"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -855,31 +851,31 @@ msgstr "проверено"
 msgid "finished"
 msgstr "закончено"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr "например, conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Получить форму регистрации"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Совет. Список публичных XMPP провайдеров доступен"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "здесь"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -887,11 +883,11 @@ msgstr ""
 "К сожалению, провайдер не поддерживает регистрацию аккаунта через клиентское "
 "приложение. Пожалуйста попробуйте выбрать другого провайдера."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запрашивается регистрационная форма с XMPP сервера"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -899,19 +895,19 @@ msgstr ""
 "Что-то пошло не так при установке связи с \"%1$s\". Вы уверены, что такой "
 "адрес существует?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "Осуществляется вход"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Зарегистрирован успешно"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Назад"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1019,6 +1015,9 @@ msgstr "Возникла ошибка при удалении "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Вы уверены, что хотите отклонить запрос от этого контакта?"
 
+#~ msgid "Disconnected"
+#~ msgstr "Отключено"
+
 #~ msgid "Type to filter"
 #~ msgstr "Текст для фильтра"
 

locale/uk/LC_MESSAGES/converse.json

@@ -183,11 +183,7 @@
             null,
             "Включити чат"
          ],
-         "Attempting to reconnect in 5 seconds": [
-            null,
-            ""
-         ],
-         "Disconnected": [
+         "Attempting to reconnect": [
             null,
             ""
          ],

locale/uk/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Last-Translator: Andriy Kopystyansky <anri@polynet.lviv.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -42,7 +42,7 @@ msgid "has stopped typing"
 msgstr "припинив друкувати"
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 msgid "has gone away"
 msgstr "пішов геть"
 
@@ -62,11 +62,11 @@ msgstr "Видалити повідомлення"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 msgid "has gone offline"
 msgstr "тепер поза мережею"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 msgid "is busy"
 msgstr "зайнятий"
 
@@ -87,174 +87,170 @@ msgstr ""
 msgid "Start a call"
 msgstr "Почати виклик"
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "Під'єднуюсь"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 msgid "XMPP Username:"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "Ввійти"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "Вступити"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "Клацніть тут, щоб створити власний статус"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "Клацніть, щоб змінити статус в чаті"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "Власний статус"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "на зв'язку"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "зайнятий"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "давно відсутній"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "відсутній"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "На зв'язку"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "Далеко"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 msgid "Log out"
 msgstr "Вийти"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "Назва контакту"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "Пошук"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "Додати"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "Клацніть, щоб додати нові контакти до чату"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "Додати контакт"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "Жодного користувача не знайдено"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "Клацніть, щоб додати як чат-контакт"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "Включити чат"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
-msgstr ""
-
-#: src/converse-core.js:452
-msgid "Disconnected"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "Помилка"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "Автентикуюсь"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "Автентикація невдала"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -349,8 +345,8 @@ msgstr "Встановити тему кімнати"
 msgid "Allow muted user to post messages"
 msgstr "Дозволити безголосому користувачу слати повідомлення"
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "Відміна"
 
@@ -658,20 +654,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "тепер поза мережею"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -857,31 +853,31 @@ msgstr "перевірено"
 msgid "finished"
 msgstr "завершено"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr " напр. conversejs.org"
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr "Домен Вашого провайдера XMPP:"
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr "Отримати форму реєстрації"
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr "Порада: доступний перелік публічних XMPP-провайдерів"
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr "тут"
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr "Реєстрація"
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
@@ -889,11 +885,11 @@ msgstr ""
 "Вибачте, вказаний провайдер не підтримує реєстрації онлайн. Спробуйте іншого "
 "провайдера."
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr "Запитую форму реєстрації з XMPP сервера"
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
@@ -901,19 +897,19 @@ msgstr ""
 "Щось пішло не так при встановленні зв'язку з \"%1$s\". Ви впевнені, що такий "
 "існує?"
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr "Входимо"
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr "Успішно зареєстровано"
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr "Вернутися"
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 #, fuzzy
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "

locale/zh/LC_MESSAGES/converse.json

@@ -162,14 +162,10 @@
             null,
             "折叠聊天窗口"
          ],
-         "Attempting to reconnect in 5 seconds": [
+         "Attempting to reconnect": [
             null,
             ""
          ],
-         "Disconnected": [
-            null,
-            "连接已断开"
-         ],
          "Error": [
             null,
             "错误"

locale/zh/LC_MESSAGES/converse.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-07 10:34+0000\n"
+"POT-Creation-Date: 2016-05-03 15:34+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Huxisuz Hu <huxisuz@gmail.com>\n"
 "Language-Team: Language zh\n"
@@ -41,7 +41,7 @@ msgid "has stopped typing"
 msgstr ""
 
 #: src/converse-chatview.js:337 src/converse-chatview.js:554
-#: src/converse-notification.js:157
+#: src/converse-notification.js:161
 #, fuzzy
 msgid "has gone away"
 msgstr "对方离开"
@@ -62,12 +62,12 @@ msgstr "移除消息"
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "你确定清除此次的聊天记录吗？"
 
-#: src/converse-chatview.js:552 src/converse-notification.js:155
+#: src/converse-chatview.js:552 src/converse-notification.js:159
 #, fuzzy
 msgid "has gone offline"
 msgstr "对方已下线"
 
-#: src/converse-chatview.js:556 src/converse-notification.js:159
+#: src/converse-chatview.js:556 src/converse-notification.js:163
 #, fuzzy
 msgid "is busy"
 msgstr "忙碌"
@@ -89,176 +89,172 @@ msgstr ""
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:173 src/converse-core.js:576
-#: src/converse-core.js:622 src/converse-rosterview.js:58
+#: src/converse-controlbox.js:177 src/converse-core.js:570
+#: src/converse-core.js:616 src/converse-rosterview.js:58
 msgid "Contacts"
 msgstr "联系人"
 
-#: src/converse-controlbox.js:275 src/converse-core.js:483
+#: src/converse-controlbox.js:265 src/converse-core.js:474
 msgid "Connecting"
 msgstr "连接中"
 
-#: src/converse-controlbox.js:375
+#: src/converse-controlbox.js:365
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:376
+#: src/converse-controlbox.js:366
 msgid "Password:"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:377
+#: src/converse-controlbox.js:367
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-controlbox.js:378
+#: src/converse-controlbox.js:368
 msgid "Log In"
 msgstr "登录"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:379
+#: src/converse-controlbox.js:369
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:380
+#: src/converse-controlbox.js:370
 #, fuzzy
 msgid "password"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:387
+#: src/converse-controlbox.js:377
 msgid "Sign in"
 msgstr "登录"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:475 src/converse-controlbox.js:550
+#: src/converse-controlbox.js:465 src/converse-controlbox.js:540
 msgid "I am %1$s"
 msgstr "我现在%1$s"
 
-#: src/converse-controlbox.js:477 src/converse-controlbox.js:555
+#: src/converse-controlbox.js:467 src/converse-controlbox.js:545
 msgid "Click here to write a custom status message"
 msgstr "点击这里，填写状态信息"
 
-#: src/converse-controlbox.js:478 src/converse-controlbox.js:556
+#: src/converse-controlbox.js:468 src/converse-controlbox.js:546
 msgid "Click to change your chat status"
 msgstr "点击这里改变聊天状态"
 
-#: src/converse-controlbox.js:503
+#: src/converse-controlbox.js:493
 msgid "Custom status"
 msgstr "DIY状态"
 
-#: src/converse-controlbox.js:504 src/converse-muc.js:556
+#: src/converse-controlbox.js:494 src/converse-muc.js:556
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-controlbox.js:532 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:522 src/converse-controlbox.js:532
 msgid "online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:534
+#: src/converse-controlbox.js:524
 msgid "busy"
 msgstr "忙碌"
 
-#: src/converse-controlbox.js:536
+#: src/converse-controlbox.js:526
 msgid "away for long"
 msgstr "长时间离开"
 
-#: src/converse-controlbox.js:538
+#: src/converse-controlbox.js:528
 msgid "away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:540
+#: src/converse-controlbox.js:530
 #, fuzzy
 msgid "offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:581 src/converse-rosterview.js:102
+#: src/converse-controlbox.js:571 src/converse-rosterview.js:102
 msgid "Online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:582 src/converse-rosterview.js:104
+#: src/converse-controlbox.js:572 src/converse-rosterview.js:104
 msgid "Busy"
 msgstr "忙碌中"
 
-#: src/converse-controlbox.js:583 src/converse-rosterview.js:105
+#: src/converse-controlbox.js:573 src/converse-rosterview.js:105
 msgid "Away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:584 src/converse-rosterview.js:107
+#: src/converse-controlbox.js:574 src/converse-rosterview.js:107
 msgid "Offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:585
+#: src/converse-controlbox.js:575
 #, fuzzy
 msgid "Log out"
 msgstr "登录"
 
-#: src/converse-controlbox.js:592
+#: src/converse-controlbox.js:582
 msgid "Contact name"
 msgstr "联系人名称"
 
-#: src/converse-controlbox.js:593
+#: src/converse-controlbox.js:583
 msgid "Search"
 msgstr "搜索"
 
-#: src/converse-controlbox.js:597
+#: src/converse-controlbox.js:587
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:598
+#: src/converse-controlbox.js:588
 msgid "Add"
 msgstr "添加"
 
-#: src/converse-controlbox.js:603
+#: src/converse-controlbox.js:593
 msgid "Click to add new chat contacts"
 msgstr "点击添加新联系人"
 
-#: src/converse-controlbox.js:604
+#: src/converse-controlbox.js:594
 msgid "Add a contact"
 msgstr "添加联系人"
 
-#: src/converse-controlbox.js:628
+#: src/converse-controlbox.js:618
 msgid "No users found"
 msgstr "未找到用户"
 
-#: src/converse-controlbox.js:634
+#: src/converse-controlbox.js:624
 msgid "Click to add as a chat contact"
 msgstr "点击添加为好友"
 
-#: src/converse-controlbox.js:692
+#: src/converse-controlbox.js:682
 msgid "Toggle chat"
 msgstr "折叠聊天窗口"
 
-#: src/converse-core.js:428
-msgid "Attempting to reconnect in 5 seconds"
+#: src/converse-core.js:431
+msgid "Attempting to reconnect"
 msgstr ""
 
-#: src/converse-core.js:452
-msgid "Disconnected"
-msgstr "连接已断开"
-
-#: src/converse-core.js:481
+#: src/converse-core.js:472
 msgid "Error"
 msgstr "错误"
 
-#: src/converse-core.js:485
+#: src/converse-core.js:476
 msgid "Authenticating"
 msgstr "验证中"
 
-#: src/converse-core.js:487 src/converse-core.js:488
+#: src/converse-core.js:478 src/converse-core.js:479
 msgid "Authentication Failed"
 msgstr "验证失败"
 
-#: src/converse-core.js:880
+#: src/converse-core.js:874
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1051
+#: src/converse-core.js:1045
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -359,8 +355,8 @@ msgstr "设置房间主题"
 msgid "Allow muted user to post messages"
 msgstr ""
 
-#: src/converse-muc.js:557 src/converse-register.js:222
-#: src/converse-register.js:337
+#: src/converse-muc.js:557 src/converse-register.js:216
+#: src/converse-register.js:331
 msgid "Cancel"
 msgstr "取消"
 
@@ -669,20 +665,20 @@ msgstr ""
 msgid "Notification from %1$s"
 msgstr ""
 
-#: src/converse-notification.js:134
+#: src/converse-notification.js:129 src/converse-notification.js:137
 msgid "%1$s says"
 msgstr ""
 
-#: src/converse-notification.js:161
+#: src/converse-notification.js:165
 #, fuzzy
 msgid "has come online"
 msgstr "对方已下线"
 
-#: src/converse-notification.js:176
+#: src/converse-notification.js:180
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:184
+#: src/converse-notification.js:188
 msgid "An error has occured"
 msgstr ""
 
@@ -869,59 +865,59 @@ msgstr "已验证"
 msgid "finished"
 msgstr "结束了"
 
-#: src/converse-register.js:86
+#: src/converse-register.js:80
 msgid " e.g. conversejs.org"
 msgstr ""
 
-#: src/converse-register.js:109
+#: src/converse-register.js:103
 msgid "Your XMPP provider's domain name:"
 msgstr ""
 
-#: src/converse-register.js:110
+#: src/converse-register.js:104
 msgid "Fetch registration form"
 msgstr ""
 
-#: src/converse-register.js:111
+#: src/converse-register.js:105
 msgid "Tip: A list of public XMPP providers is available"
 msgstr ""
 
-#: src/converse-register.js:112
+#: src/converse-register.js:106
 msgid "here"
 msgstr ""
 
-#: src/converse-register.js:117 src/converse-register.js:335
+#: src/converse-register.js:111 src/converse-register.js:329
 msgid "Register"
 msgstr ""
 
-#: src/converse-register.js:163
+#: src/converse-register.js:157
 msgid ""
 "Sorry, the given provider does not support in band account registration. "
 "Please try with a different provider."
 msgstr ""
 
-#: src/converse-register.js:223
+#: src/converse-register.js:217
 msgid "Requesting a registration form from the XMPP server"
 msgstr ""
 
-#: src/converse-register.js:258
+#: src/converse-register.js:252
 msgid ""
 "Something went wrong while establishing a connection with \"%1$s\". Are you "
 "sure it exists?"
 msgstr ""
 
-#: src/converse-register.js:277
+#: src/converse-register.js:271
 msgid "Now logging you in"
 msgstr ""
 
-#: src/converse-register.js:281
+#: src/converse-register.js:275
 msgid "Registered successfully"
 msgstr ""
 
-#: src/converse-register.js:340
+#: src/converse-register.js:334
 msgid "Return"
 msgstr ""
 
-#: src/converse-register.js:372
+#: src/converse-register.js:366
 msgid ""
 "The provider rejected your registration attempt. Please check the values you "
 "entered for correctness."
@@ -1032,6 +1028,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "确定移除联系人吗？"
 
+#~ msgid "Disconnected"
+#~ msgstr "连接已断开"
+
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "显示次聊天室的更多信息"

package.json

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