Merge remote-tracking branch 'origin/develop' into develop

src/components/structures/MatrixChat.js

@@ -644,6 +644,17 @@ module.exports = React.createClass({
             }
         }
 
+        if (roomInfo.room_alias) {
+            console.log(
+                `Switching to room alias ${roomInfo.room_alias} at event ` +
+                newState.initialEventId,
+            );
+        } else {
+            console.log(`Switching to room id ${roomInfo.room_id} at event ` +
+                newState.initialEventId,
+            );
+        }
+
         // Wait for the first sync to complete so that if a room does have an alias,
         // it would have been retrieved.
         let waitFor = q(null);

src/components/structures/TimelinePanel.js

@@ -902,6 +902,9 @@ var TimelinePanel = React.createClass({
 
         var onError = (error) => {
             this.setState({timelineLoading: false});
+            console.error(
+                `Error loading timeline panel at ${eventId}: ${error}`,
+            );
             var msg = error.message ? error.message : JSON.stringify(error);
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 

src/components/views/elements/HomeButton.js

@@ -23,7 +23,7 @@ const HomeButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
         <ActionButton action="view_home_page"
-            label={ _t("Welcome page") }
+            label={ _t("Home") }
             iconPath="img/icons-home.svg"
             size={props.size}
             tooltip={props.tooltip}

src/i18n/strings/en_EN.json

@@ -325,6 +325,7 @@
   "Hide read receipts": "Hide read receipts",
   "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
   "Historical": "Historical",
+  "Home": "Home",
   "Homeserver is": "Homeserver is",
   "Identity Server is": "Identity Server is",
   "I have verified my email address": "I have verified my email address",