New release: 2.0.5

RELEASE.md

@@ -1,13 +1,13 @@
 # Release checklist
 
 1. Run `make check` to check that all tests pass.
-2. Decide on a version number, e.g. 1.0.5
-3. Run `make release VERSION=1.0.5`
+2. Decide on a version number, e.g. 2.0.5
+3. Run `make release VERSION=2.0.5`
 4. Do a `git diff` to check if things look sane.
 4. Do a quick manual test with the `dist` files (via `index.html`)
-5. `git commit -am "New release 1.0.5"`
-6. `git tag -s v1.0.5
+5. `git commit -am "New release 2.0.5"`
+6. `git tag -s v2.0.5
 7. Run `git push && git push --tags`
 8. Update http://conversejs.org
-9. Create `1.0.5` directory for the CDN.
+9. Create `2.0.5` directory for the CDN.
 10. Run `npm publish`

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "converse.js",
   "description": "Web-based XMPP/Jabber chat client written in javascript",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "license": "MPL-2.0",
   "devDependencies": {
     "bootstrap": "~3.2.0",

docs/CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.0.5 (Unreleased)
+## 2.0.5 (2017-02-01)
 - #743, #751, #753 Update to Strophe 1.2.12. SASL-EXTERNAL now has reduced priority, so it won't
   be prioritized above other auth mechanisms. [jcbrand]
 - #755: create composer.json to add this project in packagist.org [fabiomontefuscolo]

docs/source/conf.py

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

locale/af/LC_MESSAGES/converse.json

@@ -258,14 +258,6 @@
             null,
             "Bekragtiging het gefaal"
          ],
-         "Disconnected": [
-            null,
-            "Ontkoppel"
-         ],
-         "The connection to the chat server has dropped": [
-            null,
-            ""
-         ],
          "Sorry, there was an error while trying to add ": [
             null,
             ""

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-12-13 19:42+0000\n"
+"POT-Creation-Date: 2017-02-01 11:01+0000\n"
 "PO-Revision-Date: 2016-04-07 10:34+0000\n"
 "Last-Translator: JC Brand <[email protected]>\n"
 "Language-Team: Afrikaans\n"
@@ -150,7 +150,7 @@ msgstr "Voeg 'n emotikon by"
 msgid "Start a call"
 msgstr "Begin 'n oproep"
 
-#: src/converse-controlbox.js:214 src/converse-core.js:697
+#: src/converse-controlbox.js:214 src/converse-core.js:704
 #: src/converse-rosterview.js:93
 msgid "Contacts"
 msgstr "Kontakte"
@@ -282,74 +282,71 @@ msgstr "Klik om as kletskontak by te voeg"
 msgid "Toggle chat"
 msgstr "Klets"
 
-#: src/converse-core.js:200
+#: src/converse-core.js:205
 msgid "Click to hide these contacts"
 msgstr "Klik om hierdie kontakte te verskuil"
 
-#: src/converse-core.js:400
+#: src/converse-core.js:406
 msgid "Reconnecting"
 msgstr "Herkonnekteer"
 
-#: src/converse-core.js:402
+#: src/converse-core.js:408
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:465
+#: src/converse-core.js:475
 #, fuzzy
 msgid "Connection error"
 msgstr "Verbind tans"
 
-#: src/converse-core.js:466
+#: src/converse-core.js:476
 #, 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:469
+#: src/converse-core.js:479
 msgid "Connecting"
 msgstr "Verbind tans"
 
-#: src/converse-core.js:471
+#: src/converse-core.js:481
 msgid "Authenticating"
 msgstr "Besig om te bekragtig"
 
-#: src/converse-core.js:473
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Bekragtiging het gefaal"
-
-#: src/converse-core.js:474
+#: src/converse-core.js:483
 msgid "Authentication Failed"
 msgstr "Bekragtiging het gefaal"
 
-#: src/converse-core.js:482
-msgid "Disconnected"
-msgstr "Ontkoppel"
+#: src/converse-core.js:488
+#, fuzzy
+msgid "Connection failed"
+msgstr "Verbind tans"
 
-#: src/converse-core.js:483
-msgid "The connection to the chat server has dropped"
-msgstr ""
+#: src/converse-core.js:489
+#, 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:992
+#: src/converse-core.js:999
 msgid "Sorry, there was an error while trying to add "
 msgstr ""
 
-#: src/converse-core.js:1163
+#: src/converse-core.js:1170
 msgid "This client does not allow presence subscriptions"
 msgstr "Hierdie klient laat nie beskikbaarheidsinskrywings toe nie"
 
 #: src/converse-headline.js:100
 msgid "Close this box"
 msgstr "Maak hierdie kletskas toe"
 
-#: src/converse-minimize.js:191 src/converse-minimize.js:512
+#: src/converse-minimize.js:191 src/converse-minimize.js:511
 msgid "Minimize this chat box"
 msgstr "Minimeer hierdie kletskas"
 
 #: src/converse-minimize.js:331
 msgid "Click to restore this chat"
 msgstr "Klik om hierdie klets te herstel"
 
-#: src/converse-minimize.js:496
+#: src/converse-minimize.js:495
 msgid "Minimized"
 msgstr "Geminimaliseer"
 
@@ -1121,6 +1118,13 @@ 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?"
 
+#, fuzzy
+#~ msgid "Authentication failed."
+#~ msgstr "Bekragtiging het gefaal"
+
+#~ msgid "Disconnected"
+#~ msgstr "Ontkoppel"
+
 #~ msgid "Minimize this box"
 #~ msgstr "Minimeer hierdie kletskas"
 

locale/ca/LC_MESSAGES/converse.json

@@ -251,14 +251,6 @@
             null,
             "Error d'autenticació"
          ],
-         "Disconnected": [
-            null,
-            ""
-         ],
-         "The connection to the chat server has dropped": [
-            null,
-            ""
-         ],
          "Sorry, there was an error while trying to add ": [
             null,
             "S'ha produït un error en intentar afegir "

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-12-13 19:42+0000\n"
+"POT-Creation-Date: 2017-02-01 11:01+0000\n"
 "PO-Revision-Date: 2016-01-25 17:25+0100\n"
 "Last-Translator: Ruben Mansilla <[email protected]>\n"
 "Language-Team: CA <[email protected]>\n"
@@ -156,7 +156,7 @@ msgstr "Insereix una cara somrient"
 msgid "Start a call"
 msgstr "Inicia una trucada"
 
-#: src/converse-controlbox.js:214 src/converse-core.js:697
+#: src/converse-controlbox.js:214 src/converse-core.js:704
 #: src/converse-rosterview.js:93
 msgid "Contacts"
 msgstr "Contactes"
@@ -289,59 +289,56 @@ msgstr "Feu clic per afegir com a contacte del xat"
 msgid "Toggle chat"
 msgstr "Canvia de xat"
 
-#: src/converse-core.js:200
+#: src/converse-core.js:205
 msgid "Click to hide these contacts"
 msgstr "Feu clic per amagar aquests contactes"
 
-#: src/converse-core.js:400
+#: src/converse-core.js:406
 #, fuzzy
 msgid "Reconnecting"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:402
+#: src/converse-core.js:408
 msgid "The connection has dropped, attempting to reconnect."
 msgstr ""
 
-#: src/converse-core.js:465
+#: src/converse-core.js:475
 #, fuzzy
 msgid "Connection error"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:466
+#: src/converse-core.js:476
 #, 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:469
+#: src/converse-core.js:479
 msgid "Connecting"
 msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:471
+#: src/converse-core.js:481
 msgid "Authenticating"
 msgstr "S'està efectuant l'autenticació"
 
-#: src/converse-core.js:473
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Error d'autenticació"
-
-#: src/converse-core.js:474
+#: src/converse-core.js:483
 msgid "Authentication Failed"
 msgstr "Error d'autenticació"
 
-#: src/converse-core.js:482
-msgid "Disconnected"
-msgstr ""
+#: src/converse-core.js:488
+#, fuzzy
+msgid "Connection failed"
+msgstr "S'està establint la connexió"
 
-#: src/converse-core.js:483
-msgid "The connection to the chat server has dropped"
-msgstr ""
+#: src/converse-core.js:489
+#, 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:992
+#: src/converse-core.js:999
 msgid "Sorry, there was an error while trying to add "
 msgstr "S'ha produït un error en intentar afegir "
 
-#: src/converse-core.js:1163
+#: src/converse-core.js:1170
 msgid "This client does not allow presence subscriptions"
 msgstr "Aquest client no admet les subscripcions de presència"
 
@@ -350,15 +347,15 @@ msgstr "Aquest client no admet les subscripcions de presència"
 msgid "Close this box"
 msgstr "Tanca aquest quadre del xat"
 
-#: src/converse-minimize.js:191 src/converse-minimize.js:512
+#: src/converse-minimize.js:191 src/converse-minimize.js:511
 msgid "Minimize this chat box"
 msgstr "Minimitza aquest quadre del xat"
 
 #: src/converse-minimize.js:331
 msgid "Click to restore this chat"
 msgstr "Feu clic per restaurar aquest xat"
 
-#: src/converse-minimize.js:496
+#: src/converse-minimize.js:495
 msgid "Minimized"
 msgstr "Minimitzat"
 
@@ -1132,6 +1129,10 @@ 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 "Authentication failed."
+#~ msgstr "Error d'autenticació"
+
 #, fuzzy
 #~ msgid "Minimize this box"
 #~ msgstr "Minimitza aquest quadre del xat"