Răsfoiți Sursa

New release 2.0.0

JC Brand 8 ani în urmă
părinte
comite
10da240e7e
47 a modificat fișierele cu 3617 adăugiri și 2733 ștergeri
  1. 1 1
      bower.json
  2. 341 237
      dist/converse-mobile.js
  3. 210 117
      dist/converse-no-dependencies.js
  4. 341 237
      dist/converse.js
  5. 0 0
      dist/locales.js
  6. 10 6
      dist/templates.js
  7. 1 1
      docs/CHANGES.md
  8. 2 2
      docs/source/conf.py
  9. 11 1
      docs/source/configuration.rst
  10. 15 7
      locale/af/LC_MESSAGES/converse.json
  11. 130 105
      locale/af/LC_MESSAGES/converse.po
  12. 14 6
      locale/ca/LC_MESSAGES/converse.json
  13. 132 100
      locale/ca/LC_MESSAGES/converse.po
  14. 120 98
      locale/converse.pot
  15. 15 7
      locale/de/LC_MESSAGES/converse.json
  16. 127 102
      locale/de/LC_MESSAGES/converse.po
  17. 22 6
      locale/en/LC_MESSAGES/converse.json
  18. 121 98
      locale/en/LC_MESSAGES/converse.po
  19. 15 7
      locale/es/LC_MESSAGES/converse.json
  20. 127 108
      locale/es/LC_MESSAGES/converse.po
  21. 15 7
      locale/fr/LC_MESSAGES/converse.json
  22. 127 108
      locale/fr/LC_MESSAGES/converse.po
  23. 18 6
      locale/he/LC_MESSAGES/converse.json
  24. 131 109
      locale/he/LC_MESSAGES/converse.po
  25. 18 6
      locale/hu/LC_MESSAGES/converse.json
  26. 131 109
      locale/hu/LC_MESSAGES/converse.po
  27. 11 7
      locale/id/LC_MESSAGES/converse.json
  28. 128 109
      locale/id/LC_MESSAGES/converse.po
  29. 14 6
      locale/it/LC_MESSAGES/converse.json
  30. 132 110
      locale/it/LC_MESSAGES/converse.po
  31. 11 7
      locale/ja/LC_MESSAGES/converse.json
  32. 128 109
      locale/ja/LC_MESSAGES/converse.po
  33. 15 7
      locale/nb/LC_MESSAGES/converse.json
  34. 127 102
      locale/nb/LC_MESSAGES/converse.po
  35. 11 7
      locale/nl/LC_MESSAGES/converse.json
  36. 128 109
      locale/nl/LC_MESSAGES/converse.po
  37. 16 8
      locale/pl/LC_MESSAGES/converse.json
  38. 134 103
      locale/pl/LC_MESSAGES/converse.po
  39. 11 7
      locale/pt_BR/LC_MESSAGES/converse.json
  40. 128 109
      locale/pt_BR/LC_MESSAGES/converse.po
  41. 14 6
      locale/ru/LC_MESSAGES/converse.json
  42. 132 110
      locale/ru/LC_MESSAGES/converse.po
  43. 15 7
      locale/uk/LC_MESSAGES/converse.json
  44. 127 102
      locale/uk/LC_MESSAGES/converse.po
  45. 11 7
      locale/zh/LC_MESSAGES/converse.json
  46. 128 109
      locale/zh/LC_MESSAGES/converse.po
  47. 1 1
      package.json

+ 1 - 1
bower.json

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

Fișier diff suprimat deoarece este prea mare
+ 341 - 237
dist/converse-mobile.js


Fișier diff suprimat deoarece este prea mare
+ 210 - 117
dist/converse-no-dependencies.js


Fișier diff suprimat deoarece este prea mare
+ 341 - 237
dist/converse.js


Fișier diff suprimat deoarece este prea mare
+ 0 - 0
dist/locales.js


+ 10 - 6
dist/templates.js

@@ -546,16 +546,20 @@ __p += '\n        <span class="spinner login-submit"/>\n    ';
 __p += '\n    ';
  if (!auto_login) { ;
 __p += '\n        ';
- if (authentication == LOGIN) { ;
+ if (authentication == LOGIN || authentication == EXTERNAL) { ;
 __p += '\n            <label>' +
 ((__t = (label_username)) == null ? '' : __t) +
 '</label>\n            <input type="text" name="jid" placeholder="' +
 ((__t = (placeholder_username)) == null ? '' : __t) +
-'">\n            <label>' +
+'">\n            ';
+ if (authentication !== EXTERNAL) { ;
+__p += '\n                <label>' +
 ((__t = (label_password)) == null ? '' : __t) +
-'</label>\n            <input type="password" name="password" placeholder="' +
+'</label>\n                <input type="password" name="password" placeholder="' +
 ((__t = (placeholder_password)) == null ? '' : __t) +
-'">\n            <input class="pure-button button-primary" type="submit" value="' +
+'">\n            ';
+ } ;
+__p += '\n            <input class="pure-button button-primary" type="submit" value="' +
 ((__t = (label_login)) == null ? '' : __t) +
 '">\n            <span class="conn-feedback"></span>\n        ';
  } ;
@@ -988,10 +992,10 @@ __p += ' selected="selected" ';
 __p += '\n            value="online">' +
 ((__t = (label_online)) == null ? '' : __t) +
 '</option>\n        <option ';
- if (chat_state === 'chatty') { ;
+ if (chat_state === 'chat') { ;
 __p += ' selected="selected" ';
  } ;
-__p += '\n            value="chatty">' +
+__p += '\n            value="chat">' +
 ((__t = (label_chatty)) == null ? '' : __t) +
 '</option>\n        <option ';
  if (chat_state === 'dnd') { ;

+ 1 - 1
docs/CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.0.0 (Unreleased)
+## 2.0.0 (2016-09-16)
 - Backwards incompatible change: the `_super` attribute in plugins is now named `__super__`. [jcbrand]
 - Continuously attempt to resurrect dead connections when `auto_reconnect` is `true`. [jcbrand]
 - Update the 'rooms' API to allow user to pass in room attributes. [jcbrand]

+ 2 - 2
docs/source/conf.py

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

+ 11 - 1
docs/source/configuration.rst

@@ -35,7 +35,7 @@ authentication
 --------------
 
 * Default:  ``login``
-* Allowed values: `login`_, `anonymous`_, `prebind`_
+* Allowed values: `login`_, `external`, `anonymous`_, `prebind`_
 
 This option states the way converse.js will authenticate.
 
@@ -46,6 +46,16 @@ The default means is ``login``, which means that the user either logs in manuall
 username and password, or automatically if used together with ``auto_login=true``
 and ``jid`` and ``password`` values. See `auto_login`_.
 
+external
+~~~~~~~~
+
+This setting will still show a login form and submit button, but the form will
+only contain an input for the user's JID, *not* for the password.
+
+That's because this setting is intended to be used when you are using
+SASL-EXTERNAL as authentication mechanism, in which case a password is usually
+not required.
+
 anonymous
 ~~~~~~~~~
 

+ 15 - 7
locale/af/LC_MESSAGES/converse.json

@@ -18,6 +18,10 @@
             null,
             "ek"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "tik tans"
@@ -206,13 +210,21 @@
             null,
             "Klik om hierdie kontakte te verskuil"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Herkonnekteer"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "Fout"
+            "Ontkoppel"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -594,10 +606,6 @@
             null,
             "wil jou kontak wees"
          ],
-         "An error has occured": [
-            null,
-            "'n Fout het voorgekom"
-         ],
          "Re-establishing encrypted session": [
             null,
             "Herstel versleutelde sessie"

+ 130 - 105
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:34+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: Afrikaans\n"
@@ -33,229 +33,258 @@ msgstr "Sluit hierdie kletskas"
 msgid "Personal message"
 msgstr "Persoonlike boodskap"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "ek"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "tik tans"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "het opgehou tik"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "het weggegaan"
 
 # The last three values are needed by Jed (a Javascript translations library)
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Vertoon hierdie keuselys"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Skryf in die derde persoon"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Verwyder boodskappe"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "is nou aflyn"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "is besig"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Vee alle boodskappe uit"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr "Verskuil die lys van deelnemers"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "Voeg 'n emotikon by"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Verbind tans"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP Gebruikersnaam:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Wagwoord"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Klik hier om anoniem aan te meld"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Meld aan"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "gebruiker@bediener"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "wagwoord"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 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:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Ek is %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om jou eie statusboodskap te skryf"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Klik om jou klets-status te verander"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Doelgemaakte status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Stoor"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "aangemeld"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "besig"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "vir lank afwesig"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "afwesig"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "afgemeld"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Aangemeld"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Besig"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Afwesig"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Afgemeld"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Meld af"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Kontaknaam"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Soek"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "bv. gebruiker@voorbeeld.org"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Voeg by"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Klik om nuwe kletskontakte by te voeg"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Voeg 'n kontak by"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Geen gebruikers gevind"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Klik om as kletskontak by te voeg"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Klets"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Klik om hierdie kontakte te verskuil"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Herkonnekteer"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Fout"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Ontkoppel"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Verbind tans"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "A fout het voorgekom terwyl probeer is om die vorm te stoor."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Besig om te bekragtig"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Bekragtiging het gefaal"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Bekragtiging het gefaal"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
 
@@ -367,7 +396,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Verander u bynaam"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Bynaam"
 
@@ -523,43 +552,43 @@ msgstr "Hierdie kamer bestaan tans (nog) nie"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Hierdie kletskamer het sy maksimum aantal deelnemers bereik"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Onderwerp deur %1$s bygewerk na: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Klik om hierdie kletskamer te open"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Hierdie gebruiker is 'n moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Hierdie gebruiker kan boodskappe na die kamer stuur"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Nooi uit"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Deelnemers"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "U is op die punt om %1$s na die kletskamer \"%2$s\" uit te nooi."
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -567,106 +596,106 @@ msgstr ""
 "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te "
 "staaf."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Kamer naam"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Bediener"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Betree kletskamer"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Wys kletskamers"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Kletskamers"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Geen kletskamers op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Kletskamers op %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Klik om hierdie kletskamer te open"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Wys meer inligting aangaande hierdie kletskamer"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Beskrywing:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Eienskappe:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Benodig magtiging"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Verskuil"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Benodig 'n uitnodiging"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Gemodereer"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Nie-anoniem"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Oop kletskamer"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Permanente kamer"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Deels anoniem"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Tydelike kamer"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Ongemodereer"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s het u uitgenooi om die kletskamer %2$s te besoek"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -692,10 +721,6 @@ msgstr "het aanlyn gekom"
 msgid "wants to be your contact"
 msgstr "wil jou kontak wees"
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr "'n Fout het voorgekom"
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1042,21 +1067,21 @@ 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 "Error"
+#~ msgstr "Fout"
+
+#~ msgid "An error has occured"
+#~ msgstr "'n Fout het voorgekom"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Jou bynaam is reeds geneem"
 
-#~ msgid "Disconnected"
-#~ msgstr "Ontkoppel"
-
 #~ msgid "Type to filter"
 #~ msgstr "Tik om te filtreer"
 
 #~ msgid "View more information on this person"
 #~ msgstr "Wys meer inligting aangaande hierdie persoon"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Herkonnekteer"
-
 #~ msgid "Contact username"
 #~ msgstr "Konak gebruikersnaam"
 

+ 14 - 6
locale/ca/LC_MESSAGES/converse.json

@@ -19,6 +19,10 @@
             null,
             "jo"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "està escrivint"
@@ -203,9 +207,17 @@
             null,
             "Feu clic per amagar aquests contactes"
          ],
-         "Error": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
-            "Error"
+            ""
+         ],
+         "Disconnected": [
+            null,
+            ""
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -567,10 +579,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "S'està tornant a establir la sessió xifrada"

+ 132 - 100
locale/ca/LC_MESSAGES/converse.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Converse.js 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-01-25 17:25+0100\n"
 "Last-Translator: Ruben Mansilla <ramansilla@gmail.com>\n"
 "Language-Team: CA <product@spamina.com>\n"
@@ -40,230 +40,259 @@ msgstr "Tanca aquest quadre del xat"
 msgid "Personal message"
 msgstr "Missatge personal"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "jo"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "està escrivint"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "ha deixat d'escriure"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "ha marxat"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Mostra aquest menú"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Escriu en tercera persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Segur que voleu esborrar els missatges d'aquest quadre del xat?"
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "s'ha desconnectat"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "està ocupat"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Esborra tots els missatges"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr "Amaga la llista d'ocupants"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "Insereix una cara somrient"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Inicia una trucada"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contactes"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "S'està establint la connexió"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Feu clic aquí per iniciar la sessió de manera anònima"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Inicia la sessió"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "Nom d'usuari XMPP:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "usuari@servidor"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "contrasenya"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Inicia la sessió"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Estic %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Feu clic aquí per escriure un missatge d'estat personalitzat"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Feu clic per canviar l'estat del xat"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Estat personalitzat"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Desa"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "en línia"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "ocupat"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "absent durant una estona"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "desconnectat"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "En línia"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Ocupat"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Tanca la sessió"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nom del contacte"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "p. ex. usuari@exemple.com"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Afegeix"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Feu clic per afegir contactes nous al xat"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Afegeix un contacte"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "No s'ha trobat cap usuari"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Feu clic per afegir com a contacte del xat"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Canvia de xat"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Feu clic per amagar aquests contactes"
 
-#: src/converse-core.js:404
+#: src/converse-core.js:413
 #, fuzzy
-msgid "Attempting to reconnect"
-msgstr "S'intentarà tornar a establir la connexió en 5 segons"
+msgid "Reconnecting"
+msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Error"
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr ""
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "S'està establint la connexió"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "S'ha produït un error en intentar desar el formulari."
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "S'està efectuant l'autenticació"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Error d'autenticació"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Error d'autenticació"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr "S'ha produït un error en intentar afegir "
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Aquest client no admet les subscripcions de presència"
 
@@ -377,7 +406,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Canvieu el vostre àlies"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Àlies"
 
@@ -535,150 +564,150 @@ msgstr "Aquesta sala (encara) no existeix"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Aquesta sala ha assolit el nombre màxim d'ocupants"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema definit per %1$s en: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Aquest usuari és un moderador"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Aquest usuari pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Aquest usuari NO pot enviar missatges a aquesta sala"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 #, fuzzy
 msgid "Invite"
 msgstr "Convida..."
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Ocupants"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Esteu a punt de convidar %1$s a la sala de xat \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Teniu l'opció d'incloure un missatge per explicar el motiu de la invitació."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nom de la sala"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Uneix-me a la sala"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Mostra les sales"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Sales"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "No hi ha cap sala a %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Sales a %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Feu clic per obrir aquesta sala"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Mostra més informació d'aquesta sala"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Descripció:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Ocupants:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Característiques:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Cal autenticar-se"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Amagat"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Cal tenir una invitació"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderada"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "No és anònima"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Obre la sala"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Sala permanent"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semianònima"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "No moderada"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s us ha convidat a unir-vos a una sala de xat: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -705,10 +734,6 @@ msgstr "s'ha desconnectat"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1054,6 +1079,13 @@ msgstr "S'ha produït un error en intentar eliminar "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Segur que voleu rebutjar aquesta sol·licitud de contacte?"
 
+#, fuzzy
+#~ msgid "Attempting to reconnect"
+#~ msgstr "S'intentarà tornar a establir la connexió en 5 segons"
+
+#~ msgid "Error"
+#~ msgstr "Error"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "El vostre àlies ja està en ús"
 

+ 120 - 98
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -30,227 +30,253 @@ msgstr ""
 msgid "Personal message"
 msgstr ""
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr ""
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr ""
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr ""
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr ""
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr ""
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr ""
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr ""
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr ""
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr ""
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr ""
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr ""
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr ""
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr ""
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr ""
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr ""
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr ""
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr ""
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr ""
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr ""
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr ""
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr ""
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr ""
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr ""
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr ""
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr ""
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+msgid "Connection error"
+msgstr ""
+
+#: src/converse-core.js:482
+msgid "An error occurred while connecting to the chat server."
+msgstr ""
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr ""
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+msgid "Authentication failed."
+msgstr ""
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -361,7 +387,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr ""
 
@@ -511,144 +537,144 @@ msgstr ""
 msgid "This room has reached its maximum number of occupants"
 msgstr ""
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 msgid "Click to mention this user in your message."
 msgstr ""
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 msgid "This user is a moderator."
 msgstr ""
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 msgid "This user can send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 msgid "This user can NOT send messages in this room."
 msgstr ""
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr ""
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr ""
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr ""
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr ""
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr ""
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr ""
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr ""
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr ""
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr ""
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr ""
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr ""
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr ""
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr ""
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr ""
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr ""
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr ""
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr ""
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -672,10 +698,6 @@ msgstr ""
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"

+ 15 - 7
locale/de/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "Ich"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "tippt"
@@ -187,13 +191,21 @@
             null,
             "Hier klicken um diese Kontakte zu verstecken"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Verbindung wiederherstellen …"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
             ""
          ],
-         "Error": [
+         "The connection to the chat server has dropped": [
             null,
-            "Fehler"
+            ""
          ],
          "Authenticating": [
             null,
@@ -555,10 +567,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Verschlüsselte Sitzung wiederherstellen"

+ 127 - 102
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:20+0000\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: German\n"
@@ -35,233 +35,262 @@ msgstr "Hier klicken um diesen Chat wiederherzustellen"
 msgid "Personal message"
 msgstr "Persönliche Nachricht"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "Ich"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "tippt"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "tippt nicht mehr"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "ist jetzt abwesend"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Dieses Menü anzeigen"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "In der dritten Person schreiben"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Nachrichten entfernen"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Dieser Kontakt ist offline"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "ist beschäftigt"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Alle Nachrichten löschen"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Teilnehmerliste ausblenden"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Verbindungsaufbau …"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP Benutzername"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Hier klicken um anonym anzumelden"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Anmelden"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Benutzername"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Passwort:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Anmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Ich bin %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Hier klicken um Statusnachricht zu ändern"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Hier klicken um Status zu ändern"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Statusnachricht"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Speichern"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "beschäftigt"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "länger abwesend"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "abwesend"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Abmelden"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Suche"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Hier klicken um neuen Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Kontakt hinzufügen"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Keine Benutzer gefunden"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Hier klicken um als Kontakt hinzuzufügen"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Chat ein-/ausblenden"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Hier klicken um diese Kontakte zu verstecken"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Verbindung wiederherstellen …"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr ""
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Fehler"
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Verbindungsaufbau …"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Beim Speichern des Formulars ist ein Fehler aufgetreten."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authentifizierung gescheitert"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Authentifizierung gescheitert"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -377,7 +406,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Spitznamen ändern"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Spitzname"
 
@@ -533,148 +562,148 @@ msgstr "Dieser Raum existiert (noch) nicht"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s hat das Thema zu \"%2$s\" geändert"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Dieser Benutzer ist ein Moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Dieser Benutzer kann Nachrichten in diesem Raum verschicken"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Einladen"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Teilnehmer"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Raumname"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Raum betreten"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Räume anzeigen"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Räume"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Keine Räume auf %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Räume auf %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Hier klicken um diesen Raum zu öffnen"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Mehr Information über diesen Raum zeigen"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Teilnehmer"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Funktionen:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Authentifizierung erforderlich"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Einladung erforderlich"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderiert"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Nicht anonym"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Offener Raum"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Dauerhafter Raum"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Öffentlich"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Teils anonym"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Vorübergehender Raum"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Unmoderiert"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s hat Sie in den Raum \"%2$s\" eingeladen"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -699,10 +728,6 @@ msgstr "Dieser Kontakt ist offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1021,6 +1046,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Ihre Spitzname existiert bereits."
 
@@ -1031,8 +1059,5 @@ msgstr "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"
 #~ msgid "View more information on this person"
 #~ msgstr "Mehr Information über diesen Raum zeigen"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Verbindung wiederherstellen …"
-
 #~ msgid "Contact username"
 #~ msgstr "Benutzername"

+ 22 - 6
locale/en/LC_MESSAGES/converse.json

@@ -19,6 +19,10 @@
             null,
             ""
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             ""
@@ -203,11 +207,23 @@
             null,
             ""
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            ""
+         ],
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
             ""
          ],
-         "Error": [
+         "The connection to the chat server has dropped": [
+            null,
+            ""
+         ],
+         "Connection error": [
             null,
             ""
          ],
@@ -215,6 +231,10 @@
             null,
             ""
          ],
+         "Authentication failed.": [
+            null,
+            ""
+         ],
          "Authentication Failed": [
             null,
             ""
@@ -595,10 +615,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             ""

+ 121 - 98
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2015-05-01 12:37+0200\n"
 "Last-Translator: JC Brand <jc@opkode.com>\n"
 "Language-Team: English\n"
@@ -31,229 +31,256 @@ msgstr ""
 msgid "Personal message"
 msgstr ""
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr ""
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Show this menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Write in the third person"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Remove messages"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr ""
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr ""
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr ""
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr ""
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Click here to log in anonymously"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Log In"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "Username"
 msgstr ""
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 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:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "I am %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Click here to write a custom status message"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Click to change your chat status"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Custom status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Save"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "busy"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "away for long"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "away"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr ""
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr ""
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr ""
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr ""
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr ""
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr ""
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr ""
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr ""
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr ""
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr ""
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr ""
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr ""
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr ""
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+msgid "Connection error"
+msgstr ""
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "An error occurred while trying to save the form."
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr ""
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+msgid "Authentication failed."
+msgstr ""
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr ""
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -364,7 +391,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr ""
 
@@ -521,148 +548,148 @@ msgstr "This room does not (yet) exist"
 msgid "This room has reached its maximum number of occupants"
 msgstr "This room has reached it's maximum number of occupants"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic set by %1$s to: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Click to open this room"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "This user is a moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "This user can send messages in this room"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "This user can NOT send messages in this room"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr ""
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr ""
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr ""
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr ""
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr ""
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Rooms on %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Click to open this room"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Show more information on this room"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Description:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Occupants:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Features:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Requires authentication"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Requires an invitation"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderated"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Non-anonymous"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Permanent room"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi-anonymous"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Temporary room"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Unmoderated"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -686,10 +713,6 @@ msgstr ""
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"

+ 15 - 7
locale/es/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "yo"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             ""
@@ -163,13 +167,21 @@
             null,
             "Chat"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Reconectando"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
+            null,
+            "Desconectado"
+         ],
+         "The connection to the chat server has dropped": [
             null,
-            "Error"
+            ""
          ],
          "Authenticating": [
             null,
@@ -507,10 +519,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Re-estableciendo sesión cifrada"

+ 127 - 108
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -40,238 +40,267 @@ msgstr "Haga click para eliminar este contacto"
 msgid "Personal message"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "yo"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contacto está ausente"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Mostrar este menú"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Escribir en tercera persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Eliminar mensajes"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contacto está desconectado"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensaje personal"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contactos"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Esta sala no es para usuarios anónimos"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "Nombre de usuario XMPP/Jabber"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Contraseña:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Registrar"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Estoy %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Haga click para escribir un mensaje de estatus personalizado"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Haga click para cambiar su estatus de chat"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Personalizar estatus"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Guardar"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "en línea"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "ausente por mucho tiempo"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "En línea"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "Iniciar sesión"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Búsqueda"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Agregar"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Haga click para agregar nuevos contactos al chat"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Agregar un contacto"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Sin usuarios encontrados"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Haga click para agregar como contacto de chat"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Chat"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Haga click para eliminar este contacto"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Reconectando"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Error"
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "La conexión falló"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Un error ocurrío mientras se guardaba el formulario."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "La autenticación falló"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "La autenticación falló"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -389,7 +418,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Apodo"
 
@@ -551,149 +580,149 @@ msgstr "Esta sala (aún) no existe"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Esta sala ha alcanzado su número máximo de ocupantes"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Tema fijado por %1$s a: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Este usuario es un moderador"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Este usuario puede enviar mensajes en esta sala"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Este usuario NO puede enviar mensajes en esta"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Ocupantes"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nombre de sala"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Servidor"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "Unirse"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Mostrar salas"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Sin salas en %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Salas en %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Haga click para abrir esta sala"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Mostrar más información en esta sala"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Descripción"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Características:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Autenticación requerida"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Oculto"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Requiere una invitación"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "No anónimo"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Abrir sala"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Pública"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi anónimo"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Sala temporal"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Sin moderar"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -718,10 +747,6 @@ msgstr "Este contacto está desconectado"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1069,19 +1094,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "¿Esta seguro de querer eliminar este contacto?"
 
+#~ msgid "Error"
+#~ msgstr "Error"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Su apodo ya ha sido tomando por otro usuario"
 
-#~ msgid "Disconnected"
-#~ msgstr "Desconectado"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostrar más información en esta sala"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Reconectando"
-
 #~ msgid "Contact username"
 #~ msgstr "Nombre de usuario de contacto"
 
@@ -1091,9 +1113,6 @@ msgstr "¿Esta seguro de querer eliminar este contacto?"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "El usuario ha solicitado una sesión cifrada"
 
-#~ msgid "Connection Failed"
-#~ msgstr "La conexión falló"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Desconectando"
 

+ 15 - 7
locale/fr/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "moi"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "écrit"
@@ -191,13 +195,21 @@
             null,
             "Cliquez pour cacher ces contacts"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Reconnexion"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
+            null,
+            "Déconnecté"
+         ],
+         "The connection to the chat server has dropped": [
             null,
-            "Erreur"
+            ""
          ],
          "Authenticating": [
             null,
@@ -559,10 +571,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Rétablissement de la session encryptée"

+ 127 - 108
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:22+0000\n"
 "Language-Team: FR <LL@li.org>\n"
 "Language: fr\n"
@@ -35,231 +35,260 @@ msgstr "Cliquez pour afficher cette discussion"
 msgid "Personal message"
 msgstr "Message personnel"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "moi"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "écrit"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "a arrêté d'écrire"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "est parti"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Afficher ce menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Écrire à la troisième personne"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Effacer les messages"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "s'est déconnecté"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "est occupé"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Supprimer tous les messages"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Cacher la liste des participants"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Démarrer un appel"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contacts"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Connexion"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "Nom d'utilisateur XMPP/Jabber"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Mot de passe:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Cliquez ici pour se connecter anonymement"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Se connecter"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "Nom d'utilisateur XMPP/Jabber"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Mot de passe:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 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:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Je suis %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Cliquez ici pour indiquer votre statut personnel"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Cliquez pour changer votre statut"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Statut personnel"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "en ligne"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "occupé"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "absent pour une longue durée"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "absent"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "En ligne"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Occupé"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Absent"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Cliquez pour ajouter de nouveaux contacts"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Ajouter un contact"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Cliquer pour ajouter aux contacts"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Ouvrir IM"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Cliquez pour cacher ces contacts"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Reconnexion"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Déconnecté"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Erreur"
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "La connection a échoué"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Une erreur est survenue lors de l'enregistrement du formulaire."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Authentification"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "L'authentification a échoué"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "L'authentification a échoué"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -374,7 +403,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Changer votre alias"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Alias"
 
@@ -532,43 +561,43 @@ msgstr "Ce salon n'existe pas encore"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ce salon a atteint la limite maximale d'occupants"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Le sujet '%2$s' a été défini par %1$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Cliquer pour ouvrir ce salon"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Cet utilisateur est modérateur"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Cet utilisateur peut envoyer des messages dans ce salon"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Participants:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Vous vous apprêtez à inviter %1$s dans le salon \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -576,106 +605,106 @@ msgstr ""
 "Vous pouvez facultativement ajouter un message, expliquant la raison de "
 "cette invitation."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nom du salon"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Serveur"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Rejoindre"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Afficher les salons"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Salons"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Aucun salon dans %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Salons dans %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Cliquer pour ouvrir ce salon"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Afficher davantage d'informations sur ce salon"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Description:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Participants:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Caractéristiques:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Nécessite une authentification"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Masqué"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Nécessite une invitation"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Modéré"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Non-anonyme"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Ouvrir un salon"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Salon permanent"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Public"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi-anonyme"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Salon temporaire"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Non modéré"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s vous invite à rejoindre le salon: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -701,10 +730,6 @@ msgstr "s'est déconnecté"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1049,12 +1074,12 @@ 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 "Error"
+#~ msgstr "Erreur"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Votre alias est déjà utilisé"
 
-#~ msgid "Disconnected"
-#~ msgstr "Déconnecté"
-
 #~ msgid "Type to filter"
 #~ msgstr "Filtrer"
 
@@ -1062,18 +1087,12 @@ msgstr "Êtes-vous sûr de vouloir refuser la demande de ce contact?"
 #~ msgid "View more information on this person"
 #~ msgstr "Afficher davantage d'informations sur ce salon"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Reconnexion"
-
 #~ msgid "Contact username"
 #~ msgstr "Nom du contact"
 
 #~ msgid "Online Contacts"
 #~ msgstr "Contacts en ligne"
 
-#~ msgid "Connection Failed"
-#~ msgstr "La connection a échoué"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Déconnection"
 

+ 18 - 6
locale/he/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "אני"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "מקליד(ה) כעת"
@@ -195,9 +199,21 @@
             null,
             "לחץ כדי להסתיר את אנשי קשר אלה"
          ],
-         "Error": [
+         "Reconnecting": [
+            null,
+            "כעת מתחבר"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
-            "שגיאה"
+            ""
+         ],
+         "Disconnected": [
+            null,
+            "מנותק"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -559,10 +575,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "בסס מחדש ישיבה מוצפנת"

+ 131 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -35,232 +35,260 @@ msgstr "לחץ כדי לשחזר את שיחה זו"
 msgid "Personal message"
 msgstr "הודעה אישית"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "אני"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "מקליד(ה) כעת"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "חדל(ה) להקליד"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "נעדר(ת)"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "הצג את תפריט זה"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "כתוב בגוף השלישי"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "הסר הודעות"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "כבר לא מקוון"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "עסוק(ה) כעת"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "טהר את כל ההודעות"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "הסתר רשימת משתתפים"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "הכנס סמיילי"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "התחל שיחה"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "כעת מתחבר"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "לחץ כאן כדי להתחבר באופן אנונימי"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "כניסה"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "שם משתמש XMPP:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "סיסמה"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "התחברות"
 
 # אני במצב
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "מצבי כעת הינו %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "לחץ כאן כדי לכתוב הודעת מצב מותאמת"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "לחץ כדי לשנות את הודעת השיחה שלך"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "מצב מותאם"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "שמור"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "נעדר לזמן מה"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "מקוון"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "עסוק"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "נעדר"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "לא מקוון"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "התנתקות"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "שם איש קשר"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "למשל user@example.com"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "הוסף"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "הוסף איש קשר"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "לא נמצאו משתמשים"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "לחץ כדי להוסיף בתור איש קשר שיחה"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "הפעל שיח"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "לחץ כדי להסתיר את אנשי קשר אלה"
 
-#: src/converse-core.js:404
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "כעת מתחבר"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "מנותק"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
 #, fuzzy
-msgid "Attempting to reconnect"
-msgstr "מנסה להתחבר בעוד 5 שניות"
+msgid "Connection error"
+msgstr "חיבור נכשל"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "שגיאה"
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "אירעה שגיאה במהלך ניסיון שמירת הטופס."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "כעת מאמת"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "אימות נכשל"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "אימות נכשל"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr "מצטערים, היתה שגיאה במהלך ניסיון הוספת "
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "לקוח זה לא מתיר הרשמות נוכחות"
 
@@ -376,7 +404,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "שנה את השם כינוי שלך"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "שם כינוי"
 
@@ -535,150 +563,150 @@ msgstr "חדר זה (עדיין) לא קיים"
 msgid "This room has reached its maximum number of occupants"
 msgstr "חדר זה הגיע לסף הנוכחים המרבי שלו"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "משתמש זה הינו אחראי"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "הזמנה"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "נוכחים"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "אתה עומד להזמין את %1$s לחדר שיחה \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "שם חדר"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "שרת"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "הצטרף לחדר"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "הצג חדרים"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "חדרים"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "אין חדרים על %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "חדרים על %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "לחץ כדי לפתוח את חדר זה"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "הצג עוד מידע אודות חדר זה"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "תיאור:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "נוכחים:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "תכונות:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "מצריך אישור"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "נסתר"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "מצריך הזמנה"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "מבוקר"
 
 # לא-עלום
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "לא-אנונימי"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "חדר פתוח"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "חדר צמיתה"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "פומבי"
 
 # עלום-למחצה
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "אנונימי-למחצה"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "חדר זמני"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "לא מבוקר"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s הזמינך להצטרף לחדר שיחה: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -703,10 +731,6 @@ msgstr "כבר לא מקוון"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1041,13 +1065,17 @@ msgstr "מצטערים, היתה שגיאה במהלך ניסיון להסיר 
 msgid "Are you sure you want to decline this contact request?"
 msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
 
+#, fuzzy
+#~ msgid "Attempting to reconnect"
+#~ msgstr "מנסה להתחבר בעוד 5 שניות"
+
+#~ msgid "Error"
+#~ msgstr "שגיאה"
+
 # נלקח כבר
 #~ msgid "Your nickname is already taken"
 #~ msgstr "השם כינוי שלך הינו תפוס"
 
-#~ msgid "Disconnected"
-#~ msgstr "מנותק"
-
 #~ msgid "Type to filter"
 #~ msgstr "הקלד כדי לסנן"
 
@@ -1055,9 +1083,6 @@ msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש 
 #~ msgid "View more information on this person"
 #~ msgstr "הצג עוד מידע אודות חדר זה"
 
-#~ msgid "Reconnecting"
-#~ msgstr "כעת מתחבר"
-
 #~ msgid "Contact username"
 #~ msgstr "שם משתמש איש קשר"
 
@@ -1067,9 +1092,6 @@ msgstr "האם אתה בטוח כי ברצונך לסרב את בקשת איש 
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "משתמש זה ביקש ישיבה מוצפנת."
 
-#~ msgid "Connection Failed"
-#~ msgstr "חיבור נכשל"
-
 #~ msgid "Disconnecting"
 #~ msgstr "כעת מתנתק"
 

+ 18 - 6
locale/hu/LC_MESSAGES/converse.json

@@ -18,6 +18,10 @@
             null,
             "Én"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "gépel..."
@@ -202,9 +206,21 @@
             null,
             "A csevegő partnerek elrejtése"
          ],
-         "Error": [
+         "Reconnecting": [
+            null,
+            "Kapcsolódás"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
-            "Hiba"
+            ""
+         ],
+         "Disconnected": [
+            null,
+            "Szétkapcsolva"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -570,10 +586,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Titkosított kapcsolat újraépítése"

+ 131 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -34,230 +34,258 @@ msgstr "A csevegés bezárása"
 msgid "Personal message"
 msgstr "Személyes üzenet"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "Én"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "gépel..."
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "már nem gépel"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "távol van"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Mutasd a menüt"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Írjon egyes szám harmadik személyben"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "kijelentkezett"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "elfoglalt"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Üzenetek törlése"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr "A résztvevők listájának elrejtése"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "Hangulatjel beszúrása"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Hívás indítása"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Kapcsolatok"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Kattintson ide a névtelen bejelentkezéshez"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Belépés"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber azonosító:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "felhasznalo@szerver"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "jelszó"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 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:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "%1$s vagyok"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Egyedi státusz üzenet írása"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Saját státusz beállítása"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Egyedi státusz"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Ment"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "elérhető"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "elfoglalt"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "hosszú ideje távol"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "távol"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "nem elérhető"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Foglalt"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Távol"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Kilépés"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Partner neve"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Keresés"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "pl. felhasznalo@pelda.hu"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Hozzáad"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Új csevegőpartner hozzáadása"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Új partner felvétele"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Nincs felhasználó"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Felvétel a csevegőpartnerek közé"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Csevegőablak"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "A csevegő partnerek elrejtése"
 
-#: src/converse-core.js:404
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Kapcsolódás"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Szétkapcsolva"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
 #, fuzzy
-msgid "Attempting to reconnect"
-msgstr "Újrakapcsolódás 5 másodperc múlva"
+msgid "Connection error"
+msgstr "Kapcsolódási hiba"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Hiba"
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Hiba történt az adatok mentése közben."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Azonosítás"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Azonosítási hiba"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Azonosítási hiba"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 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:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Ez a kliens nem engedélyezi a jelenlét követését"
 
@@ -371,7 +399,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Becenév módosítása"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Becenév"
 
@@ -529,148 +557,148 @@ msgstr "Ez a szoba (még) nem létezik"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ez a csevegőszoba elérte a maximális jelenlévők számát"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "A következő témát állította be %1$s: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Ez a felhasználó egy moderátor"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Ez a felhasználó küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Meghívás"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Jelenlevők"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "%1$s meghívott a(z) \"%2$s\" csevegőszobába. "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr "Megadhat egy üzenet a meghívás okaként."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Szoba neve"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Szerver"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Csatlakozás"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Létező szobák"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Szobák"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Nincs csevegőszoba a(z) %1$s szerveren"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Csevegőszobák a(z) %1$s szerveren:"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Belépés a csevegőszobába"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "További információk a csevegőszobáról"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Leírás:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Jelenlevők:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Tulajdonságok:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Azonosítás szükséges"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Meghívás szükséges"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderált"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "NEM névtelen"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Nyitott szoba"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Állandó szoba"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Nyílvános"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Félig névtelen"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Ideiglenes szoba"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Moderálatlan"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s meghívott a(z) %2$s csevegőszobába"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -695,10 +723,6 @@ msgstr "kijelentkezett"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1037,21 +1061,22 @@ 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?"
 
+#, fuzzy
+#~ msgid "Attempting to reconnect"
+#~ msgstr "Újrakapcsolódás 5 másodperc múlva"
+
+#~ msgid "Error"
+#~ msgstr "Hiba"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "A becenevedet már valaki használja"
 
-#~ msgid "Disconnected"
-#~ msgstr "Szétkapcsolva"
-
 #~ msgid "Type to filter"
 #~ msgstr "Írjon be pár betűt"
 
 #~ msgid "View more information on this person"
 #~ msgstr "További információk erről a személyről"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Kapcsolódás"
-
 #~ msgid "Contact username"
 #~ msgstr "Felhasználónév"
 
@@ -1061,9 +1086,6 @@ msgstr "Valóban elutasítja ezt a partnerkérelmet?"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "Felkérés érkezett titkosított kapcsolatra."
 
-#~ msgid "Connection Failed"
-#~ msgstr "Kapcsolódási hiba"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Szétkapcsolás"
 

+ 11 - 7
locale/id/LC_MESSAGES/converse.json

@@ -14,6 +14,10 @@
             null,
             "saya"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             ""
@@ -162,13 +166,17 @@
             null,
             ""
          ],
-         "Attempting to reconnect": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "Kesalahan"
+            "Terputus"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -498,10 +506,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Menyambung kembali sesi terenkripsi"

+ 128 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -32,238 +32,268 @@ msgstr "Klik untuk menghapus teman ini"
 msgid "Personal message"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "saya"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Teman ini tidak di tempat"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Tampilkan menu ini"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Tulis ini menggunakan bahasa pihak ketiga"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Hapus pesan"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Teman ini tidak terhubung"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "sibuk"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Pesan pribadi"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Teman"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Menyambung"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ruangan ini tidak anonim"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "Nama pengguna XMPP/Jabber:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Kata sandi:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Masuk"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Saya %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Klik untuk menulis status kustom"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Klik untuk mengganti status"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Status kustom"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Simpan"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "terhubung"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "sibuk"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "lama tak di tempat"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "tak di tempat"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Terhubung"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Sibuk"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Pergi"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Tak Terhubung"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "Masuk"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nama teman"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Cari"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Tambah"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Klik untuk menambahkan teman baru"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Tambah teman"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Pengguna tak ditemukan"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Klik untuk menambahkan sebagai teman"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik untuk menghapus teman ini"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+#, fuzzy
+msgid "Reconnecting"
+msgstr "Menyambung"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Kesalahan"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Terputus"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Gagal Menyambung"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Kesalahan terjadi saat menyimpan formulir ini."
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Melakukan otentikasi"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Otentikasi gagal"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Otentikasi gagal"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -382,7 +412,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Nama panggilan"
 
@@ -541,150 +571,150 @@ msgstr "Ruangan ini belum dibuat"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ruangan ini telah mencapai jumlah penghuni maksimum"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topik diganti oleh %1$s menjadi: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Pengguna ini adalah moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Pengguna ini dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Pengguna ini tak dapat mengirim pesan di ruangan ini"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 #, fuzzy
 msgid "Occupants"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nama ruangan"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "Ikuti"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Perlihatkan ruangan"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Ruangan"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Tak ada ruangan di %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Ruangan di %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Klik untuk membuka ruangan ini"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Tampilkan informasi ruangan ini"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Penghuni:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Fitur:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Membutuhkan otentikasi"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Membutuhkan undangan"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Dimoderasi"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Tidak anonim"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Ruangan terbuka"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Ruangan permanen"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Umum"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi-anonim"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Ruangan sementara"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Tak dimoderasi"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -709,10 +739,6 @@ msgstr "Teman ini tidak terhubung"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1066,20 +1092,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik untuk menghapus teman ini"
 
+#~ msgid "Error"
+#~ msgstr "Kesalahan"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Nama panggilan anda telah digunakan orang lain"
 
-#~ msgid "Disconnected"
-#~ msgstr "Terputus"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Tampilkan informasi ruangan ini"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "Menyambung"
-
 #~ msgid "Contact username"
 #~ msgstr "Username teman"
 
@@ -1089,9 +1111,6 @@ msgstr "Klik untuk menghapus teman ini"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "Pengguna ini meminta sesi terenkripsi"
 
-#~ msgid "Connection Failed"
-#~ msgstr "Gagal Menyambung"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Memutuskan hubungan"
 

+ 14 - 6
locale/it/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "me"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "sta scrivendo"
@@ -199,9 +203,17 @@
             null,
             "Clicca per nascondere questi contatti"
          ],
-         "Error": [
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
-            "Errore"
+            "Disconnesso"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -567,10 +579,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             ""

+ 132 - 110
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Fabio Bas <ctrlaltca@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -36,230 +36,259 @@ msgstr "Clicca per ripristinare questa chat"
 msgid "Personal message"
 msgstr "Messaggio personale"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "me"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "sta scrivendo"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "ha smesso di scrivere"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr ""
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Mostra questo menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Scrivi in terza persona"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Rimuovi messaggi"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr ""
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "è occupato"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Pulisci tutti i messaggi"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contatti"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Password:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Clicca per entrare anonimo"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Entra"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "Password"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Accesso"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Sono %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Clicca qui per scrivere un messaggio di stato personalizzato"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Clicca per cambiare il tuo stato"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Stato personalizzato"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Salva"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "in linea"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "occupato"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "assente da molto"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "assente"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "offline"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "In linea"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Occupato"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Assente"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Non in linea"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Logo out"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nome del contatto"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Cerca"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "es. user@example.com"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Clicca per aggiungere nuovi contatti alla chat"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Aggiungi contatti"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Nessun utente trovato"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Clicca per aggiungere il contatto alla chat"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Attiva/disattiva chat"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Clicca per nascondere questi contatti"
 
-#: src/converse-core.js:404
+#: src/converse-core.js:413
 #, fuzzy
-msgid "Attempting to reconnect"
-msgstr "Attendi riconversione in 5 secondi"
+msgid "Reconnecting"
+msgstr "Connessione in corso"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Errore"
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Disconnesso"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Connessione fallita"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Errore durante il salvataggio del modulo"
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Autenticazione in corso"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autenticazione fallita"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Autenticazione fallita"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr "Si è verificato un errore durante il tentativo di aggiunta"
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Questo client non consente sottoscrizioni di presenza"
 
@@ -373,7 +402,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Soprannome"
 
@@ -533,148 +562,148 @@ msgstr "Questa stanza non esiste (per ora)"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Questa stanza ha raggiunto il limite massimo di utenti"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topic impostato da %1$s a: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Clicca per aprire questa stanza"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Questo utente è un moderatore"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Questo utente può inviare messaggi in questa stanza"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Questo utente NON può inviare messaggi in questa stanza"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Invita"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Occupanti"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nome stanza"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Entra nella Stanza"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Mostra stanze"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Stanze"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Nessuna stanza su %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Stanze su %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Clicca per aprire questa stanza"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Mostra più informazioni su questa stanza"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Utenti presenti:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Funzionalità:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Richiede autenticazione"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Richiede un invito"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderata"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Non-anonima"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Stanza aperta"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Stanza permanente"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Pubblica"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi-anonima"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Stanza temporanea"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Non moderata"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s ti ha invitato a partecipare a una chat room: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -701,10 +730,6 @@ msgstr "Questo contatto è online"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1023,29 +1048,26 @@ 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?"
 
+#, fuzzy
+#~ msgid "Attempting to reconnect"
+#~ msgstr "Attendi riconversione in 5 secondi"
+
+#~ msgid "Error"
+#~ msgstr "Errore"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Il tuo soprannome è già utilizzato"
 
-#~ msgid "Disconnected"
-#~ msgstr "Disconnesso"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostra più informazioni su questa stanza"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "Connessione in corso"
-
 #~ msgid "Contact username"
 #~ msgstr "Nome utente del contatto"
 
 #~ msgid "Online Contacts"
 #~ msgstr "Contatti in linea"
 
-#~ msgid "Connection Failed"
-#~ msgstr "Connessione fallita"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Disconnessione in corso"
 

+ 11 - 7
locale/ja/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "私"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             ""
@@ -163,13 +167,17 @@
             null,
             ""
          ],
-         "Attempting to reconnect": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "エラー"
+            "切断中"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -499,10 +507,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "暗号化セッションの再接続"

+ 128 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -32,238 +32,268 @@ msgstr "クリックしてこの相手先を削除"
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "私"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "この相手先は離席中です"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "このメニューを表示"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "第三者に書く"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "メッセージを削除"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "この相手先はオフラインです"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "取り込み中"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "相手先"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "接続中です"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "この談話室は非匿名です"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber ユーザー名:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "パスワード:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "サインイン"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "私はいま %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "状況メッセージを入力するには、ここをクリック"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "クリックして、在席状況を変更"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "独自の在席状況"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "在席"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "不在"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "オンライン"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "取り込み中"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "離席中"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "ログイン"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "名前"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "検索"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "追加"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "クリックして新しいチャットの相手先を追加"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "相手先を追加"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "ユーザーが見つかりません"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "クリックしてチャットの相手先として追加"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "クリックしてこの相手先を削除"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+#, fuzzy
+msgid "Reconnecting"
+msgstr "接続中です"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "エラー"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "切断中"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "接続に失敗しました"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "フォームを保存する際にエラーが発生しました。"
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "認証中"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "認証に失敗"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "認証に失敗"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -382,7 +412,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "ニックネーム"
 
@@ -540,150 +570,150 @@ msgstr "この談話室は存在しません"
 msgid "This room has reached its maximum number of occupants"
 msgstr "この談話室は入室者数の上限に達しています"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s が話題を設定しました: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "このユーザーは司会者です"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "このユーザーはこの談話室で発言できます"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "このユーザーはこの談話室で発言できません"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 #, fuzzy
 msgid "Occupants"
 msgstr "入室者:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "談話室の名前"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "サーバー"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "入室"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "談話室一覧を見る"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "談話室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "%1$s に談話室はありません"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "%1$s の談話室一覧"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "クリックしてこの談話室を開く"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "この談話室についての詳細を見る"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "説明: "
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "入室者:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "特徴:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "認証の要求"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "非表示"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "招待の要求"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "発言制限"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "開放談話室"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "常設談話室"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "公開談話室"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "臨時談話室"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "発言制限なし"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -708,10 +738,6 @@ msgstr "この相手先はオフラインです"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1057,20 +1083,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "クリックしてこの相手先を削除"
 
+#~ msgid "Error"
+#~ msgstr "エラー"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "ニックネームは既に使われています"
 
-#~ msgid "Disconnected"
-#~ msgstr "切断中"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "この談話室についての詳細を見る"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "接続中です"
-
 #~ msgid "Contact username"
 #~ msgstr "相手先の名前"
 
@@ -1080,9 +1102,6 @@ msgstr "クリックしてこの相手先を削除"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "このユーザーは暗号化セッションを求めています。"
 
-#~ msgid "Connection Failed"
-#~ msgstr "接続に失敗しました"
-
 #~ msgid "Disconnecting"
 #~ msgstr "切断"
 

+ 15 - 7
locale/nb/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "meg"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "skriver"
@@ -175,13 +179,21 @@
             null,
             "Klikk for å skjule disse kontaktene"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Kobler til igjen"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
             ""
          ],
-         "Error": [
+         "The connection to the chat server has dropped": [
             null,
-            "Feil"
+            ""
          ],
          "Authenticating": [
             null,
@@ -535,10 +547,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Gjenopptar kryptert økt"

+ 127 - 102
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:23+0000\n"
 "Last-Translator: Andreas Lorentsen <andreas.lorentsen@gmail.com>\n"
 "Language-Team: \n"
@@ -33,235 +33,264 @@ msgstr "Klikk for å gjenopprette denne samtalen"
 msgid "Personal message"
 msgstr "Personlig melding"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "meg"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "skriver"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "har stoppet å skrive"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Kontakten er borte"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Viser denne menyen"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Skriv i tredjeperson"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Fjern meldinger"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Kontakten er avlogget"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "opptatt"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Fjern alle meldinger"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Skjul deltakerlisten"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Start en samtale"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Dette rommet er ikke anonymt"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Logg inn"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Brukernavn:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Passord:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Innlogging"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Jeg er %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Klikk her for å skrive en personlig statusmelding"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Klikk for å endre din meldingsstatus"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Personlig status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Lagre"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "pålogget"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "opptatt"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "borte lenge"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "borte"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Pålogget"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Opptatt"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Borte"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Avlogget"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Logg Av"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Kontaktnavn"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Søk"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Legg Til"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Klikk for å legge til nye meldingskontakter"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Legg til en Kontakt"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Ingen brukere funnet"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Klikk for å legge til som meldingskontakt"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Endre chatten"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Klikk for å skjule disse kontaktene"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Kobler til igjen"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr ""
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Feil"
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Kobler til"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "En feil skjedde under lagring av skjemaet."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Godkjenner"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Godkjenning mislyktes"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Godkjenning mislyktes"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -377,7 +406,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Endre ditt kallenavn"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Kallenavn"
 
@@ -536,150 +565,150 @@ msgstr "Dette rommet eksisterer ikke (enda)"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Dette rommet har nådd maksimalt antall brukere"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Emnet ble endret den %1$s til: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Denne brukeren er moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Denne brukeren kan skrive meldinger i dette rommet"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Denne brukeren kan IKKE sende meldinger i dette rommet"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Invitér"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Du er i ferd med å invitere %1$s til samtalerommet \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Romnavn"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "Koble til"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Vis Rom"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Rom"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Ingen rom på %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Rom på %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Klikk for å åpne dette rommet"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Vis mer informasjon om dette rommet"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Brukere her:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Egenskaper:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Krever Godkjenning"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Skjult"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Krever en invitasjon"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderert"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Ikke-Anonym"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Åpent Rom"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Permanent Rom"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Alle"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi-anonymt"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Midlertidig Rom"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Umoderert"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s har invitert deg til å bli med i chatterommet: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -706,10 +735,6 @@ msgstr "Kontakten er avlogget"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1054,6 +1079,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 
+#~ msgid "Error"
+#~ msgstr "Feil"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Kallenavnet er allerede tatt"
 
@@ -1064,9 +1092,6 @@ msgstr "Er du sikker på at du vil avslå denne kontaktforespørselen?"
 #~ msgid "View more information on this person"
 #~ msgstr "Vis mer informasjon om dette rommet"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Kobler til igjen"
-
 #~ msgid "Contact username"
 #~ msgstr "Brukernavnet til Kontakt"
 

+ 11 - 7
locale/nl/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "ikzelf"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "Show this menu": [
             null,
             "Toon dit menu"
@@ -155,13 +159,17 @@
             null,
             ""
          ],
-         "Attempting to reconnect": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "Error"
+            "Verbinding verbroken."
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -491,10 +499,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Bezig versleutelde sessie te herstellen"

+ 128 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-04-07 10:21+0000\n"
 "Last-Translator: Maarten Kling <maarten@fourdigits.nl>\n"
 "Language-Team: Dutch\n"
@@ -35,240 +35,270 @@ msgstr "Klik om contact te verwijderen"
 msgid "Personal message"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "ikzelf"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s is aan typen"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Conact is afwezig"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Toon dit menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Schrijf in de 3de persoon"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Verwijder bericht"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr ""
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Contact is offline"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "bezet"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Persoonlijk bericht"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contacten"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Verbinden"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Deze room is niet annoniem"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber Username:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Aanmelden"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Ik ben %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Klik hier om custom status bericht te maken"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Klik hier om status te wijzigen"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr ""
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "bezet"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "afwezig lange tijd"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "afwezig"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "online"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Bezet"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Afwezig"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr ""
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "Aanmelden"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Contact naam"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Klik om nieuwe contacten toe te voegen"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Voeg contact toe"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Geen gebruikers gevonden"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Klik om contact toe te voegen"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr ""
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Klik om contact te verwijderen"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+#, fuzzy
+msgid "Reconnecting"
+msgstr "Verbinden"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Error"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Verbinding verbroken."
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Verbinden mislukt"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Een error tijdens het opslaan van het formulier."
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Authenticeren"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Authenticeren mislukt"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Authenticeren mislukt"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -387,7 +417,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -542,150 +572,150 @@ msgstr "Deze room bestaat niet"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Deze room heeft het maximale aantal gebruikers"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Dit is een moderator"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Deze gebruiker kan berichten sturen in deze room"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Deze gebruiker kan NIET een bericht sturen in deze room"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 #, fuzzy
 msgid "Occupants"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Room naam"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "Deelnemen"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Toon rooms"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Rooms"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Geen room op %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Room op %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Klik om room te openen"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Toon meer informatie over deze room"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Beschrijving"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Deelnemers:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Functies:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Verificatie vereist"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Veriest een uitnodiging"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Gemodereerd"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Niet annoniem"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Open room"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Blijvend room"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Publiek"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi annoniem"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Tijdelijke room"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Niet gemodereerd"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -710,10 +740,6 @@ msgstr "Contact is offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1038,20 +1064,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Klik om contact te verwijderen"
 
+#~ msgid "Error"
+#~ msgstr "Error"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Je nickname bestaat al"
 
-#~ msgid "Disconnected"
-#~ msgstr "Verbinding verbroken."
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Toon meer informatie over deze room"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "Verbinden"
-
 #~ msgid "Contact username"
 #~ msgstr "Contact gebruikernaam"
 
@@ -1061,9 +1083,6 @@ msgstr "Klik om contact te verwijderen"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "Deze gebruiker heeft een encrypted sessie aangevraagd."
 
-#~ msgid "Connection Failed"
-#~ msgstr "Verbinden mislukt"
-
 #, fuzzy
 #~ msgid "Decline"
 #~ msgstr "Online"

+ 16 - 8
locale/pl/LC_MESSAGES/converse.json

@@ -23,6 +23,10 @@
             null,
             "ja"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "pisze"
@@ -215,13 +219,21 @@
             null,
             "Kliknij aby schować te kontakty"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Przywracam połączenie"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
             null,
-            "Staram się połączyć ponownie"
+            ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "Błąd"
+            ""
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -631,10 +643,6 @@
             null,
             "chce być twoim kontaktem"
          ],
-         "An error has occured": [
-            null,
-            "Wystąpił błąd"
-         ],
          "Re-establishing encrypted session": [
             null,
             "Przywacam sesję szyfrowaną"

+ 134 - 103
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+0000\n"
 "PO-Revision-Date: 2016-08-01 10:22+0000\n"
 "Last-Translator: Serge Victor <converse.js@random.re>\n"
 "Language-Team: Polish\n"
@@ -32,228 +32,257 @@ msgstr "Zamknij okno rozmowy"
 msgid "Personal message"
 msgstr "Wiadomość osobista"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "ja"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "pisze"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "przestał pisać"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "uciekł"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Pokaż menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Pisz w trzeciej osobie"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Usuń wiadomości"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "wyłączył się"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "zajęty"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Wyczyść wszystkie wiadomości"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr "Ukryj listę rozmówców"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "Wstaw uśmieszek"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Zadzwoń"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "Nazwa użytkownika XMPP:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Hasło:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Kliknij tutaj aby zalogować się anonimowo"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Zaloguj się"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "użytkownik@serwer"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "hasło"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Zaloguj się"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Jestem %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Kliknij aby wpisać nowy status"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Kliknij aby zmienić status rozmowy"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Własny status"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Zachowaj"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "dostępny"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "zajęty"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "dłużej nieobecny"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "nieobecny"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 msgid "offline"
 msgstr "rozłączony"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Dostępny"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Zajęty"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Nieobecny"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Wyloguj się"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr "np. użytkownik@przykładowa-domena.pl"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Kliknij aby dodać nowe kontakty"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Dodaj kontakt"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Nie znaleziono użytkowników"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Kliknij aby dodać jako kontakt"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Przełącz rozmowę"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Kliknij aby schować te kontakty"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
-msgstr "Staram się połączyć ponownie"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Przywracam połączenie"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr ""
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Łączę się"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Błąd"
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Wystąpił błąd w czasie próby zachowania formularza."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Autoryzuję"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Autoryzacja nie powiodła się"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Autoryzacja nie powiodła się"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr "Wystąpił błąd w czasie próby dodania "
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Klient nie umożliwia subskrybcji obecności"
 
@@ -365,7 +394,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Wybierz proszę ksywkę"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Ksywka"
 
@@ -520,39 +549,39 @@ msgstr "Ten pokój (jeszcze) nie istnieje"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Pokój przekroczył dozwoloną ilość rozmówców"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Temat ustawiony przez %1$s na: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 msgid "Click to mention this user in your message."
 msgstr "Kliknij aby wspomnieć człowieka w wiadomości."
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 msgid "This user is a moderator."
 msgstr "Ten człowiek jest moderatorem"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 msgid "This user can send messages in this room."
 msgstr "Ten człowiek może rozmawiać w niejszym pokoju"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 msgid "This user can NOT send messages in this room."
 msgstr "Ten człowiek NIE może rozmawiać w niniejszym pokoju"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Zaproś"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Uczestników"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Zamierzasz zaprosić %1$s do pokoju rozmów \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
@@ -560,106 +589,106 @@ msgstr ""
 "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę "
 "zaproszenia."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nazwa pokoju"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Serwer"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Wejdź do pokoju"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Pokaż pokoje"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Pokoje"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Brak jest pokojów na %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Pokoje na %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Kliknij aby wejść do pokoju"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Pokaż więcej informacji o pokoju"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Opis:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Uczestnicy:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Możliwości:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Wymaga autoryzacji"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Wymaga zaproszenia"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderowany"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Nieanonimowy"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Otwarty pokój"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Stały pokój"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Publiczny"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Półanonimowy"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Pokój tymczasowy"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Niemoderowany"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s zaprosił(a) cię do wejścia do pokoju rozmów %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -683,10 +712,6 @@ msgstr "połączył się"
 msgid "wants to be your contact"
 msgstr "chce być twoim kontaktem"
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr "Wystąpił błąd"
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1029,6 +1054,15 @@ msgstr "Wystąpił błąd w trakcie próby usunięcia "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 
+#~ msgid "Attempting to reconnect"
+#~ msgstr "Staram się połączyć ponownie"
+
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
+#~ msgid "An error has occured"
+#~ msgstr "Wystąpił błąd"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Twoja ksywka jest już w użyciu"
 
@@ -1039,9 +1073,6 @@ msgstr "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
 #~ msgid "View more information on this person"
 #~ msgstr "Pokaż więcej informacji o pokoju"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Przywracam połączenie"
-
 #~ msgid "Contact username"
 #~ msgstr "Ksywka kontaktu"
 

+ 11 - 7
locale/pt_BR/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "eu"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "Show this menu": [
             null,
             "Mostrar o menu"
@@ -155,13 +159,17 @@
             null,
             "Alternar bate-papo"
          ],
-         "Attempting to reconnect": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "Erro"
+            "Desconectado"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -487,10 +495,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Reestabelecendo sessão criptografada"

+ 128 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -35,240 +35,270 @@ msgstr "Clique para remover o contato"
 msgid "Personal message"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "eu"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 #, fuzzy
 msgid "is typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 #, fuzzy
 msgid "has stopped typing"
 msgstr "%1$s está digitando"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "Este contato está ausente"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Mostrar o menu"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Escrever em terceira pessoa"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Remover mensagens"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 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:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "Este contato está offline"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "ocupado"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "Mensagem pessoal"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Contatos"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Conectando"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Essa sala não é anônima"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "Usuário XMPP/Jabber:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 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:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Estou %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Clique aqui para customizar a mensagem de status"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Clique para mudar seu status no chat"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Status customizado"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Salvar"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "online"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "ocupado"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "ausente a bastante tempo"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "ausente"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "Online"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Ocupado"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Ausente"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Offline"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "Entrar"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Procurar"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Clique para adicionar novos contatos ao chat"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Adicionar contato"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Não foram encontrados usuários"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Clique para adicionar como um contato do chat"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Alternar bate-papo"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "Clique para remover o contato"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+#, fuzzy
+msgid "Reconnecting"
+msgstr "Conectando"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Erro"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Falha de conexão"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Ocorreu um erro enquanto tentava salvar o formulário"
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Falha de autenticação"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Falha de autenticação"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -388,7 +418,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Apelido"
 
@@ -547,150 +577,150 @@ msgstr "A sala não existe (ainda)"
 msgid "This room has reached its maximum number of occupants"
 msgstr "A sala atingiu o número máximo de ocupantes"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Topico definido por %1$s para: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Esse usuário é o moderador"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Esse usuário pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Esse usuário NÃO pode enviar mensagens nessa sala"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 #, fuzzy
 msgid "Occupants"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Nome da sala"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Server"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "Entrar"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Mostar salas"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Salas"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Sem salas em %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Salas em %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "CLique para abrir a sala"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Mostrar mais informações nessa sala"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Descrição:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Ocupantes:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Recursos:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Requer autenticação"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Escondido"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Requer um convite"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Moderado"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Não anônimo"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Sala aberta"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Sala permanente"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Público"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Semi anônimo"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Sala temporária"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Sem moderação"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -715,10 +745,6 @@ msgstr "Este contato está offline"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1071,20 +1097,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Clique para remover o contato"
 
+#~ msgid "Error"
+#~ msgstr "Erro"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Seu apelido já foi escolhido"
 
-#~ msgid "Disconnected"
-#~ msgstr "Desconectado"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "Mostrar mais informações nessa sala"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "Conectando"
-
 #~ msgid "Contact username"
 #~ msgstr "Usuário do contatt"
 
@@ -1094,9 +1116,6 @@ msgstr "Clique para remover o contato"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "Usuário pediu uma sessão criptografada."
 
-#~ msgid "Connection Failed"
-#~ msgstr "Falha de conexão"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Desconectando"
 

+ 14 - 6
locale/ru/LC_MESSAGES/converse.json

@@ -18,6 +18,10 @@
             null,
             "Я"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "набирает текст"
@@ -198,9 +202,17 @@
             null,
             "Кликните, чтобы спрятать эти контакты"
          ],
-         "Error": [
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
-            "Ошибка"
+            "Отключено"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -550,10 +562,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Восстанавливается зашифрованная сессия"

+ 132 - 110
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -31,231 +31,260 @@ msgstr "Закрыть это окно чата"
 msgid "Personal message"
 msgstr "Ваше сообщение"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "Я"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "набирает текст"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "перестал набирать"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "отошёл"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Показать это меню"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Вписать третьего человека"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Удалить сообщения"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Вы уверены, что хотите очистить сообщения из окна чата?"
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "вышел из сети"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "занят"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Очистить все сообщения"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr "Спрятать список участников"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr "Вставить смайлик"
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Инициировать звонок"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Контакты"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Соединение"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 msgid "Click here to log in anonymously"
 msgstr "Нажмите здесь, чтобы войти анонимно"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Войти"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP Username:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr "user@server"
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 msgid "password"
 msgstr "пароль"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Вход"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Редактировать произвольный статус"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Изменить ваш статус"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Произвольный статус"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "на связи"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "занят"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "отошёл надолго"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "отошёл"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "В сети"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Занят"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Отошёл"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Выйти"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Поиск"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 #, fuzzy
 msgid "e.g. user@example.org"
 msgstr "например, user@example.com"
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Добавить"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Добавить новый чат"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Добавть контакт"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Пользователи не найдены"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Кликните, чтобы добавить контакт"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Включить чат"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Кликните, чтобы спрятать эти контакты"
 
-#: src/converse-core.js:404
+#: src/converse-core.js:413
 #, fuzzy
-msgid "Attempting to reconnect"
-msgstr "Попытка восстановить соединение через 5 секунд"
+msgid "Reconnecting"
+msgstr "Соединение"
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Ошибка"
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "Отключено"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
+
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Не удалось соединится"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "При сохранение формы произошла ошибка."
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Авторизация"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Не удалось авторизоваться"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Не удалось авторизоваться"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr "Возникла ошибка при добавлении "
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr "Программа не поддерживает уведомления о статусе"
 
@@ -371,7 +400,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Изменить свой псевдоним"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Псевдоним"
 
@@ -526,149 +555,149 @@ msgstr "Этот чат не существует"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Чат достиг максимального количества участников"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема %2$s устатновлена %1$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Модератор"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Собеседник"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Пользователь не может посылать сообщения в этот чат"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Пригласить"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Участники:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Вы собираетесь пригласить %1$s в чат \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Вы можете дополнительно вставить сообщение, объясняющее причину приглашения."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Имя чата"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Присоединться к чату"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Показать чаты"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Чаты"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Нет чатов %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Чаты %1$s:"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Зайти в чат"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Показать больше информации об этом чате"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Описание:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Участники:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Свойства:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Требуется авторизация"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Скрыто"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Требуется приглашение"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Модерируемая"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Не анонимная"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Открыть чат"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Постоянный чат"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Публичный"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Частично анонимный"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Временный чат"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Немодерируемый"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s пригласил вас в чат: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -693,10 +722,6 @@ msgstr "вышел из сети"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1042,31 +1067,28 @@ msgstr "Возникла ошибка при удалении "
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Вы уверены, что хотите отклонить запрос от этого контакта?"
 
+#, fuzzy
+#~ msgid "Attempting to reconnect"
+#~ msgstr "Попытка восстановить соединение через 5 секунд"
+
+#~ msgid "Error"
+#~ msgstr "Ошибка"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Этот псевдоним уже занят другим пользователем"
 
-#~ msgid "Disconnected"
-#~ msgstr "Отключено"
-
 #~ msgid "Type to filter"
 #~ msgstr "Текст для фильтра"
 
 #~ msgid "View more information on this person"
 #~ msgstr "Просмотреть больше информации об этом человеке."
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "Соединение"
-
 #~ msgid "Contact username"
 #~ msgstr "Имя пользователя"
 
 #~ msgid "Online Contacts"
 #~ msgstr "Cписок собеседников"
 
-#~ msgid "Connection Failed"
-#~ msgstr "Не удалось соединится"
-
 #~ msgid "Disconnecting"
 #~ msgstr "Отключаемся"
 

+ 15 - 7
locale/uk/LC_MESSAGES/converse.json

@@ -15,6 +15,10 @@
             null,
             "я"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             "друкує"
@@ -187,13 +191,21 @@
             null,
             "Клацніть, щоб приховати ці контакти"
          ],
-         "Attempting to reconnect": [
+         "Reconnecting": [
+            null,
+            "Перепід'єднуюсь"
+         ],
+         "The connection has dropped, attempting to reconnect.": [
+            null,
+            ""
+         ],
+         "Disconnected": [
             null,
             ""
          ],
-         "Error": [
+         "The connection to the chat server has dropped": [
             null,
-            "Помилка"
+            ""
          ],
          "Authenticating": [
             null,
@@ -555,10 +567,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "Перевстановлюю криптований сеанс"

+ 127 - 102
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -35,232 +35,261 @@ msgstr "Клацніть, щоб відновити цей чат"
 msgid "Personal message"
 msgstr "Персональна вісточка"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "я"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr "друкує"
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr "припинив друкувати"
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 msgid "has gone away"
 msgstr "пішов геть"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "Показати це меню"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "Писати від третьої особи"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "Видалити повідомлення"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 msgid "has gone offline"
 msgstr "тепер поза мережею"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 msgid "is busy"
 msgstr "зайнятий"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 msgid "Clear all messages"
 msgstr "Очистити всі повідомлення"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 #, fuzzy
 msgid "Hide the list of occupants"
 msgstr "Сховати список учасників"
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr "Почати виклик"
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "Контакти"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "Під'єднуюсь"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 msgid "XMPP Username:"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "Ця кімната не є анонімною"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "Ввійти"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP адреса:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "Пароль:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "Вступити"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "Я %1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "Клацніть тут, щоб створити власний статус"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "Клацніть, щоб змінити статус в чаті"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "Власний статус"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "на зв'язку"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "зайнятий"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "давно відсутній"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "відсутній"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "На зв'язку"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "Далеко"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 msgid "Log out"
 msgstr "Вийти"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "Назва контакту"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "Пошук"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "Додати"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "Клацніть, щоб додати нові контакти до чату"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "Додати контакт"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "Жодного користувача не знайдено"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "Клацніть, щоб додати як чат-контакт"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "Включити чат"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 msgid "Click to hide these contacts"
 msgstr "Клацніть, щоб приховати ці контакти"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+msgid "Reconnecting"
+msgstr "Перепід'єднуюсь"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
+msgstr ""
+
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr ""
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "Помилка"
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "Під'єднуюсь"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "Трапилася помилка при спробі зберегти форму."
 
-#: src/converse-core.js:449
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "Автентикуюсь"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "Автентикація невдала"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "Автентикація невдала"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -375,7 +404,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr "Змінити Ваше прізвисько"
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "Прізвисько"
 
@@ -530,149 +559,149 @@ msgstr "Такої кімнати (поки) не існує"
 msgid "This room has reached its maximum number of occupants"
 msgstr "Ця кімната досягнула максимуму учасників"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "Тема встановлена %1$s: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "Цей користувач є модератором"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "Цей користувач може слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr "Запросіть"
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 msgid "Occupants"
 msgstr "Учасники"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr "Ви запрошуєте %1$s до чату \"%2$s\". "
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "Назва кімнати"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "Сервер"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 msgid "Join Room"
 msgstr "Приєднатися до кімнати"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "Показати кімнати"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "Кімнати"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "Жодної кімнати на %1$s"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "Кімнати на %1$s"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "Клацніть, щоб увійти в цю кімнату"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "Показати більше інформації про цю кімату"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "Опис:"
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "Присутні:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "Особливості:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "Вимагає автентикації"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "Прихована"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "Вимагає запрошення"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "Модерована"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "Не-анонімні"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "Увійти в кімнату"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "Постійна кімната"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "Публічна"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "Напів-анонімна"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "Тимчасова кімната"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "Немодерована"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr "%1$s запрошує вас приєднатись до чату: %2$s"
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -698,10 +727,6 @@ msgstr "тепер поза мережею"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1043,6 +1068,9 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "Ви впевнені, що хочете відхилити цей запит контакту?"
 
+#~ msgid "Error"
+#~ msgstr "Помилка"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "Таке прізвисько вже зайняте"
 
@@ -1053,8 +1081,5 @@ msgstr "Ви впевнені, що хочете відхилити цей за
 #~ msgid "View more information on this person"
 #~ msgstr "Показати більше інформації про цю кімату"
 
-#~ msgid "Reconnecting"
-#~ msgstr "Перепід'єднуюсь"
-
 #~ msgid "Contact username"
 #~ msgstr "Логін контакту"

+ 11 - 7
locale/zh/LC_MESSAGES/converse.json

@@ -14,6 +14,10 @@
             null,
             "我"
          ],
+         "A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
+            null,
+            ""
+         ],
          "is typing": [
             null,
             ""
@@ -162,13 +166,17 @@
             null,
             "折叠聊天窗口"
          ],
-         "Attempting to reconnect": [
+         "The connection has dropped, attempting to reconnect.": [
             null,
             ""
          ],
-         "Error": [
+         "Disconnected": [
             null,
-            "错误"
+            "连接已断开"
+         ],
+         "The connection to the chat server has dropped": [
+            null,
+            ""
          ],
          "Authenticating": [
             null,
@@ -494,10 +502,6 @@
             null,
             ""
          ],
-         "An error has occured": [
-            null,
-            ""
-         ],
          "Re-establishing encrypted session": [
             null,
             "重新建立加密会话"

+ 128 - 109
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-08-12 20:41+0000\n"
+"POT-Creation-Date: 2016-09-16 11:45+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"
@@ -34,238 +34,268 @@ msgstr "点击恢复聊天窗口"
 msgid "Personal message"
 msgstr "私信"
 
-#: src/converse-chatview.js:285
+#: src/converse-chatview.js:289
 msgid "me"
 msgstr "我"
 
-#: src/converse-chatview.js:325
+#: src/converse-chatview.js:302
+msgid ""
+"A very large message has been received.This might be due to an attack meant "
+"to degrade the chat performance.Output has been shortened."
+msgstr ""
+
+#: src/converse-chatview.js:337
 msgid "is typing"
 msgstr ""
 
-#: src/converse-chatview.js:328
+#: src/converse-chatview.js:340
 msgid "has stopped typing"
 msgstr ""
 
-#: src/converse-chatview.js:332 src/converse-chatview.js:586
+#: src/converse-chatview.js:344 src/converse-chatview.js:598
 #: src/converse-notification.js:171
 #, fuzzy
 msgid "has gone away"
 msgstr "对方离开"
 
-#: src/converse-chatview.js:456 src/converse-muc.js:468
+#: src/converse-chatview.js:468 src/converse-muc.js:468
 msgid "Show this menu"
 msgstr "显示此项菜单"
 
-#: src/converse-chatview.js:457
+#: src/converse-chatview.js:469
 msgid "Write in the third person"
 msgstr "以第三者身份写"
 
-#: src/converse-chatview.js:458 src/converse-muc.js:466
+#: src/converse-chatview.js:470 src/converse-muc.js:466
 msgid "Remove messages"
 msgstr "移除消息"
 
-#: src/converse-chatview.js:539
+#: src/converse-chatview.js:551
 msgid "Are you sure you want to clear the messages from this chat box?"
 msgstr "你确定清除此次的聊天记录吗?"
 
-#: src/converse-chatview.js:584 src/converse-notification.js:169
+#: src/converse-chatview.js:596 src/converse-notification.js:169
 #, fuzzy
 msgid "has gone offline"
 msgstr "对方已下线"
 
-#: src/converse-chatview.js:588 src/converse-notification.js:173
+#: src/converse-chatview.js:600 src/converse-notification.js:173
 #, fuzzy
 msgid "is busy"
 msgstr "忙碌"
 
-#: src/converse-chatview.js:631
+#: src/converse-chatview.js:643
 #, fuzzy
 msgid "Clear all messages"
 msgstr "私信"
 
-#: src/converse-chatview.js:632
+#: src/converse-chatview.js:644
 msgid "Hide the list of occupants"
 msgstr ""
 
-#: src/converse-chatview.js:633
+#: src/converse-chatview.js:645
 msgid "Insert a smiley"
 msgstr ""
 
-#: src/converse-chatview.js:634
+#: src/converse-chatview.js:646
 msgid "Start a call"
 msgstr ""
 
-#: src/converse-controlbox.js:176 src/converse-core.js:586
-#: src/converse-core.js:655 src/converse-rosterview.js:62
+#: src/converse-controlbox.js:191 src/converse-core.js:616
+#: src/converse-core.js:685 src/converse-rosterview.js:62
 msgid "Contacts"
 msgstr "联系人"
 
-#: src/converse-controlbox.js:261 src/converse-core.js:447
+#: src/converse-controlbox.js:276 src/converse-core.js:485
 msgid "Connecting"
 msgstr "连接中"
 
-#: src/converse-controlbox.js:361
+#: src/converse-controlbox.js:377
 #, fuzzy
 msgid "XMPP Username:"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:362
+#: src/converse-controlbox.js:378
 msgid "Password:"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:363
+#: src/converse-controlbox.js:379
 #, fuzzy
 msgid "Click here to log in anonymously"
 msgstr "此为非匿名聊天室"
 
-#: src/converse-controlbox.js:364
+#: src/converse-controlbox.js:380
 msgid "Log In"
 msgstr "登录"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 #, fuzzy
 msgid "Username"
 msgstr "XMPP/Jabber用户名:"
 
-#: src/converse-controlbox.js:365
+#: src/converse-controlbox.js:381
 msgid "user@server"
 msgstr ""
 
-#: src/converse-controlbox.js:366
+#: src/converse-controlbox.js:382
 #, fuzzy
 msgid "password"
 msgstr "密码:"
 
-#: src/converse-controlbox.js:373
+#: src/converse-controlbox.js:389
 msgid "Sign in"
 msgstr "登录"
 
 #. For translators: the %1$s part gets replaced with the status
 #. Example, I am online
-#: src/converse-controlbox.js:461 src/converse-controlbox.js:536
+#: src/converse-controlbox.js:477 src/converse-controlbox.js:552
 msgid "I am %1$s"
 msgstr "我现在%1$s"
 
-#: src/converse-controlbox.js:463 src/converse-controlbox.js:541
+#: src/converse-controlbox.js:479 src/converse-controlbox.js:557
 msgid "Click here to write a custom status message"
 msgstr "点击这里,填写状态信息"
 
-#: src/converse-controlbox.js:464 src/converse-controlbox.js:542
+#: src/converse-controlbox.js:480 src/converse-controlbox.js:558
 msgid "Click to change your chat status"
 msgstr "点击这里改变聊天状态"
 
-#: src/converse-controlbox.js:489
+#: src/converse-controlbox.js:505
 msgid "Custom status"
 msgstr "DIY状态"
 
-#: src/converse-controlbox.js:490 src/converse-muc.js:633
+#: src/converse-controlbox.js:506 src/converse-muc.js:633
 msgid "Save"
 msgstr "保存"
 
-#: src/converse-controlbox.js:518 src/converse-controlbox.js:528
+#: src/converse-controlbox.js:534 src/converse-controlbox.js:544
 msgid "online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:520
+#: src/converse-controlbox.js:536
 msgid "busy"
 msgstr "忙碌"
 
-#: src/converse-controlbox.js:522
+#: src/converse-controlbox.js:538
 msgid "away for long"
 msgstr "长时间离开"
 
-#: src/converse-controlbox.js:524
+#: src/converse-controlbox.js:540
 msgid "away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:526
+#: src/converse-controlbox.js:542
 #, fuzzy
 msgid "offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:567 src/converse-rosterview.js:128
+#: src/converse-controlbox.js:583 src/converse-rosterview.js:128
 msgid "Online"
 msgstr "在线"
 
-#: src/converse-controlbox.js:568 src/converse-rosterview.js:130
+#: src/converse-controlbox.js:584 src/converse-rosterview.js:130
 msgid "Busy"
 msgstr "忙碌中"
 
-#: src/converse-controlbox.js:569 src/converse-rosterview.js:131
+#: src/converse-controlbox.js:585 src/converse-rosterview.js:131
 msgid "Away"
 msgstr "离开"
 
-#: src/converse-controlbox.js:570 src/converse-rosterview.js:133
+#: src/converse-controlbox.js:586 src/converse-rosterview.js:133
 msgid "Offline"
 msgstr "离线"
 
-#: src/converse-controlbox.js:571
+#: src/converse-controlbox.js:587
 #, fuzzy
 msgid "Log out"
 msgstr "登录"
 
-#: src/converse-controlbox.js:578
+#: src/converse-controlbox.js:594
 msgid "Contact name"
 msgstr "联系人名称"
 
-#: src/converse-controlbox.js:579
+#: src/converse-controlbox.js:595
 msgid "Search"
 msgstr "搜索"
 
-#: src/converse-controlbox.js:583
+#: src/converse-controlbox.js:599
 msgid "e.g. user@example.org"
 msgstr ""
 
-#: src/converse-controlbox.js:584
+#: src/converse-controlbox.js:600
 msgid "Add"
 msgstr "添加"
 
-#: src/converse-controlbox.js:589
+#: src/converse-controlbox.js:605
 msgid "Click to add new chat contacts"
 msgstr "点击添加新联系人"
 
-#: src/converse-controlbox.js:590
+#: src/converse-controlbox.js:606
 msgid "Add a contact"
 msgstr "添加联系人"
 
-#: src/converse-controlbox.js:614
+#: src/converse-controlbox.js:630
 msgid "No users found"
 msgstr "未找到用户"
 
-#: src/converse-controlbox.js:620
+#: src/converse-controlbox.js:636
 msgid "Click to add as a chat contact"
 msgstr "点击添加为好友"
 
-#: src/converse-controlbox.js:679
+#: src/converse-controlbox.js:695
 msgid "Toggle chat"
 msgstr "折叠聊天窗口"
 
-#: src/converse-core.js:209
+#: src/converse-core.js:211
 #, fuzzy
 msgid "Click to hide these contacts"
 msgstr "点击移除联系人"
 
-#: src/converse-core.js:404
-msgid "Attempting to reconnect"
+#: src/converse-core.js:413
+#, fuzzy
+msgid "Reconnecting"
+msgstr "连接中"
+
+#: src/converse-core.js:413
+msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:445
-msgid "Error"
-msgstr "错误"
+#: src/converse-core.js:475
+msgid "Disconnected"
+msgstr "连接已断开"
+
+#: src/converse-core.js:476
+msgid "The connection to the chat server has dropped"
+msgstr ""
 
-#: src/converse-core.js:449
+#: src/converse-core.js:481
+#, fuzzy
+msgid "Connection error"
+msgstr "连接失败"
+
+#: src/converse-core.js:482
+#, fuzzy
+msgid "An error occurred while connecting to the chat server."
+msgstr "保存表单是出错。"
+
+#: src/converse-core.js:487
 msgid "Authenticating"
 msgstr "验证中"
 
-#: src/converse-core.js:451 src/converse-core.js:452
+#: src/converse-core.js:489
+#, fuzzy
+msgid "Authentication failed."
+msgstr "验证失败"
+
+#: src/converse-core.js:490
 msgid "Authentication Failed"
 msgstr "验证失败"
 
-#: src/converse-core.js:916
+#: src/converse-core.js:946
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1087
+#: src/converse-core.js:1117
 msgid "This client does not allow presence subscriptions"
 msgstr ""
 
@@ -385,7 +415,7 @@ msgstr ""
 msgid "Please choose your nickname"
 msgstr ""
 
-#: src/converse-muc.js:817 src/converse-muc.js:1347
+#: src/converse-muc.js:817 src/converse-muc.js:1348
 msgid "Nickname"
 msgstr "昵称"
 
@@ -540,150 +570,150 @@ msgstr "此房间不存在"
 msgid "This room has reached its maximum number of occupants"
 msgstr "此房间人数已达上线"
 
-#: src/converse-muc.js:1058
+#: src/converse-muc.js:1059
 msgid "Topic set by %1$s to: %2$s"
 msgstr "%1$s 设置话题为: %2$s"
 
-#: src/converse-muc.js:1145
+#: src/converse-muc.js:1146
 #, fuzzy
 msgid "Click to mention this user in your message."
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1146
+#: src/converse-muc.js:1147
 #, fuzzy
 msgid "This user is a moderator."
 msgstr "此用户是主持人"
 
-#: src/converse-muc.js:1147
+#: src/converse-muc.js:1148
 #, fuzzy
 msgid "This user can send messages in this room."
 msgstr "此用户在这房间里可发消息"
 
-#: src/converse-muc.js:1148
+#: src/converse-muc.js:1149
 #, fuzzy
 msgid "This user can NOT send messages in this room."
 msgstr "此用户不可在此房间发消息"
 
-#: src/converse-muc.js:1184
+#: src/converse-muc.js:1185
 msgid "Invite"
 msgstr ""
 
-#: src/converse-muc.js:1185
+#: src/converse-muc.js:1186
 #, fuzzy
 msgid "Occupants"
 msgstr "成员:"
 
-#: src/converse-muc.js:1303
+#: src/converse-muc.js:1304
 msgid "You are about to invite %1$s to the chat room \"%2$s\". "
 msgstr ""
 
-#: src/converse-muc.js:1304
+#: src/converse-muc.js:1305
 msgid ""
 "You may optionally include a message, explaining the reason for the "
 "invitation."
 msgstr ""
 
-#: src/converse-muc.js:1346
+#: src/converse-muc.js:1347
 msgid "Room name"
 msgstr "聊天室名称"
 
-#: src/converse-muc.js:1348
+#: src/converse-muc.js:1349
 msgid "Server"
 msgstr "服务器"
 
-#: src/converse-muc.js:1349
+#: src/converse-muc.js:1350
 #, fuzzy
 msgid "Join Room"
 msgstr "加入"
 
-#: src/converse-muc.js:1350
+#: src/converse-muc.js:1351
 msgid "Show rooms"
 msgstr "显示所有聊天室"
 
-#: src/converse-muc.js:1354
+#: src/converse-muc.js:1355
 msgid "Rooms"
 msgstr "聊天室"
 
 #. For translators: %1$s is a variable and will be replaced with the XMPP server name
-#: src/converse-muc.js:1374
+#: src/converse-muc.js:1375
 msgid "No rooms on %1$s"
 msgstr "%1$s 上没有聊天室"
 
 #. For translators: %1$s is a variable and will be
 #. replaced with the XMPP server name
-#: src/converse-muc.js:1388
+#: src/converse-muc.js:1389
 msgid "Rooms on %1$s"
 msgstr "%1$s 上的聊天室"
 
-#: src/converse-muc.js:1397
+#: src/converse-muc.js:1398
 msgid "Click to open this room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1398
+#: src/converse-muc.js:1399
 msgid "Show more information on this room"
 msgstr "显示次聊天室的更多信息"
 
-#: src/converse-muc.js:1470
+#: src/converse-muc.js:1471
 msgid "Description:"
 msgstr "描述: "
 
-#: src/converse-muc.js:1471
+#: src/converse-muc.js:1472
 msgid "Occupants:"
 msgstr "成员:"
 
-#: src/converse-muc.js:1472
+#: src/converse-muc.js:1473
 msgid "Features:"
 msgstr "特性:"
 
-#: src/converse-muc.js:1473
+#: src/converse-muc.js:1474
 msgid "Requires authentication"
 msgstr "需要验证"
 
-#: src/converse-muc.js:1474
+#: src/converse-muc.js:1475
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: src/converse-muc.js:1475
+#: src/converse-muc.js:1476
 msgid "Requires an invitation"
 msgstr "需要被邀请"
 
-#: src/converse-muc.js:1476
+#: src/converse-muc.js:1477
 msgid "Moderated"
 msgstr "发言受限"
 
-#: src/converse-muc.js:1477
+#: src/converse-muc.js:1478
 msgid "Non-anonymous"
 msgstr "非匿名"
 
-#: src/converse-muc.js:1478
+#: src/converse-muc.js:1479
 msgid "Open room"
 msgstr "打开聊天室"
 
-#: src/converse-muc.js:1479
+#: src/converse-muc.js:1480
 msgid "Permanent room"
 msgstr "永久聊天室"
 
-#: src/converse-muc.js:1480
+#: src/converse-muc.js:1481
 msgid "Public"
 msgstr "公开的"
 
-#: src/converse-muc.js:1481
+#: src/converse-muc.js:1482
 msgid "Semi-anonymous"
 msgstr "半匿名"
 
-#: src/converse-muc.js:1482
+#: src/converse-muc.js:1483
 msgid "Temporary room"
 msgstr "临时聊天室"
 
-#: src/converse-muc.js:1483
+#: src/converse-muc.js:1484
 msgid "Unmoderated"
 msgstr "无发言限制"
 
-#: src/converse-muc.js:1549
+#: src/converse-muc.js:1550
 msgid "%1$s has invited you to join a chat room: %2$s"
 msgstr ""
 
-#: src/converse-muc.js:1554
+#: src/converse-muc.js:1555
 msgid ""
 "%1$s has invited you to join a chat room: %2$s, and left the following "
 "reason: \"%3$s\""
@@ -708,10 +738,6 @@ msgstr "对方已下线"
 msgid "wants to be your contact"
 msgstr ""
 
-#: src/converse-notification.js:198
-msgid "An error has occured"
-msgstr ""
-
 #. Verified that the passphrase is still the same
 #: src/converse-otr.js:152
 msgid "Re-establishing encrypted session"
@@ -1053,20 +1079,16 @@ msgstr ""
 msgid "Are you sure you want to decline this contact request?"
 msgstr "确定移除联系人吗?"
 
+#~ msgid "Error"
+#~ msgstr "错误"
+
 #~ msgid "Your nickname is already taken"
 #~ msgstr "您的昵称已被占用"
 
-#~ msgid "Disconnected"
-#~ msgstr "连接已断开"
-
 #, fuzzy
 #~ msgid "View more information on this person"
 #~ msgstr "显示次聊天室的更多信息"
 
-#, fuzzy
-#~ msgid "Reconnecting"
-#~ msgstr "连接中"
-
 #~ msgid "Contact username"
 #~ msgstr "联系人姓名"
 
@@ -1076,9 +1098,6 @@ msgstr "确定移除联系人吗?"
 #~ msgid "This user has requested an encrypted session."
 #~ msgstr "此用户请求了一个加密会话。"
 
-#~ msgid "Connection Failed"
-#~ msgstr "连接失败"
-
 #~ msgid "Disconnecting"
 #~ msgstr "断开链接中"
 

+ 1 - 1
package.json

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

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff