New release: 0.10.1

Makefile

@@ -64,7 +64,7 @@ serve: stamp-npm
 
 .PHONY: pot
 pot:
-	xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.7.0 -c --language="python";
+	xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.10.1 -c --language="javascript";
 
 .PHONY: po
 po:
@@ -82,6 +82,7 @@ release:
 	sed -i s/Project-Id-Version:\ Converse\.js\ [0-9]\.[0-9]\.[0-9]/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
 	sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json
 	sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json
+	sed -i s/--package-version=[0-9]\.[0-9]\.[0-9]/--package-version=$(VERSION)/ Makefile
 	sed -i s/v[0-9]\.[0-9]\.[0-9]\.zip/v$(VERSION)\.zip/ index.html
 	sed -i s/v[0-9]\.[0-9]\.[0-9]\.tar\.gz/v$(VERSION)\.tar\.gz/ index.html
 	sed -i s/version\ =\ \'[0-9]\.[0-9]\.[0-9]\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py

bower.json

@@ -28,7 +28,7 @@
     "fontawesome": "~4.1.0",
     "typeahead.js": "https://raw.githubusercontent.com/jcbrand/typeahead.js/eedfb10505dd3a20123d1fafc07c1352d83f0ab3/dist/typeahead.jquery.js",
     "skeleton-sass": "~2.0.3",
-    "strophejs": "1.2.3",
+    "strophejs": "1.2.4",
     "strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd",
     "bourbon": "~4.2.3"
   },

builds/templates.js

@@ -233,9 +233,13 @@ __p += '<form class="pure-form set-xmpp-status" action="" method="post">\n    <s
 ((__t = (label_busy)) == null ? '' : __t) +
 '</option>\n            <option value="away">' +
 ((__t = (label_away)) == null ? '' : __t) +
-'</option>\n            <option value="offline">' +
+'</option>\n            ';
+ if (include_offline_state)  { ;
+__p += '\n            <option value="offline">' +
 ((__t = (label_offline)) == null ? '' : __t) +
 '</option>\n            ';
+ } ;
+__p += '\n            ';
  if (allow_logout)  { ;
 __p += '\n            <option value="logout">' +
 ((__t = (label_logout)) == null ? '' : __t) +

converse.js

@@ -2363,7 +2363,7 @@
 
             informNoRoomsFound: function () {
                 var $available_chatrooms = this.$el.find('#available-chatrooms');
-                // # For translators: %1$s is a variable and will be replaced with the XMPP server name
+                // For translators: %1$s is a variable and will be replaced with the XMPP server name
                 $available_chatrooms.html('<dt>'+__('No rooms on %1$s',this.model.get('muc_domain'))+'</dt>');
                 $('input#show-rooms').show().siblings('span.spinner').remove();
             },
@@ -2376,8 +2376,8 @@
                     $available_chatrooms = this.$el.find('#available-chatrooms');
                 this.rooms = $(iq).find('query').find('item');
                 if (this.rooms.length) {
-                    // # For translators: %1$s is a variable and will be
-                    // # replaced with the XMPP server name
+                    // For translators: %1$s is a variable and will be
+                    // replaced with the XMPP server name
                     $available_chatrooms.html('<dt>'+__('Rooms on %1$s',this.model.get('muc_domain'))+'</dt>');
                     fragment = document.createDocumentFragment();
                     for (i=0; i<this.rooms.length; i++) {
@@ -3524,9 +3524,8 @@
                     } else if ($error.find('not-acceptable').length) {
                         this.showDisconnectMessage(__("Your nickname doesn't conform to this room's policies"));
                     } else if ($error.find('conflict').length) {
-                        // TODO: give user the option of choosing a different
-                        // nickname
                         this.showDisconnectMessage(__("Your nickname is already taken"));
+                        // TODO: give user the option of choosing a different nickname
                     } else if ($error.find('item-not-found').length) {
                         this.showDisconnectMessage(__("This room does not (yet) exist"));
                     } else if ($error.find('service-unavailable').length) {
@@ -3576,8 +3575,8 @@
                 }
                 if (subject) {
                     this.$el.find('.chatroom-topic').text(subject).attr('title', subject);
-                    // # For translators: the %1$s and %2$s parts will get replaced by the user and topic text respectively
-                    // # Example: Topic set by JC Brand to: Hello World!
+                    // For translators: the %1$s and %2$s parts will get replaced by the user and topic text respectively
+                    // Example: Topic set by JC Brand to: Hello World!
                     this.$content.append(
                         converse.templates.info({
                             'message': __('Topic set by %1$s to: %2$s', sender, subject)
@@ -5440,8 +5439,8 @@
 
             updateStatusUI: function (model) {
                 var stat = model.get('status');
-                // # For translators: the %1$s part gets replaced with the status
-                // # Example, I am online
+                // For translators: the %1$s part gets replaced with the status
+                // Example, I am online
                 var status_message = model.get('status_message') || __("I am %1$s", this.getPrettyStatus(stat));
                 this.$el.find('#fancy-xmpp-status-select').removeClass('no-border').html(
                     converse.templates.chat_status({

docs/CHANGES.md

 # Changelog
 
-## 0.10.1 (Unreleased)
+## 0.10.1 (2016-02-06)
 
 - #352 When the user has manually scrolled up in a chat window, don't scroll
   down on chat event notifications. [jcbrand]

locale/en/LC_MESSAGES/converse.json

@@ -827,6 +827,10 @@
             null,
             "Log In"
          ],
+         "Username": [
+            null,
+            ""
+         ],
          "user@server": [
             null,
             ""

locale/it/LC_MESSAGES/converse.json

@@ -765,7 +765,7 @@
          ],
          "Fetch registration form": [
             null,
-            "Recupero il modulo di registrazione"
+            "Modulo di registrazione"
          ],
          "Tip: A list of public XMPP providers is available": [
             null,