sentry: Init sentry-electron.

internal-links: open non-image links in hidden webview.
* This will make sure that the current server webview will not reload due to URL change. * Add an option to allow users to download the file attachments. Improves: #469.
2025-10-24 08:33:36 +00:00 · 2018-04-13 17:02:57 +05:30 · 2018-04-11 23:21:01 +05:30 · 2018-04-09 18:16:57 +05:30 · 2018-04-07 19:52:46 +05:30 · 2018-04-04 18:02:40 +05:30
62 changed files with 1478 additions and 11462 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,13 @@ node_modules/
 # Compiled binary build directory
 dist/

+#snap generated files
+snap/parts
+snap/prime
+snap/snap
+snap/stage
+snap/*.snap
+
 # Logs
 logs
 *.log
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -52,8 +52,8 @@ const iconPath = () => {
 function createMainWindow() {
 	// Load the previous state with fallback to defaults
 	const mainWindowState = windowStateKeeper({
-		defaultWidth: 1000,
-		defaultHeight: 600
+		defaultWidth: 1100,
+		defaultHeight: 720
 	});

 	// Let's keep the window position global so that we can access it in other process
@@ -71,7 +71,6 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			plugins: true,
-			allowDisplayingInsecureContent: true,
 			nodeIntegration: true
 		},
 		show: false
--- a/app/main/menu.js
+++ b/app/main/menu.js
@@ -2,7 +2,7 @@
 const os = require('os');
 const path = require('path');

-const { app, shell, BrowserWindow, Menu } = require('electron');
+const { app, shell, BrowserWindow, Menu, dialog } = require('electron');

 const fs = require('fs-extra');

@@ -87,7 +87,7 @@ class AppMenu {
 			}
 		}, {
 			label: 'Toggle Sidebar',
-			accelerator: 'CommandOrControl+S',
+			accelerator: 'CommandOrControl+Shift+S',
 			click(item, focusedWindow) {
 				if (focusedWindow) {
 					const newValue = !ConfigUtil.getConfigItem('showSidebar');
@@ -120,6 +120,12 @@ class AppMenu {
 				label: `${appName + ' Desktop-'} v${app.getVersion()}`,
 				enabled: false
 			},
+			{
+				label: `What's New...`,
+				click() {
+					shell.openExternal(`https://github.com/zulip/zulip-electron/releases/tag/v${app.getVersion()}`);
+				}
+			},
 			{
 				label: `${appName} Help`,
 				click() {
@@ -382,20 +388,32 @@ class AppMenu {
 	}

 	static resetAppSettings() {
+		const resetAppSettingsMessage = 'By proceeding you will be removing all connected organizations and preferences from Zulip.';
+
 		// We save App's settings/configurations in following files
 		const settingFiles = ['window-state.json', 'domain.json', 'settings.json'];

-		settingFiles.forEach(settingFileName => {
-			const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
-			fs.access(getSettingFilesPath, error => {
-				if (error) {
-					console.log(error);
-				} else {
-					fs.unlink(getSettingFilesPath, () => {
-						AppMenu.sendAction('clear-app-data');
+		dialog.showMessageBox({
+			type: 'warning',
+			buttons: ['YES', 'NO'],
+			defaultId: 0,
+			message: 'Are you sure?',
+			detail: resetAppSettingsMessage
+		}, response => {
+			if (response === 0) {
+				settingFiles.forEach(settingFileName => {
+					const getSettingFilesPath = path.join(app.getPath('appData'), appName, settingFileName);
+					fs.access(getSettingFilesPath, error => {
+						if (error) {
+							console.log(error);
+						} else {
+							fs.unlink(getSettingFilesPath, () => {
+								AppMenu.sendAction('clear-app-data');
+							});
+						}
 					});
-				}
-			});
+				});
+			}
 		});
 	}

--- a/app/package-lock.json
+++ b/app/package-lock.json
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.9.0",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
  "copyright": "Kandra Labs, Inc.",
@@ -30,12 +30,13 @@
    "electron-is-dev": "0.3.0",
    "electron-log": "2.2.7",
    "electron-spellchecker": "1.1.2",
-    "electron-updater": "2.18.2",
+    "electron-updater": "2.21.4",
    "electron-window-state": "4.1.1",
    "is-online": "7.0.0",
    "node-json-db": "0.7.3",
    "request": "2.81.0",
    "semver": "5.4.1",
+    "@sentry/electron": "0.5.0",
    "wurl": "2.5.0"
  },
  "optionalDependencies": {
--- a/app/renderer/about.html
+++ b/app/renderer/about.html
@@ -1,45 +1,50 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8">
-		<link rel="stylesheet" href="css/about.css">
-	</head>
-	<body>
+
+<head>
+	<meta charset="UTF-8">
+	<link rel="stylesheet" href="css/about.css">
+</head>
+
+<body>
 	<div class="about">
 		<img class="logo" src="../resources/zulip.png" />
 		<p class="detail" id="version">v?.?.?</p>
 		<div class="maintenance-info">
 			<p class="detail maintainer">
-				Maintained by <a onclick="linkInBrowser('website')">Zulip</a>
+				Maintained by
+				<a onclick="linkInBrowser('website')">Zulip</a>
 			</p>
 			<p class="detail license">
-				Available under the <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
+				Available under the
+				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
 			</p>
 			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
 		</div>
 	</div>
 	<script>

-	const { app } = require('electron').remote;
-	const { shell } = require('electron');
-	const version_tag = document.querySelector('#version');
-	version_tag.innerHTML = 'v' + app.getVersion();
+		const { app } = require('electron').remote;
+		const { shell } = require('electron');
+		const version_tag = document.querySelector('#version');
+		version_tag.innerHTML = 'v' + app.getVersion();

-	function linkInBrowser(type) {
-		let url;
-		switch (type) {
-			case 'website': 
-				url = "https://zulipchat.com";
-				break;
-			case 'license': 
-				url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
-				break;
-			default:
-				url = 'https://github.com/zulip/zulip-electron/issues/new?body=' + 
-				      '%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
+		function linkInBrowser(type) {
+			let url;
+			switch (type) {
+				case 'website':
+					url = "https://zulipchat.com";
+					break;
+				case 'license':
+					url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
+					break;
+				default:
+					url = 'https://github.com/zulip/zulip-electron/issues/new?body=' +
+						'%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
+			}
+			shell.openExternal(url);
 		}
-		shell.openExternal(url);
-	}
 	</script>
-	</body>
+	<script>require('./js/shared/preventdrag.js')</script>
+</body>
 </html>
--- a/app/renderer/css/main.css
+++ b/app/renderer/css/main.css
@@ -28,7 +28,7 @@ body {
    -webkit-app-region: drag;
    overflow: hidden;
    transition: all 0.5s ease;
-    z-index: 1;
+    z-index: 2;
 }

 .toggle-sidebar div {
@@ -121,11 +121,14 @@ body {
 }

 .action-button.active {
-    background-color: rgba(255, 255, 255, 0.25);
+    /* background-color: rgba(255, 255, 255, 0.25); */
+    background-color: #efefef;
+    opacity: 0.9;
+    padding-right: 14px;
 }

 .action-button.active i {
-    color: #eee;
+    color: #1c262b;
 }

 .tab:first-child {
@@ -249,28 +252,39 @@ body {
 }

 webview {
-    opacity: 1;
    /* transition: opacity 0.3s ease-in; */
    flex-grow: 1;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+}
+
+webview.download-webview {
+  z-index: -1;
+  pointer-events: none;
 }

 webview.onload {
    transition: opacity 1s cubic-bezier(0.95, 0.05, 0.795, 0.035);
 }

-webview.disabled {
-    flex: 0 1;
-    height: 0;
-    width: 0;
-    opacity: 0;
-    transition: opacity 0.3s ease-out;
+webview.active {
+    opacity: 1;
+    z-index: 1;
+    visibility: visible;
 }

-webview:focus {
+webview.disabled {
+    opacity: 0;
+}
+
+webview.focus {
    outline: 0px solid transparent;
 }

-
 /* Tooltip styling */

 #back-tooltip,
@@ -278,7 +292,7 @@ webview:focus {
 #setting-tooltip {
    font-family: sans-serif;
    background: #222c31;
-    margin-left: 45px;
+    margin-left: 48px;
    padding: 6px 8px;
    position: absolute;
    margin-top: 0px;
@@ -350,6 +364,8 @@ webview:focus {
    height: 100%;
    width: 100%;
    position: relative;
+    flex-grow: 1;
+    flex-basis: 0px;
 }

 .hidden {
--- a/app/renderer/css/preference.css
+++ b/app/renderer/css/preference.css
@@ -95,11 +95,13 @@ td:nth-child(odd) {
 }

 #sidebar {
-    width: 80px;
-    padding: 30px;
+    width: 150px;
+    min-width: 100px;
+    padding: 30px 30px 30px 35px;
    display: flex;
    flex-direction: column;
    font-size: 16px;
+    background: #f2f2f2;
 }

 #nav-container {
@@ -113,7 +115,7 @@ td:nth-child(odd) {
 }

 .nav.active {
-    color: #464e5a;
+    color: #4ebfac;
    cursor: default;
    position: relative;
 }
@@ -121,12 +123,19 @@ td:nth-child(odd) {
 .nav.active::before {
    background: #464e5a;
    width: 3px;
-    height: 16px;
+    height: 18px;
    position: absolute;
    left: -8px;
    content: '';
 }

+
+/* We don't want to show this in nav item since we have the + button for adding an Organization */
+
+#nav-AddServer {
+    display: none;
+}
+
 #settings-header {
    font-size: 22px;
    color: #222c31;
@@ -142,12 +151,12 @@ td:nth-child(odd) {
 }

 #new-server-container {
-    opacity: 1;
-    transition: opacity 0.3s;
+    padding-left: 42px;
+    padding-top: 25px;
+    margin-right: 16px;
 }

 .title {
-    padding: 4px 0 6px 0;
    font-weight: 500;
    color: #222c31;
 }
@@ -159,6 +168,16 @@ td:nth-child(odd) {
    padding: 4px 0 6px 0;
 }

+.add-server-info-row {
+    display: flex;
+    margin: 8px 0 0 0;
+}
+
+.add-server-info-right {
+    flex-grow: 1;
+    margin-top: 10px;
+}
+
 .sub-title {
    padding: 4px 0 6px 0;
    font-weight: bold;
@@ -169,20 +188,40 @@ img.server-info-icon {
    width: 36px;
    height: 36px;
    padding: 4px;
+    cursor: pointer;
+    vertical-align: middle;
 }

 .server-info-left {
-    margin: 10px 20px 0 0;
+    margin: 4px 20px 0 0;
+    min-width: 40%;
 }

 .server-info-right {
+    margin-top: 4px;
+    width: 55%;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
    flex-grow: 1;
-    margin-right: 10px;
 }

 .server-info-row {
-    display: flex;
-    margin: 8px 0 0 0;
+    display: inline-block;
+    margin: 5px 0 0 0;
+}
+
+.server-info-left .server-info-row {
+    display: inline-flex;
+    align-items: inherit;
+    vertical-align: -2px;
+    position: relative;
+}
+
+.server-url {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }

 .server-info-alias {
@@ -190,6 +229,10 @@ img.server-info-icon {
    cursor: pointer;
 }

+.server-url-info {
+    margin-right: 10px;
+}
+
 .setting-input-key {
    font-size: 14px;
    height: 27px;
@@ -203,18 +246,16 @@ img.server-info-icon {
 .setting-input-value {
    flex-grow: 1;
    font-size: 14px;
-    height: 22px;
    border-radius: 3px;
-    padding: 7px;
+    padding: 13px;
    border: #ededed 2px solid;
    outline-width: 0;
    background: transparent;
-    max-width: 500px;
+    max-width: 450px;
 }

 .setting-input-value:focus {
-    border: #7cb980 2px solid;
-    border-radius: 3px;
+    border: #4EBFAC 2px solid;
 }

 .setting-block {
@@ -270,7 +311,6 @@ img.server-info-icon {
 }

 .settings-card:hover {
-    border-left: 8px solid #bcbcbc;
    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
 }

@@ -280,11 +320,15 @@ img.server-info-icon {
 }

 .red {
-    color: #ffffff;
-    background: #ef5350;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+    color: #ef5350;
+    padding: 8px;
+    border: rgba(239, 83, 80, 0.5) solid 1px;
+}
+
+.red:hover {
+    color: #e63431;
+    border: rgba(239, 83, 80, 0.7) solid 1px;
+    ;
 }

 .blue {
@@ -314,8 +358,8 @@ img.server-info-icon {
 }

 i.open-tab-button {
-    padding: 0 5px;
-    font-size: 18px;
+    padding-left: 2px;
+    font-size: 19px;
    cursor: pointer;
 }

@@ -368,17 +412,10 @@ i.open-tab-button {
 }

 #open-create-org-link {
-    color: #666;
    cursor: pointer;
    text-decoration: none;
 }

-#open-create-org-link:hover {
-    color: #005580;
-    ;
-    text-decoration: underline;
-}
-
 .toggle {
    position: absolute;
    margin-left: -9999px;
@@ -433,6 +470,94 @@ input.toggle-round:checked+label:after {
 }


+/*  Add new server modal */
+
+.add-server-modal {
+    display: block;
+    position: fixed;
+    z-index: 1;
+    padding-top: 15vh;
+    left: 0;
+    top: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(61, 64, 67, 15); */
+    background: linear-gradient(35deg, #003b52, #45b59b);
+    overflow: auto;
+}
+
+
+/* Modal Content */
+
+.modal-container {
+    background-color: #f4f7f8;
+    margin: auto;
+    padding: 57px;
+    border: #dae1e3 1px solid;
+    width: 550px;
+    height: 370px;
+    border-radius: 4px;
+}
+
+.add-server-modal .page-title {
+    text-align: center;
+    font-size: 1.6rem;
+}
+
+.divider {
+    margin-bottom: 30px;
+    margin-top: 30px;
+    color: #7d878a;
+}
+
+.divider hr {
+    margin-left: 8px;
+    margin-right: 8px;
+    width: 44%;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.server-center {
+    width: 100%;
+    text-align: center;
+    align-items: center;
+    padding-top: 13px;
+    margin-left: -5px;
+}
+
+.server-center button {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: #fff;
+    background: #4EBFAC;
+    border-color: none;
+    border: none;
+    width: 98%;
+    height: 46px;
+    border-radius: 3px;
+    cursor: pointer;
+}
+
+.server-center button:hover {
+    background: #329588;
+}
+
+.server-center button:focus {
+    background: #329588;
+}
+
+
 /* responsive grid */

@media (max-width: 650px) {
@@ -445,4 +570,54 @@ input.toggle-round:checked+label:after {
    #css-delete-action span {
        display: none;
    }
-}
+}
+
+@media (max-width: 720px) {
+    .modal-container {
+        width: 60vw;
+        padding: 40px;
+        min-width: 300px;
+    }
+    .server-center button {
+        margin-right: -12px;
+        width: 100%;
+    }
+    .divider {
+        margin-right: -8px;
+    }
+    .divider hr {
+        margin-left: 6px;
+        margin-right: 6px;
+        width: 43%;
+    }
+    #new-server-container {
+        padding-left: 0px;
+    }
+}
+
+@media (max-width: 600px) {
+    .divider {
+        margin-left: 4%;
+    }
+    .divider hr {
+        margin-left: 2px;
+        margin-right: 2px;
+        width: 40%;
+    }
+}
+
+@media (max-width: 900px) {
+    .settings-card {
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .server-info-right {
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .action {
+        margin-top: 10px;
+    }
+}
--- a/app/renderer/js/components/handle-external-link.js
+++ b/app/renderer/js/components/handle-external-link.js
@@ -0,0 +1,36 @@
+const { shell } = require('electron').remote;
+const LinkUtil = require('../utils/link-util');
+const DomainUtil = require('../utils/domain-util');
+const hiddenWebView = require('../components/hidden-webview');
+
+function handleExternalLink(event) {
+	const { url } = event;
+	const domainPrefix = DomainUtil.getDomain(this.props.index).url;
+
+  // Whitelist URLs which are allowed to be opened in the app
+	const {
+    isInternalUrl: isWhiteListURL,
+    isUploadsUrl: isUploadsURL
+  } = LinkUtil.isInternal(domainPrefix, url);
+
+	if (isWhiteListURL) {
+		event.preventDefault();
+
+    // only open the  pdf, mp3, mp4 etc.. in hidden webview since opening the
+    // image in webview will do nothing and will not save it
+    // whereas the pdf will be saved to user desktop once openened in
+    // in the hidden webview and will not trigger webview reload
+		if (!LinkUtil.isImage(url) && isUploadsURL) {
+			hiddenWebView.loadURL(url);
+			return;
+		}
+
+    // open internal urls inside the current webview.
+		this.$el.loadURL(url);
+	} else {
+		event.preventDefault();
+		shell.openExternal(url);
+	}
+}
+
+module.exports = handleExternalLink;
--- a/app/renderer/js/components/hidden-webview.js
+++ b/app/renderer/js/components/hidden-webview.js
@@ -0,0 +1,9 @@
+// this hidden webview will be used to open pdf url and
+// save it to user's computer without triggering a reload
+// when navigating to pdf url to download it.
+const hiddenWebView = document.createElement('webview');
+hiddenWebView.classList.add('download-webview');
+hiddenWebView.src = 'about:blank';
+document.querySelector('#webviews-container').appendChild(hiddenWebView);
+
+module.exports = hiddenWebView;
--- a/app/renderer/js/components/webview.js
+++ b/app/renderer/js/components/webview.js
@@ -3,13 +3,12 @@
 const path = require('path');
 const fs = require('fs');

-const DomainUtil = require(__dirname + '/../utils/domain-util.js');
 const ConfigUtil = require(__dirname + '/../utils/config-util.js');
 const SystemUtil = require(__dirname + '/../utils/system-util.js');
-const LinkUtil = require(__dirname + '/../utils/link-util.js');
-const { shell, app, dialog } = require('electron').remote;
+const { app, dialog } = require('electron').remote;

 const BaseComponent = require(__dirname + '/../components/base.js');
+const handleExternalLink = require(__dirname + '/../components/handle-external-link.js');

 const shouldSilentWebview = ConfigUtil.getConfigItem('silent');
 class WebView extends BaseComponent {
@@ -46,16 +45,7 @@ class WebView extends BaseComponent {

 	registerListeners() {
 		this.$el.addEventListener('new-window', event => {
-			const { url } = event;
-			const domainPrefix = DomainUtil.getDomain(this.props.index).url;
-
-			if (LinkUtil.isInternal(domainPrefix, url) || url === (domainPrefix + '/')) {
-				event.preventDefault();
-				this.$el.loadURL(url);
-			} else {
-				event.preventDefault();
-				shell.openExternal(url);
-			}
+			handleExternalLink.call(this, event);
 		});

 		if (shouldSilentWebview) {
@@ -130,6 +120,7 @@ class WebView extends BaseComponent {
 		}

 		this.$el.classList.remove('disabled');
+		this.$el.classList.add('active');
 		setTimeout(() => {
 			if (this.props.role === 'server') {
 				this.$el.classList.remove('onload');
@@ -168,6 +159,7 @@ class WebView extends BaseComponent {

 	hide() {
 		this.$el.classList.add('disabled');
+		this.$el.classList.remove('active');
 	}

 	load() {
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -122,7 +122,7 @@ class ServerManagerView {
 			// Remove focus from the settings icon at sidebar bottom
 			this.$settingsButton.classList.remove('active');
 		} else {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		}
 	}

@@ -159,7 +159,7 @@ class ServerManagerView {
 			this.tabs[this.activeTabIndex].webview.reload();
 		});
 		this.$addServerButton.addEventListener('click', () => {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		});
 		this.$settingsButton.addEventListener('click', () => {
 			this.openSettings('General');
@@ -268,10 +268,10 @@ class ServerManagerView {
 	}

 	activateLastTab(index) {
-		// Open last active tab
-		ConfigUtil.setConfigItem('lastActiveTab', index);
-		// Open all the tabs in background
+		// Open all the tabs in background, also activate the tab based on the index
 		this.activateTab(index);
+		// Save last active tab
+		ConfigUtil.setConfigItem('lastActiveTab', index);
 	}

 	activateTab(index, hideOldTab = true) {
@@ -311,7 +311,7 @@ class ServerManagerView {
 			webContents.send('toggle-sidebar', state);
 		});

-		ipcRenderer.on('toogle-silent', (event, state) => {
+		ipcRenderer.on('toggle-silent', (event, state) => {
 			const webviews = document.querySelectorAll('webview');
 			webviews.forEach(webview => {
 				try {
--- a/app/renderer/js/pages/preference/connected-org-section.js
+++ b/app/renderer/js/pages/preference/connected-org-section.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const BaseSection = require(__dirname + '/base-section.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const ServerInfoForm = require(__dirname + '/server-info-form.js');
+
+class ConnectedOrgSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">Connected organizations</div>
+				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
+				<div id="server-info-container"></div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.initServers();
+	}
+
+	initServers() {
+		this.props.$root.innerHTML = '';
+
+		const servers = DomainUtil.getDomains();
+		this.props.$root.innerHTML = this.template();
+		this.$serverInfoContainer = document.getElementById('server-info-container');
+		this.$existingServers = document.getElementById('existing-servers');
+
+		const noServerText = 'All the connected orgnizations will appear here';
+		// Show noServerText if no servers are there otherwise hide it
+		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
+
+		for (let i = 0; i < servers.length; i++) {
+			new ServerInfoForm({
+				$root: this.$serverInfoContainer,
+				server: servers[i],
+				index: i,
+				onChange: this.reloadApp
+			}).init();
+		}
+	}
+
+}
+
+module.exports = ConnectedOrgSection;
--- a/app/renderer/js/pages/preference/create-new-org.js
+++ b/app/renderer/js/pages/preference/create-new-org.js
@@ -1,37 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const shell = require('electron').shell;
-
-class CreateOrganziation extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="setting-row">
-				<div class="setting-description">
-					<span id="open-create-org-link">Or create a new organization on zulipchat.com<i class="material-icons open-tab-button">open_in_new</i></span>
-				</div>
-				<div class="setting-control"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.openCreateNewOrgExternalLink();
-	}
-
-	openCreateNewOrgExternalLink() {
-		const link = 'https://zulipchat.com/beta/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
-		externalCreateNewOrgEl.addEventListener('click', () => {
-			shell.openExternal(link);
-		});
-	}
-}
-
-module.exports = CreateOrganziation;
--- a/app/renderer/js/pages/preference/general-section.js
+++ b/app/renderer/js/pages/preference/general-section.js
@@ -180,7 +180,7 @@ class GeneralSection extends BaseSection {
 				const newValue = !ConfigUtil.getConfigItem('silent', true);
 				ConfigUtil.setConfigItem('silent', newValue);
 				this.updateSilentOption();
-				currentBrowserWindow.send('toogle-silent', newValue);
+				currentBrowserWindow.send('toggle-silent', newValue);
 			}
 		});
 	}
--- a/app/renderer/js/pages/preference/nav.js
+++ b/app/renderer/js/pages/preference/nav.js
@@ -8,7 +8,7 @@ class PreferenceNav extends BaseComponent {

 		this.props = props;

-		this.navItems = ['General', 'Network', 'Servers', 'Shortcuts'];
+		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];

 		this.init();
 	}
--- a/app/renderer/js/pages/preference/new-server-form.js
+++ b/app/renderer/js/pages/preference/new-server-form.js
@@ -2,6 +2,7 @@

 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const shell = require('electron').shell;

 class NewServerForm extends BaseComponent {
 	constructor(props) {
@@ -11,19 +12,26 @@ class NewServerForm extends BaseComponent {

 	template() {
 		return `
-			<div class="settings-card">
-				<div class="server-info-right">
-					<div class="title">URL of Zulip organization</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or chat.your-organization.com"/>
-					</div>
-					<div class="server-info-row">
-						<div class="action blue server-save-action">
-							<i class="material-icons">add_box</i>
-							<span>Add</span>
-						</div>
+			<div class="server-input-container">
+				<div class="title">Organization URL</div>
+				<div class="add-server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="server-center">
+					<div class="server-save-action">
+						<button id="connect">Connect</button>
 					</div>
 				</div>
+				<div class="server-center">
+				<div class="divider">
+					<hr class="left"/>OR<hr class="right" />
+				</div>
+				</div>
+				<div class="server-center">
+				<div class="server-save-action">
+					<button id="open-create-org-link">Create a new organization</button>
+			</div>
+					</div>
 			</div>
 		`;
 	}
@@ -43,17 +51,25 @@ class NewServerForm extends BaseComponent {
 	}

 	submitFormHandler() {
-		this.$saveServerButton.children[1].innerHTML = 'Adding...';
+		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
 				this.props.onChange(this.props.index);
 			});
 		}, errorMessage => {
-			this.$saveServerButton.children[1].innerHTML = 'Add';
+			this.$saveServerButton.children[0].innerHTML = 'Connect';
 			alert(errorMessage);
 		});
 	}

+	openCreateNewOrgExternalLink() {
+		const link = 'https://zulipchat.com/new/';
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+
 	initActions() {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
@@ -65,6 +81,8 @@ class NewServerForm extends BaseComponent {
 				this.submitFormHandler();
 			}
 		});
+		// open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
 	}
 }

--- a/app/renderer/js/pages/preference/preference.js
+++ b/app/renderer/js/pages/preference/preference.js
@@ -7,6 +7,7 @@ const Nav = require(__dirname + '/js/pages/preference/nav.js');
 const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js');
 const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js');
 const NetworkSection = require(__dirname + '/js/pages/preference/network-section.js');
+const ConnectedOrgSection = require(__dirname + '/js/pages/preference/connected-org-section.js');
 const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');

 class PreferenceView extends BaseComponent {
@@ -39,7 +40,7 @@ class PreferenceView extends BaseComponent {
 	handleNavigation(navItem) {
 		this.nav.select(navItem);
 		switch (navItem) {
-			case 'Servers': {
+			case 'AddServer': {
 				this.section = new ServersSection({
 					$root: this.$settingsContainer
 				});
@@ -51,6 +52,12 @@ class PreferenceView extends BaseComponent {
 				});
 				break;
 			}
+			case 'Organizations': {
+				this.section = new ConnectedOrgSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
 			case 'Network': {
 				this.section = new NetworkSection({
 					$root: this.$settingsContainer
--- a/app/renderer/js/pages/preference/server-info-form.js
+++ b/app/renderer/js/pages/preference/server-info-form.js
@@ -1,6 +1,6 @@
 'use strict';
-const {dialog} = require('electron').remote;
-const {ipcRenderer} = require('electron');
+const { dialog } = require('electron').remote;
+const { ipcRenderer } = require('electron');

 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
@@ -16,19 +16,18 @@ class ServerInfoForm extends BaseComponent {
 			<div class="settings-card">
 				<div class="server-info-left">
 					<img class="server-info-icon" src="${this.props.server.icon}"/>
-				</div>
-				<div class="server-info-right">
 					<div class="server-info-row">
 						<span class="server-info-alias">${this.props.server.alias}</span>
 						<i class="material-icons open-tab-button">open_in_new</i>
 					</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" disabled value="${this.props.server.url}"/>
+				</div>
+				<div class="server-info-right">
+					<div class="server-info-row server-url">
+						<span class="server-url-info" title="${this.props.server.url}">${this.props.server.url}</span>
 					</div>
 					<div class="server-info-row">
 						<div class="action red server-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>Delete</span>
+							<span>Disconnect</span>
 						</div>
 					</div>
 				</div>
@@ -44,6 +43,7 @@ class ServerInfoForm extends BaseComponent {
 	initForm() {
 		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
 		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.getElementsByClassName('server-info-icon')[0];
 		this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0];
 		this.$openServerButton = this.$serverInfoForm.getElementsByClassName('open-tab-button')[0];
 		this.props.$root.appendChild(this.$serverInfoForm);
@@ -55,7 +55,7 @@ class ServerInfoForm extends BaseComponent {
 				type: 'warning',
 				buttons: ['YES', 'NO'],
 				defaultId: 0,
-				message: 'Are you sure you want to delete this server?'
+				message: 'Are you sure you want to disconnect this organization?'
 			}, response => {
 				if (response === 0) {
 					DomainUtil.removeDomain(this.props.index);
@@ -71,7 +71,12 @@ class ServerInfoForm extends BaseComponent {
 		this.$serverInfoAlias.addEventListener('click', () => {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
+
+		this.$serverIcon.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
 	}
+
 }

 module.exports = ServerInfoForm;
--- a/app/renderer/js/pages/preference/servers-section.js
+++ b/app/renderer/js/pages/preference/servers-section.js
@@ -1,10 +1,7 @@
 'use strict';

 const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
 const NewServerForm = require(__dirname + '/new-server-form.js');
-const CreateOrganziation = require(__dirname + '/create-new-org.js');

 class ServersSection extends BaseSection {
 	constructor(props) {
@@ -14,13 +11,14 @@ class ServersSection extends BaseSection {

 	template() {
 		return `
-			<div class="settings-pane" id="server-settings-pane">
-				<div class="page-title">Register or login to a Zulip organization to get started</div>
-				<div id="new-server-container"></div>
-				<div class="title" id="existing-servers"></div>
-				<div id="server-info-container"></div>
-				<div id="create-organization-container"></div>
+		<div class="add-server-modal">
+			<div class="modal-container">
+				<div class="settings-pane" id="server-settings-pane">
+					<div class="page-title">Add a Zulip organization</div>
+					<div id="new-server-container"></div>
+				</div>
 			</div>
+		</div>
 		`;
 	}

@@ -31,35 +29,10 @@ class ServersSection extends BaseSection {
 	initServers() {
 		this.props.$root.innerHTML = '';

-		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
 		this.$newServerContainer = document.getElementById('new-server-container');
-		this.$newServerButton = document.getElementById('new-server-action');

-		this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
-		// Show Existing servers if servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing organizations';
 		this.initNewServerForm();
-
-		this.$createOrganizationContainer = document.getElementById('create-organization-container');
-		this.initCreateNewOrganization();
-
-		for (let i = 0; i < servers.length; i++) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server: servers[i],
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-	}
-
-	initCreateNewOrganization() {
-		new CreateOrganziation({
-			$root: this.$createOrganizationContainer
-		}).init();
 	}

 	initNewServerForm() {
--- a/app/renderer/js/pages/preference/shortcuts-section.js
+++ b/app/renderer/js/pages/preference/shortcuts-section.js
@@ -78,14 +78,6 @@ class ShortcutsSection extends BaseSection {
                    <td><kbd>${userOSKey}</kbd><kbd>A</kbd></td>
                    <td>Select All</td>
                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>F</kbd></td>
-                    <td>Find</td>
-                  </tr>
-                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>G</kbd></td>
-                    <td>Find Next</td>
-                  </tr>
                  <tr>
                    <td><kbd>Control</kbd><kbd>${userOSKey}</kbd><kbd>Space</kbd></td>
                    <td>Emoji & Symbols</td>
@@ -121,7 +113,7 @@ class ShortcutsSection extends BaseSection {
                    <td>Actual Size</td>
                  </tr>
                  <tr>
-                    <td><kbd>${userOSKey}</kbd><kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
                    <td>Toggle Sidebar</td>
                  </tr>
                  <tr>
@@ -256,7 +248,7 @@ class ShortcutsSection extends BaseSection {
                    <td>Actual Size</td>
                  </tr>
                  <tr>
-                    <td><kbd>${userOSKey}</kbd> + <kbd>S</kbd></td>
+                    <td><kbd>${userOSKey}</kbd> + <kbd>Shift</kbd> + <kbd>S</kbd></td>
                    <td>Toggle Sidebar</td>
                  </tr>
                  <tr>
--- a/app/renderer/js/preload.js
+++ b/app/renderer/js/preload.js
@@ -4,10 +4,14 @@ const { ipcRenderer } = require('electron');
 const SetupSpellChecker = require('./spellchecker');

 const ConfigUtil = require(__dirname + '/utils/config-util.js');
+const LinkUtil = require(__dirname + '/utils/link-util.js');

 // eslint-disable-next-line import/no-unassigned-import
 require('./notification');

+// Prevent drag and drop event in main process which prevents remote code executaion
+require(__dirname + '/shared/preventdrag.js');
+
 const logout = () => {
 	// Create the menu for the below
 	document.querySelector('.dropdown-toggle').click();
@@ -20,7 +24,7 @@ const shortcut = () => {
 	// Create the menu for the below
 	const node = document.querySelector('a[data-overlay-trigger=keyboard-shortcuts]');
 	// Additional check
-	if (node.text.trim().toLowerCase() === 'keyboard shortcuts') {
+	if (node.text.trim().toLowerCase() === 'keyboard shortcuts (?)') {
 		node.click();
 	} else {
 		// Atleast click the dropdown
@@ -52,6 +56,24 @@ document.addEventListener('DOMContentLoaded', () => {
 			ipcRenderer.send('forward-message', 'reload-viewer');
 		});
 	}
+
+	// Open image attachment link in the lightbox instead of opening in the default browser
+	const { $, lightbox } = window;
+
+	$('#main_div').on('click', '.message_content p a', function (e) {
+		const url = $(this).attr('href');
+
+		if (LinkUtil.isImage(url)) {
+			const $img = $(this).parent().siblings('.message_inline_image').find('img');
+
+			// prevent the image link from opening in a new page.
+			e.preventDefault();
+			// prevent the message compose dialog from happening.
+			e.stopPropagation();
+
+			lightbox.open($img);
+		}
+	});
 });

 // Clean up spellchecker events after you navigate away from this page;
@@ -60,3 +82,10 @@ window.addEventListener('beforeunload', () => {
 	SetupSpellChecker.unsubscribeSpellChecker();
 });

+// electron's globalShortcut can cause unexpected results
+// so adding the reload shortcut in the old-school way
+document.addEventListener('keydown', event => {
+	if (event.code === 'F5') {
+		ipcRenderer.send('forward-message', 'hard-reload');
+	}
+});
--- a/app/renderer/js/shared/preventdrag.js
+++ b/app/renderer/js/shared/preventdrag.js
@@ -0,0 +1,17 @@
+'use strict';
+
+// This is a security fix. Following function prevents drag and drop event in the app
+// so that attackers can't execute any remote code within the app
+// It doesn't affect the compose box so that users can still
+// use drag and drop event to share files etc
+
+const preventDragAndDrop = () => {
+	const preventEvents = ['dragover', 'drop'];
+	preventEvents.forEach(dragEvents => {
+		document.addEventListener(dragEvents, event => {
+			event.preventDefault();
+		});
+	});
+};
+
+preventDragAndDrop();
--- a/app/renderer/js/utils/link-util.js
+++ b/app/renderer/js/utils/link-util.js
@@ -19,7 +19,20 @@ class LinkUtil {
 		const currentDomain = wurl('hostname', currentUrl);
 		const newDomain = wurl('hostname', newUrl);

-		return (currentDomain === newDomain) && newUrl.includes('/#narrow');
+		const sameDomainUrl = (currentDomain === newDomain || newUrl === currentUrl + '/');
+		const isUploadsUrl = newUrl.includes(currentUrl + '/user_uploads/');
+		const isInternalUrl = newUrl.includes('/#narrow') || isUploadsUrl;
+
+		return {
+			isInternalUrl: sameDomainUrl && isInternalUrl,
+			isUploadsUrl
+		};
+	}
+
+	isImage(url) {
+		// test for images extension as well as urls like .png?s=100
+		const isImageUrl = /\.(bmp|gif|jpg|jpeg|png|webp)\?*.*$/i;
+		return isImageUrl.test(url);
 	}
 }

--- a/app/renderer/main.html
+++ b/app/renderer/main.html
@@ -44,4 +44,5 @@
  </div>
 </body>
 <script src="js/main.js"></script>
+<script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/app/renderer/network.html
+++ b/app/renderer/network.html
@@ -17,5 +17,6 @@
      <div id="reconnect">Try now</div>
    </div>
  </body>
-  <script src="js/pages/network.js"></script>  
+  <script src="js/pages/network.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/app/renderer/preference.html
+++ b/app/renderer/preference.html
@@ -13,4 +13,5 @@
    </div>
  </body>
  <script src="js/pages/preference/preference.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/app/translations/bg.json
+++ b/app/translations/bg.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "За Зулип",
+	"Actual Size": "Реален размер",
+	"Back": "обратно",
+	"Close": "Близо",
+	"Copy": "копие",
+	"Cut": "Разрез",
+	"Delete": "Изтрий",
+	"Desktop App Settings": "Настройки за настолни приложения",
+	"Edit": "редактиране",
+	"File": "досие",
+	"Forward": "напред",
+	"Hard Reload": "Трудно презареждане",
+	"Help": "Помогне",
+	"History": "история",
+	"Keyboard Shortcuts": "Комбинация от клавиши",
+	"Log Out": "Излез от профила си",
+	"Minimize": "Минимизиране",
+	"Paste": "паста",
+	"Paste and Match Style": "Поставяне и съвпадение на стила",
+	"Quit": "напускам",
+	"Redo": "ремонтирам",
+	"Reload": "Презареди",
+	"Report an issue...": "Подаване на сигнал за проблем ...",
+	"Reset App Settings": "Нулирайте настройките на приложението",
+	"Select All": "Избери всички",
+	"Show App Logs": "Показване на регистрационните файлове на приложения",
+	"Toggle DevTools for Active Tab": "Превключете DevTools за активен раздел",
+	"Toggle DevTools for Zulip App": "Превключете DevTools за Zulip App",
+	"Toggle Full Screen": "Превключване на цял екран",
+	"Toggle Sidebar": "Превключване на страничната лента",
+	"Toggle Tray Icon": "Превключване на иконата на тавата",
+	"Undo": "премахвам",
+	"View": "изглед",
+	"Window": "прозорец",
+	"Zoom In": "Увеличавам",
+	"Zoom Out": "Отдалечавам",
+	"Zulip Help": "Помощ за Zulip"
+}
--- a/app/translations/cs.json
+++ b/app/translations/cs.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "O společnosti Zulip",
+	"Actual Size": "Aktuální velikost",
+	"Back": "Zadní",
+	"Close": "Zavřít",
+	"Copy": "kopírovat",
+	"Cut": "Střih",
+	"Delete": "Vymazat",
+	"Desktop App Settings": "Nastavení aplikace Desktop",
+	"Edit": "Upravit",
+	"File": "Soubor",
+	"Forward": "Vpřed",
+	"Hard Reload": "Hard Reload",
+	"Help": "Pomoc",
+	"History": "Dějiny",
+	"Keyboard Shortcuts": "Klávesové zkratky",
+	"Log Out": "Odhlásit se",
+	"Minimize": "Minimalizujte",
+	"Paste": "Vložit",
+	"Paste and Match Style": "Vložit a přizpůsobit styl",
+	"Quit": "Přestat",
+	"Redo": "Předělat",
+	"Reload": "Znovu načíst",
+	"Report an issue...": "Nahlásit problém...",
+	"Reset App Settings": "Obnovit nastavení aplikace",
+	"Select All": "Vybrat vše",
+	"Show App Logs": "Zobrazit protokoly aplikace",
+	"Toggle DevTools for Active Tab": "Přepínač DevTools pro aktivní kartu",
+	"Toggle DevTools for Zulip App": "Přepnout nástroj DevTools pro aplikaci Zulip App",
+	"Toggle Full Screen": "Přepnout na celou obrazovku",
+	"Toggle Sidebar": "Přepnout postranní panel",
+	"Toggle Tray Icon": "Přepnout ikonu zásobníku",
+	"Undo": "vrátit",
+	"View": "Pohled",
+	"Window": "Okno",
+	"Zoom In": "Přiblížit",
+	"Zoom Out": "Oddálit",
+	"Zulip Help": "Zulip Nápověda"
+}
--- a/app/translations/de.json
+++ b/app/translations/de.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Über Zulip",
+	"Actual Size": "Tatsächliche Größe",
+	"Back": "Zurück",
+	"Close": "Schließen",
+	"Copy": "Kopieren",
+	"Cut": "Schnitt",
+	"Delete": "Löschen",
+	"Desktop App Settings": "Desktop App Einstellungen",
+	"Edit": "Bearbeiten",
+	"File": "Datei",
+	"Forward": "Nach vorne",
+	"Hard Reload": "Hard Reload",
+	"Help": "Hilfe",
+	"History": "Geschichte",
+	"Keyboard Shortcuts": "Tastatürkürzel",
+	"Log Out": "Ausloggen",
+	"Minimize": "Minimieren",
+	"Paste": "Einfügen",
+	"Paste and Match Style": "Einfügen und Anpassen von Stilen",
+	"Quit": "Verlassen",
+	"Redo": "Wiederholen",
+	"Reload": "Neu laden",
+	"Report an issue...": "Ein Problem melden...",
+	"Reset App Settings": "App-Einstellungen zurücksetzen",
+	"Select All": "Wählen Sie Alle",
+	"Show App Logs": "App-Logs anzeigen",
+	"Toggle DevTools for Active Tab": "Schalten Sie DevTools für Active Tab ein",
+	"Toggle DevTools for Zulip App": "Umschalt DevTools für Zulip App",
+	"Toggle Full Screen": "Vollbild umschalten",
+	"Toggle Sidebar": "Toggle Seitenleiste",
+	"Toggle Tray Icon": "Toggle Tray-Symbol",
+	"Undo": "Rückgängig machen",
+	"View": "Aussicht",
+	"Window": "Fenster",
+	"Zoom In": "Hineinzoomen",
+	"Zoom Out": "Rauszoomen",
+	"Zulip Help": "Zulip Hilfe"
+}
--- a/app/translations/en.json
+++ b/app/translations/en.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "About Zulip",
+	"Actual Size": "Actual Size",
+	"Back": "Back",
+	"Close": "Close",
+	"Copy": "Copy",
+	"Cut": "Cut",
+	"Delete": "Delete",
+	"Desktop App Settings": "Desktop App Settings",
+	"Edit": "Edit",
+	"File": "File",
+	"Forward": "Forward",
+	"Hard Reload": "Hard Reload",
+	"Help": "Help",
+	"History": "History",
+	"Keyboard Shortcuts": "Keyboard Shortcuts",
+	"Log Out": "Log Out",
+	"Minimize": "Minimize",
+	"Paste": "Paste",
+	"Paste and Match Style": "Paste and Match Style",
+	"Quit": "Quit",
+	"Redo": "Redo",
+	"Reload": "Reload",
+	"Report an issue...": "Report an issue...",
+	"Reset App Settings": "Reset App Settings",
+	"Select All": "Select All",
+	"Show App Logs": "Show App Logs",
+	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
+	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
+	"Toggle Full Screen": "Toggle Full Screen",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Toggle Tray Icon",
+	"Undo": "Undo",
+	"View": "View",
+	"Window": "Window",
+	"Zoom In": "Zoom In",
+	"Zoom Out": "Zoom Out",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/es.json
+++ b/app/translations/es.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Acerca de Zulip",
+	"Actual Size": "Tamaño real",
+	"Back": "Espalda",
+	"Close": "Cerca",
+	"Copy": "Dupdo",
+	"Cut": "Cortar",
+	"Delete": "Borrar",
+	"Desktop App Settings": "Configuración de la aplicación de escritorio",
+	"Edit": "Editar",
+	"File": "Archivo",
+	"Forward": "Adelante",
+	"Hard Reload": "Recargar duro",
+	"Help": "Ayuda",
+	"History": "Historia",
+	"Keyboard Shortcuts": "Atajos de teclado",
+	"Log Out": "Cerrar sesión",
+	"Minimize": "Minimizar",
+	"Paste": "Pegar",
+	"Paste and Match Style": "Pegar y combinar estilo",
+	"Quit": "Dejar",
+	"Redo": "Rehacer",
+	"Reload": "Recargar",
+	"Report an issue...": "Reportar un problema...",
+	"Reset App Settings": "Restablecer configuraciones",
+	"Select All": "Seleccionar todo",
+	"Show App Logs": "Mostrar registros de aplicaciones",
+	"Toggle DevTools for Active Tab": "Alternar DevTools para Active Tab",
+	"Toggle DevTools for Zulip App": "Alternar DevTools para la aplicación Zulip",
+	"Toggle Full Screen": "Alternar pantalla completa",
+	"Toggle Sidebar": "Alternar barra lateral",
+	"Toggle Tray Icon": "Alternar el icono de la bandeja",
+	"Undo": "Deshacer",
+	"View": "Ver",
+	"Window": "Ventana",
+	"Zoom In": "Acercarse",
+	"Zoom Out": "Disminuir el zoom",
+	"Zulip Help": "Ayuda de Zulip"
+}
--- a/app/translations/fr.json
+++ b/app/translations/fr.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "À propos de Zulip",
+	"Actual Size": "Taille actuelle",
+	"Back": "Arrière",
+	"Close": "Fermer",
+	"Copy": "Copie",
+	"Cut": "Couper",
+	"Delete": "Effacer",
+	"Desktop App Settings": "Paramètres de l'application de bureau",
+	"Edit": "modifier",
+	"File": "Fichier",
+	"Forward": "Vers l'avant",
+	"Hard Reload": "Rechargement dur",
+	"Help": "Aidez-moi",
+	"History": "Histoire",
+	"Keyboard Shortcuts": "Raccourcis clavier",
+	"Log Out": "Connectez - Out",
+	"Minimize": "Minimiser",
+	"Paste": "Coller",
+	"Paste and Match Style": "Coller et assortir le style",
+	"Quit": "Quitter",
+	"Redo": "Refaire",
+	"Reload": "Recharger",
+	"Report an issue...": "Signaler un problème...",
+	"Reset App Settings": "Réinitialiser les paramètres",
+	"Select All": "Tout sélectionner",
+	"Show App Logs": "Afficher les journaux d'applications",
+	"Toggle DevTools for Active Tab": "Basculer DevTools pour l'onglet actif",
+	"Toggle DevTools for Zulip App": "Basculer DevTools pour l'application Zulip",
+	"Toggle Full Screen": "Basculer en plein écran",
+	"Toggle Sidebar": "Basculer la barre latérale",
+	"Toggle Tray Icon": "Toggle Tray Icône",
+	"Undo": "annuler",
+	"View": "Vue",
+	"Window": "Fenêtre",
+	"Zoom In": "Agrandir",
+	"Zoom Out": "Dézoomer",
+	"Zulip Help": "Aide Zulip"
+}
--- a/app/translations/hi.json
+++ b/app/translations/hi.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Zulip के बारे में",
+	"Actual Size": "वास्तविक आकार",
+	"Back": "वापस",
+	"Close": "बंद करे",
+	"Copy": "प्रतिलिपि",
+	"Cut": "कट गया",
+	"Delete": "हटाना",
+	"Desktop App Settings": "डेस्कटॉप ऐप सेटिंग्स",
+	"Edit": "संपादित करें",
+	"File": "फ़ाइल",
+	"Forward": "आगे",
+	"Hard Reload": "कठिन पुन: लोड करें",
+	"Help": "मदद",
+	"History": "इतिहास",
+	"Keyboard Shortcuts": "कुंजीपटल अल्प मार्ग",
+	"Log Out": "लोग आउट",
+	"Minimize": "छोटा करना",
+	"Paste": "चिपकाएं",
+	"Paste and Match Style": "चिपकाएं और शैली का मिलान करें",
+	"Quit": "छोड़ना",
+	"Redo": "फिर से करना",
+	"Reload": "सीमा से अधिक लादना",
+	"Report an issue...": "मामले की रिपोर्ट करें...",
+	"Reset App Settings": "ऐप सेटिंग्स रीसेट करें",
+	"Select All": "सभी का चयन करे",
+	"Show App Logs": "ऐप लॉग दिखाएं",
+	"Toggle DevTools for Active Tab": "सक्रिय टैब के लिए DevTools टॉगल करें",
+	"Toggle DevTools for Zulip App": "Zulip ऐप के लिए DevTools टॉगल करें",
+	"Toggle Full Screen": "पूर्णस्क्रीन चालू करें",
+	"Toggle Sidebar": "साइडबार टॉगल करें",
+	"Toggle Tray Icon": "ट्रे आइकन टॉगल करें",
+	"Undo": "पूर्ववत करें",
+	"View": "राय",
+	"Window": "खिड़की",
+	"Zoom In": "ज़ूम इन",
+	"Zoom Out": "ज़ूम आउट",
+	"Zulip Help": "Zulip सहायता"
+}
--- a/app/translations/hu.json
+++ b/app/translations/hu.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "A Zulipról",
+	"Actual Size": "Valódi méret",
+	"Back": "Hát",
+	"Close": "Bezárás",
+	"Copy": "Másolat",
+	"Cut": "Vágott",
+	"Delete": "Töröl",
+	"Desktop App Settings": "Asztali alkalmazások beállításai",
+	"Edit": "szerkesztése",
+	"File": "fájl",
+	"Forward": "Előre",
+	"Hard Reload": "Hard Reload",
+	"Help": "Segítség",
+	"History": "Történelem",
+	"Keyboard Shortcuts": "Gyorsbillentyűket",
+	"Log Out": "Kijelentkezés",
+	"Minimize": "Kis méret",
+	"Paste": "Paszta",
+	"Paste and Match Style": "Beillesztés és stílusok illesztése",
+	"Quit": "quit",
+	"Redo": "Újra",
+	"Reload": "Reload",
+	"Report an issue...": "Hibajelentés ...",
+	"Reset App Settings": "Az alkalmazás beállításainak visszaállítása",
+	"Select All": "Mindet kiválaszt",
+	"Show App Logs": "Alkalmazásnaplók megjelenítése",
+	"Toggle DevTools for Active Tab": "A DevTools aktiválása az Aktív laphoz",
+	"Toggle DevTools for Zulip App": "Kapcsolja a DevTools-ot a Zulip App-hoz",
+	"Toggle Full Screen": "Teljes képernyőre váltás",
+	"Toggle Sidebar": "Oldalsáv átkapcsolása",
+	"Toggle Tray Icon": "Tálcaikon átkapcsolása",
+	"Undo": "kibont",
+	"View": "Kilátás",
+	"Window": "Ablak",
+	"Zoom In": "Nagyítás",
+	"Zoom Out": "Kicsinyítés",
+	"Zulip Help": "Zulip Súgó"
+}
--- a/app/translations/id.json
+++ b/app/translations/id.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Tentang Zulip",
+	"Actual Size": "Ukuran sebenarnya",
+	"Back": "Kembali",
+	"Close": "Dekat",
+	"Copy": "Salinan",
+	"Cut": "Memotong",
+	"Delete": "Menghapus",
+	"Desktop App Settings": "Setelan Aplikasi Desktop",
+	"Edit": "Edit",
+	"File": "Mengajukan",
+	"Forward": "Meneruskan",
+	"Hard Reload": "Hard Reload",
+	"Help": "Membantu",
+	"History": "Sejarah",
+	"Keyboard Shortcuts": "Cara pintas keyboard",
+	"Log Out": "Keluar",
+	"Minimize": "Memperkecil",
+	"Paste": "Pasta",
+	"Paste and Match Style": "Tempel dan Cocokkan Gaya",
+	"Quit": "Berhenti",
+	"Redo": "Mengulangi",
+	"Reload": "Reload",
+	"Report an issue...": "Laporkan masalah ...",
+	"Reset App Settings": "Setel ulang Pengaturan Aplikasi",
+	"Select All": "Pilih Semua",
+	"Show App Logs": "Tampilkan log aplikasi",
+	"Toggle DevTools for Active Tab": "Toggle DevTools untuk Tab Aktif",
+	"Toggle DevTools for Zulip App": "Toggle DevTools untuk Aplikasi Zulip",
+	"Toggle Full Screen": "Toggle Full Screen",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Toggle Tray Icon",
+	"Undo": "Membuka",
+	"View": "Melihat",
+	"Window": "Jendela",
+	"Zoom In": "Perbesar",
+	"Zoom Out": "Zoom Out",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/ja.json
+++ b/app/translations/ja.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "チューリップについて",
+	"Actual Size": "実際のサイズ",
+	"Back": "バック",
+	"Close": "閉じる",
+	"Copy": "コピー",
+	"Cut": "カット",
+	"Delete": "削除",
+	"Desktop App Settings": "デスクトップアプリケーションの設定",
+	"Edit": "編集",
+	"File": "ファイル",
+	"Forward": "フォワード",
+	"Hard Reload": "ハードリロード",
+	"Help": "助けて",
+	"History": "歴史",
+	"Keyboard Shortcuts": "キーボードショートカット",
+	"Log Out": "ログアウト",
+	"Minimize": "最小化する",
+	"Paste": "ペースト",
+	"Paste and Match Style": "スタイルの貼り付けと一致",
+	"Quit": "終了する",
+	"Redo": "やり直し",
+	"Reload": "リロード",
+	"Report an issue...": "問題を報告する...",
+	"Reset App Settings": "アプリの設定をリセットする",
+	"Select All": "すべて選択",
+	"Show App Logs": "アプリケーションログを表示する",
+	"Toggle DevTools for Active Tab": "DevTools for Activeタブを切り替える",
+	"Toggle DevTools for Zulip App": "Zulip AppのDevToolsの切り替え",
+	"Toggle Full Screen": "フルスクリーン切り替え",
+	"Toggle Sidebar": "サイドバーの切り替え",
+	"Toggle Tray Icon": "トレイアイコンを切り替える",
+	"Undo": "元に戻す",
+	"View": "ビュー",
+	"Window": "窓",
+	"Zoom In": "ズームイン",
+	"Zoom Out": "ズームアウトする",
+	"Zulip Help": "チューリップヘルプ"
+}
--- a/app/translations/ko.json
+++ b/app/translations/ko.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "튤립 소개",
+	"Actual Size": "실제 크기",
+	"Back": "뒤로",
+	"Close": "닫기",
+	"Copy": "부",
+	"Cut": "절단",
+	"Delete": "지우다",
+	"Desktop App Settings": "데스크톱 앱 설정",
+	"Edit": "편집하다",
+	"File": "파일",
+	"Forward": "앞으로",
+	"Hard Reload": "하드 다시로드",
+	"Help": "도움",
+	"History": "역사",
+	"Keyboard Shortcuts": "키보드 단축키",
+	"Log Out": "로그 아웃",
+	"Minimize": "최소화",
+	"Paste": "풀",
+	"Paste and Match Style": "붙여 넣기 및 스타일 일치",
+	"Quit": "떠나다",
+	"Redo": "다시 하다",
+	"Reload": "다시로드",
+	"Report an issue...": "문제 신고 ...",
+	"Reset App Settings": "앱 설정 재설정",
+	"Select All": "모두 선택",
+	"Show App Logs": "앱 로그 표시",
+	"Toggle DevTools for Active Tab": "DevTools for Active Tab 토글",
+	"Toggle DevTools for Zulip App": "Zulip App 용 DevTools 토글",
+	"Toggle Full Screen": "전체 화면 토글",
+	"Toggle Sidebar": "사이드 바 전환",
+	"Toggle Tray Icon": "트레이 아이콘 토글",
+	"Undo": "끄르다",
+	"View": "전망",
+	"Window": "창문",
+	"Zoom In": "확대",
+	"Zoom Out": "축소",
+	"Zulip Help": "튤립 도움말"
+}
--- a/app/translations/ml.json
+++ b/app/translations/ml.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "സുലിപ്",
+	"Actual Size": "യഥാർത്ഥ വലുപ്പം",
+	"Back": "തിരികെ",
+	"Close": "അടയ്ക്കുക",
+	"Copy": "പകർത്തുക",
+	"Cut": "മുറിക്കുക",
+	"Delete": "ഇല്ലാതാക്കുക",
+	"Desktop App Settings": "ഡെസ്ക്ടോപ്പ് അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ",
+	"Edit": "എഡിറ്റുചെയ്യുക",
+	"File": "ഫയൽ",
+	"Forward": "മുന്നോട്ട്",
+	"Hard Reload": "ഹാർഡ് റീലോഡ്",
+	"Help": "സഹായിക്കൂ",
+	"History": "ചരിത്രം",
+	"Keyboard Shortcuts": "കീബോർഡ് കുറുക്കുവഴികൾ",
+	"Log Out": "ലോഗ് ഔട്ട്",
+	"Minimize": "ചെറുതാക്കുക",
+	"Paste": "പേസ്റ്റ്",
+	"Paste and Match Style": "ശൈലി ഒട്ടിക്കുകയും പൊരുത്തപ്പെടുത്തുകയും ചെയ്യുക",
+	"Quit": "പുറത്തുകടക്കുക",
+	"Redo": "വീണ്ടും ചെയ്യുക",
+	"Reload": "വീണ്ടും ലോഡുചെയ്യുക",
+	"Report an issue...": "ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക ...",
+	"Reset App Settings": "അപ്ലിക്കേഷൻ ക്രമീകരണങ്ങൾ പുനഃസജ്ജമാക്കുക",
+	"Select All": "എല്ലാം തിരഞ്ഞെടുക്കുക",
+	"Show App Logs": "അപ്ലിക്കേഷൻ ലോഗുകൾ കാണിക്കുക",
+	"Toggle DevTools for Active Tab": "സജീവ ടാബിനായി DevTools ടോഗിൾ ചെയ്യുക",
+	"Toggle DevTools for Zulip App": "സുലിപ്പ് ആപ്ലിക്കേഷനായി DevTools ടോഗിൾ ചെയ്യുക",
+	"Toggle Full Screen": "പൂർണ്ണ സ്ക്രീൻ ടോഗിൾ ചെയ്യുക",
+	"Toggle Sidebar": "സൈഡ്ബാർ ടോഗിൾ ചെയ്യുക",
+	"Toggle Tray Icon": "ട്രേ ഐക്കൺ ടോഗിൾ ചെയ്യുക",
+	"Undo": "പഴയപടിയാക്കുക",
+	"View": "കാണുക",
+	"Window": "ജാലകം",
+	"Zoom In": "വലുതാക്കുക",
+	"Zoom Out": "സൂം ഔട്ട്",
+	"Zulip Help": "സുലിപ്പ് സഹായം"
+}
--- a/app/translations/nl.json
+++ b/app/translations/nl.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Over Zulip",
+	"Actual Size": "Daadwerkelijke grootte",
+	"Back": "Terug",
+	"Close": "Dichtbij",
+	"Copy": "Kopiëren",
+	"Cut": "Besnoeiing",
+	"Delete": "Verwijder",
+	"Desktop App Settings": "Desktop-app-instellingen",
+	"Edit": "Bewerk",
+	"File": "het dossier",
+	"Forward": "Vooruit",
+	"Hard Reload": "Moeilijke herladen",
+	"Help": "Helpen",
+	"History": "Geschiedenis",
+	"Keyboard Shortcuts": "Toetsenbord sneltoetsen",
+	"Log Out": "Uitloggen",
+	"Minimize": "verkleinen",
+	"Paste": "Plakken",
+	"Paste and Match Style": "Plak en match stijl",
+	"Quit": "ophouden",
+	"Redo": "Opnieuw doen",
+	"Reload": "vernieuwen",
+	"Report an issue...": "Een probleem melden...",
+	"Reset App Settings": "App-instellingen opnieuw instellen",
+	"Select All": "Selecteer alles",
+	"Show App Logs": "App-logs weergeven",
+	"Toggle DevTools for Active Tab": "DevTools voor actieve tabblad omschakelen",
+	"Toggle DevTools for Zulip App": "DevTools voor Zulip-app omschakelen",
+	"Toggle Full Screen": "Volledig scherm activeren",
+	"Toggle Sidebar": "Zijbalk verschuiven",
+	"Toggle Tray Icon": "Pictogram Lade wisselen",
+	"Undo": "ongedaan maken",
+	"View": "Uitzicht",
+	"Window": "Venster",
+	"Zoom In": "In zoomen",
+	"Zoom Out": "Uitzoomen",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/pl.json
+++ b/app/translations/pl.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "O Zulip",
+	"Actual Size": "Rzeczywisty rozmiar",
+	"Back": "Plecy",
+	"Close": "Blisko",
+	"Copy": "Kopiuj",
+	"Cut": "Ciąć",
+	"Delete": "Kasować",
+	"Desktop App Settings": "Ustawienia aplikacji na komputer",
+	"Edit": "Edytować",
+	"File": "Plik",
+	"Forward": "Naprzód",
+	"Hard Reload": "Trudne przeładowanie",
+	"Help": "Wsparcie",
+	"History": "Historia",
+	"Keyboard Shortcuts": "Skróty klawiszowe",
+	"Log Out": "Wyloguj",
+	"Minimize": "Zminimalizować",
+	"Paste": "Pasta",
+	"Paste and Match Style": "Wklej i dopasuj styl",
+	"Quit": "Porzucić",
+	"Redo": "Przerobić",
+	"Reload": "Przeładować",
+	"Report an issue...": "Zgłoś problem...",
+	"Reset App Settings": "Zresetuj ustawienia aplikacji",
+	"Select All": "Zaznacz wszystko",
+	"Show App Logs": "Pokaż dzienniki aplikacji",
+	"Toggle DevTools for Active Tab": "Przełącz DevTools dla Active Tab",
+	"Toggle DevTools for Zulip App": "Przełącz DevTools dla aplikacji Zulip",
+	"Toggle Full Screen": "Przełącz tryb pełnoekranowy",
+	"Toggle Sidebar": "Przełącz boczny pasek",
+	"Toggle Tray Icon": "Przełącz ikonę tacy",
+	"Undo": "Cofnij",
+	"View": "Widok",
+	"Window": "Okno",
+	"Zoom In": "Zbliżenie",
+	"Zoom Out": "Pomniejsz",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/pt.json
+++ b/app/translations/pt.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Sobre Zulip",
+	"Actual Size": "Tamanho atual",
+	"Back": "Costas",
+	"Close": "Fechar",
+	"Copy": "cópia de",
+	"Cut": "Cortar",
+	"Delete": "Excluir",
+	"Desktop App Settings": "Configurações da aplicação Desktop",
+	"Edit": "Editar",
+	"File": "Arquivo",
+	"Forward": "frente",
+	"Hard Reload": "Hard Recargar",
+	"Help": "Socorro",
+	"History": "História",
+	"Keyboard Shortcuts": "Atalhos do teclado",
+	"Log Out": "Sair",
+	"Minimize": "Minimizar",
+	"Paste": "Colar",
+	"Paste and Match Style": "Estilo de colar e combinar",
+	"Quit": "Sair",
+	"Redo": "Refazer",
+	"Reload": "recarregar",
+	"Report an issue...": "Relatar um problema ...",
+	"Reset App Settings": "Redefinir as configurações da aplicação",
+	"Select All": "Selecionar tudo",
+	"Show App Logs": "Mostrar logs de aplicativos",
+	"Toggle DevTools for Active Tab": "Toggle DevTools for Active Tab",
+	"Toggle DevTools for Zulip App": "Toggle DevTools for Zulip App",
+	"Toggle Full Screen": "Alternar para o modo tela cheia",
+	"Toggle Sidebar": "Toggle Sidebar",
+	"Toggle Tray Icon": "Ícone Toggle Tray",
+	"Undo": "Desfazer",
+	"View": "Visão",
+	"Window": "Janela",
+	"Zoom In": "Mais Zoom",
+	"Zoom Out": "Reduzir o zoom",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/ru.json
+++ b/app/translations/ru.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "О пользователе Zulip",
+	"Actual Size": "Фактический размер",
+	"Back": "назад",
+	"Close": "Закрыть",
+	"Copy": "копия",
+	"Cut": "Порез",
+	"Delete": "Удалить",
+	"Desktop App Settings": "Настройки настольных приложений",
+	"Edit": "редактировать",
+	"File": "файл",
+	"Forward": "Вперед",
+	"Hard Reload": "Hard Reload",
+	"Help": "Помогите",
+	"History": "история",
+	"Keyboard Shortcuts": "Горячие клавиши",
+	"Log Out": "Выйти",
+	"Minimize": "Минимизировать",
+	"Paste": "Вставить",
+	"Paste and Match Style": "Стиль вставки и совпадения",
+	"Quit": "Уволиться",
+	"Redo": "переделывать",
+	"Reload": "перезагружать",
+	"Report an issue...": "Сообщить о проблеме...",
+	"Reset App Settings": "Сбросить настройки приложения",
+	"Select All": "Выбрать все",
+	"Show App Logs": "Показать журналы приложений",
+	"Toggle DevTools for Active Tab": "Toggle DevTools для активной вкладки",
+	"Toggle DevTools for Zulip App": "Toggle DevTools для приложения Zulip",
+	"Toggle Full Screen": "Включить полноэкранный режим",
+	"Toggle Sidebar": "Переключить боковую панель",
+	"Toggle Tray Icon": "Иконка Toggle Tray",
+	"Undo": "расстегивать",
+	"View": "Посмотреть",
+	"Window": "Окно",
+	"Zoom In": "Приблизить",
+	"Zoom Out": "Уменьшить",
+	"Zulip Help": "Zulip Help"
+}
--- a/app/translations/sr.json
+++ b/app/translations/sr.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "О Зулипу",
+	"Actual Size": "Стварна величина",
+	"Back": "Назад",
+	"Close": "Близу",
+	"Copy": "Копирај",
+	"Cut": "Цут",
+	"Delete": "Избриши",
+	"Desktop App Settings": "Подешавања за десктоп апликације",
+	"Edit": "Уредити",
+	"File": "Филе",
+	"Forward": "Напријед",
+	"Hard Reload": "Хард Релоад",
+	"Help": "Помоћ",
+	"History": "Историја",
+	"Keyboard Shortcuts": "Пречице на тастатури",
+	"Log Out": "Одјавити се",
+	"Minimize": "Минимизирај",
+	"Paste": "Пасте",
+	"Paste and Match Style": "Пасте и Матцх Стиле",
+	"Quit": "Одустати",
+	"Redo": "Поново",
+	"Reload": "Освежи",
+	"Report an issue...": "Пријавите проблем...",
+	"Reset App Settings": "Поново поставите подешавања апликације",
+	"Select All": "Изабери све",
+	"Show App Logs": "Прикажи евиденције апликација",
+	"Toggle DevTools for Active Tab": "Пребаците ДевТоолс за Ацтиве Таб",
+	"Toggle DevTools for Zulip App": "Пребаците ДевТоолс за Зулип Апп",
+	"Toggle Full Screen": "Пребаците цео екран",
+	"Toggle Sidebar": "Пребаците бочну траку",
+	"Toggle Tray Icon": "Тоггле Траи Ицон",
+	"Undo": "Ундо",
+	"View": "Поглед",
+	"Window": "Прозор",
+	"Zoom In": "Увеличати",
+	"Zoom Out": "Зумирај",
+	"Zulip Help": "Зулип Хелп"
+}
--- a/app/translations/ta.json
+++ b/app/translations/ta.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "ஜுலிப் பற்றி",
+	"Actual Size": "உண்மையான அளவு",
+	"Back": "மீண்டும்",
+	"Close": "நெருக்கமான",
+	"Copy": "நகல்",
+	"Cut": "வெட்டு",
+	"Delete": "அழி",
+	"Desktop App Settings": "டெஸ்க்டாப் பயன்பாட்டு அமைப்புகள்",
+	"Edit": "தொகு",
+	"File": "கோப்பு",
+	"Forward": "முன்னோக்கி",
+	"Hard Reload": "கடினமாக மீண்டும் ஏற்றவும்",
+	"Help": "உதவி",
+	"History": "வரலாறு",
+	"Keyboard Shortcuts": "விசைப்பலகை குறுக்குவழிகள்",
+	"Log Out": "வெளியேறு",
+	"Minimize": "குறைத்தல்",
+	"Paste": "ஒட்டு",
+	"Paste and Match Style": "உடை ஒட்டு மற்றும் பொருந்தும்",
+	"Quit": "விட்டுவிட",
+	"Redo": "மீண்டும் செய்",
+	"Reload": "ஏற்றவும்",
+	"Report an issue...": "சிக்கலைப் புகார ...",
+	"Reset App Settings": "பயன்பாட்டு அமைப்புகளை மீட்டமைக்கவும்",
+	"Select All": "அனைத்தையும் தெரிவுசெய்",
+	"Show App Logs": "பயன்பாட்டு பதிவுகள் காட்டு",
+	"Toggle DevTools for Active Tab": "செயலில் தாவலுக்கு DevTools ஐ மாற்று",
+	"Toggle DevTools for Zulip App": "Zulip பயன்பாட்டிற்கான DevTools ஐ மாற்று",
+	"Toggle Full Screen": "மாற்று முழுத்திரை",
+	"Toggle Sidebar": "பக்கப்பட்டி மாறு",
+	"Toggle Tray Icon": "ட்ரே ஐகானை மாற்று",
+	"Undo": "செயல்தவிர்",
+	"View": "காண்க",
+	"Window": "ஜன்னல்",
+	"Zoom In": "பெரிதாக்க",
+	"Zoom Out": "பெரிதாக்குக",
+	"Zulip Help": "Zulip உதவி"
+}
--- a/app/translations/tr.json
+++ b/app/translations/tr.json
@@ -0,0 +1,39 @@
+{
+	"About Zulip": "Zulip Hakkinda",
+	"Actual Size": "Gerçek boyutu",
+	"Back": "Geri",
+	"Close": "Kapat",
+	"Copy": "kopya",
+	"Cut": "Kesmek",
+	"Delete": "silmek",
+	"Desktop App Settings": "Masaüstü Uygulama Ayarları",
+	"Edit": "Düzenle",
+	"File": "Dosya",
+	"Forward": "ileri",
+	"Hard Reload": "Sert Yeniden Yükle",
+	"Help": "yardım et",
+	"History": "Tarihçe",
+	"Keyboard Shortcuts": "Klavye kısayolları",
+	"Log Out": "Çıkış Yap",
+	"Minimize": "küçültmek",
+	"Paste": "Yapıştırmak",
+	"Paste and Match Style": "Stili Yapıştır ve Eşleştir",
+	"Quit": "çıkmak",
+	"Redo": "yeniden yapmak",
+	"Reload": "Tekrar yükle",
+	"Report an issue...": "Bir sorun bildir ...",
+	"Reset App Settings": "Uygulama Ayarlarını Sıfırla",
+	"Select All": "Hepsini seç",
+	"Show App Logs": "Uygulama Günlüğlerini Göster",
+	"Toggle DevTools for Active Tab": "Aktif Sekme İçin DevTools'a Geçiş Yap",
+	"Toggle DevTools for Zulip App": "Zulip App için DevTools'a Geçiş Yap",
+	"Toggle Full Screen": "Tam ekrana geç",
+	"Toggle Sidebar": "Kenar Çubuğunu Aç / Kapat",
+	"Toggle Tray Icon": "Tepsi Simgesini Aç / Kapat",
+	"Undo": "Geri alma",
+	"View": "Görünüm",
+	"Window": "pencere",
+	"Zoom In": "Yakınlaştır",
+	"Zoom Out": "Uzaklaştır",
+	"Zulip Help": "Zulip Yardımı"
+}
--- a/development.md
+++ b/development.md
@@ -15,6 +15,7 @@ To build and run the app from source, you'll need the following:
 * [Python](https://www.python.org/downloads/release/python-2713/)
  (v2.7.x recommended)
 * A C++ compiler compatible with C++11
+* Linux users also need [Snapcraft](https://snapcraft.io/)
 * Development headers for the libXext, libXtst, and libxkbfile libraries

 ### Debian/Ubuntu and friends
@@ -25,7 +26,7 @@ manager (see [here][nodesource-install] for more on the first command):

 ```sh
 $ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-$ sudo apt install git nodejs python build-essential libxext-dev libxtst-dev libxkbfile-dev
+$ sudo apt install git nodejs python build-essential snapcraft libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4
 ```

 [nodesource-install]: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
@@ -76,7 +77,7 @@ This command will produce distributable packages or installers for the
 operating system you're running on:
 * on Windows, a Windows installer file
 * on macOS, a `.dmg` file
-* on Linux, a plain `.zip` file as well as a `.deb` file and an
+* on Linux, a plain `.zip` file as well as a `.deb` file, `.snap` file and an
  `AppImage` file.
 To generate all three types, you will need all three operating
 systems.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.9.0",
  "main": "./app/main",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
@@ -22,7 +22,7 @@
  },
  "scripts": {
    "start": "electron app --disable-http-cache --no-electron-connect",
-    "reinstall": "./tools/reinstall-node-modules",
+    "reinstall": "node ./tools/reinstall-node-modules.js",
    "postinstall": "electron-builder install-app-deps",
    "test": "xo",
    "test-e2e": "gulp test-e2e",
@@ -30,7 +30,8 @@
    "pack": "electron-builder --dir",
    "dist": "electron-builder",
    "mas": "electron-builder --mac mas",
-    "travis": "cd ./scripts && ./travis-build-test.sh"
+    "travis": "cd ./scripts && ./travis-build-test.sh",
+    "build-locales": "node tools/locale-helper"
  },
  "pre-commit": [
    "test"
@@ -54,7 +55,8 @@
      "target": [
        "deb",
        "zip",
-        "AppImage"
+        "AppImage",
+        "snap"
      ],
      "maintainer": "Akash Nimare <svnitakash@gmail.com>"
    },
@@ -63,6 +65,9 @@
      "afterInstall": "./scripts/debian-add-repo.sh",
      "afterRemove": "./scripts/debian-uninstaller.sh"
    },
+    "snap": {
+      "synopsis": "Zulip Desktop App"
+    },
    "dmg": {
      "background": "build/appdmg.png",
      "icon": "build/icon.icns",
@@ -112,16 +117,17 @@
    "assert": "1.4.1",
    "cp-file": "^5.0.0",
    "devtron": "1.4.0",
-    "electron": "1.8.2",
-    "electron-builder": "19.53.6",
+    "electron": "1.8.4",
+    "electron-builder": "20.8.1",
    "electron-connect": "0.6.2",
    "electron-debug": "1.4.0",
+    "google-translate-api": "2.3.0",
    "gulp": "3.9.1",
    "gulp-tape": "0.0.9",
    "is-ci": "^1.0.10",
    "nodemon": "^1.14.11",
    "pre-commit": "1.2.2",
-    "spectron": "3.7.2",
+    "spectron": "3.8.0",
    "tap-colorize": "^1.2.0",
    "tape": "^4.8.0",
    "xo": "0.18.2"
@@ -161,7 +167,8 @@
      }
    ],
    "ignore": [
-      "tests/*.js"
+      "tests/*.js",
+      "tools/locale-helper/*.js"
    ],
    "envs": [
      "node",
--- a/scripts/debian-add-repo.sh
+++ b/scripts/debian-add-repo.sh
@@ -2,6 +2,10 @@

 # This script runs when user install the debian package

+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/local/bin/${executable}';
+echo 'Successfully added /opt/${productFilename}/${executable} to /usr/local/bin/${executable}'
+
 # Install apt repository source list if it does not exist
 if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep zulip.list; then
    sudo apt-key adv --keyserver pool.sks-keyservers.net --recv 69AD12704E71A4803DCA3A682424BE5AE9BD10D9
--- a/scripts/debian-uninstaller.sh
+++ b/scripts/debian-uninstaller.sh
@@ -28,4 +28,8 @@ appDirectory=/home/$getSudoUser/.config/Zulip/;

 if [ -d $appDirectory ]; then
    sudo rm -rf $appDirectory;
-fi
+fi
+
+# Delete the link to the binary
+echo 'Removing binary link'
+sudo rm -f '/usr/local/bin/${executable}';
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -0,0 +1,37 @@
+name: zulip
+version: 1.8.2
+summary: Zulip
+description: Zulip Desktop Client for Linux
+confinement: strict
+grade: stable
+icon: ../build/icon.png
+apps:
+  zulip:
+    command: env TMPDIR=$XDG_RUNTIME_DIR desktop-launch $SNAP/zulip
+    plugs:
+      - desktop
+      - desktop-legacy
+      - home
+      - x11
+      - unity7
+      - browser-support
+      - network
+      - gsettings
+      - pulseaudio
+      - opengl
+parts:
+  app:
+    plugin: dump
+    stage-packages:
+      - libasound2
+      - libgconf2-4
+      - libnotify4
+      - libnspr4
+      - libnss3
+      - libpcre3
+      - libpulse0
+      - libxss1
+      - libxtst6
+    source: ../dist/linux-unpacked
+    after:
+      - desktop-gtk2
--- a/tests/index.js
+++ b/tests/index.js
@@ -7,7 +7,7 @@ test('app runs', function (t) {
  const app = setup.createApp()
  setup.waitForLoad(app, t)
    .then(() => app.client.windowByIndex(1)) // focus on webview
-    .then(() => app.client.waitForExist('//*[@id="new-server-container"]/div/div/div[2]/input'))
+    .then(() => app.client.waitForExist('//*[@id="connect"]')) // id of the connect button
    .then(() => setup.endTest(app, t),
          (err) => setup.endTest(app, t, err || 'error'))
 })
--- a/tests/test-new-organization.js
+++ b/tests/test-new-organization.js
@@ -0,0 +1,17 @@
+const test = require('tape')
+const setup = require('./setup')
+
+// Create new org link should open in the default browser [WIP]
+
+test('new-org-link', function (t) {
+  t.timeoutAfter(50e3)
+  setup.resetTestDataDir()
+  const app = setup.createApp()
+  setup.waitForLoad(app, t)
+    .then(() => app.client.windowByIndex(1)) // focus on webview
+    .then(() => app.client.click('#open-create-org-link')) // Click on new org link button
+    .then(() => setup.wait(5000))
+    .then(() => setup.endTest(app, t),
+          (err) => setup.endTest(app, t, err || 'error'))
+})
+
--- a/tools/fetch-pull-request.cmd
+++ b/tools/fetch-pull-request.cmd
--- a/tools/fetch-rebase-pull-request.cmd
+++ b/tools/fetch-rebase-pull-request.cmd
--- a/tools/locale-helper/index.js
+++ b/tools/locale-helper/index.js
@@ -0,0 +1,30 @@
+const translate = require('google-translate-api');
+const path = require('path');
+const fs = require('fs');
+
+const translationDir = path.resolve(__dirname, '../../app/translations');
+
+function writeJSON(file, data) {
+    const filePath = path.resolve(translationDir, file);
+    fs.writeFileSync(filePath, `${JSON.stringify(data, null, '\t')}\n`, 'utf8');
+}
+
+const { phrases } = require('./locale-template');
+const supportedLocales = require('./supported-locales');
+
+phrases.sort();
+for (let locale in supportedLocales) {
+    console.log(`fetching translation for: ${supportedLocales[locale]} - ${locale}..`);
+    translate(phrases.join('\n'), { to: locale })
+        .then(res => {
+            const localeFile = `${locale}.json`;
+            const translatedText = res.text.split('\n');
+            const translationJSON = {};
+            phrases.forEach((phrase, index) => {
+               translationJSON[phrase] = translatedText[index];
+            });
+
+            writeJSON(localeFile, translationJSON);
+            console.log(`create: ${localeFile}`);
+        });
+}
--- a/tools/locale-helper/locale-template.json
+++ b/tools/locale-helper/locale-template.json
@@ -0,0 +1,41 @@
+{
+	"phrases": [
+		"About Zulip",
+		"Actual Size",
+		"Back",
+		"Close",
+		"Copy",
+		"Cut",
+		"Delete",
+		"Desktop App Settings",
+		"Edit",
+		"File",
+		"Forward",
+		"Hard Reload",
+		"Help",
+		"History",
+		"Keyboard Shortcuts",
+		"Log Out",
+		"Minimize",
+		"Paste",
+		"Paste and Match Style",
+		"Quit",
+		"Redo",
+		"Reload",
+		"Report an issue...",
+		"Reset App Settings",
+		"Select All",
+		"Show App Logs",
+		"Toggle DevTools for Active Tab",
+		"Toggle DevTools for Zulip App",
+		"Toggle Full Screen",
+		"Toggle Sidebar",
+		"Toggle Tray Icon",
+		"Undo",
+		"View",
+		"Window",
+		"Zoom In",
+		"Zoom Out",
+		"Zulip Help"
+	]
+}
--- a/tools/locale-helper/supported-locales.js
+++ b/tools/locale-helper/supported-locales.js
@@ -0,0 +1,21 @@
+module.exports = {
+    "de": "Deutsch",
+    "pl": "polski",
+    "en": "English",
+    "cs": "česky",
+    "hi": "Hindi",
+    "ru": "Русский",
+    "id": "Indonesia",
+    "bg": "български",
+    "hu": "Magyar",
+    "sr": "српски",
+    "ml": "Malayalam",
+    "ta": "தமிழ்",
+    "nl": "Nederlands",
+    "ja": "日本語",
+    "pt": "Português",
+    "tr": "Türkçe",
+    "es": "español",
+    "ko": "한국어",
+    "fr": "français"
+};
--- a/tools/reinstall-node-modules
+++ b/tools/reinstall-node-modules
--- a/tools/reinstall-node-modules.cmd
+++ b/tools/reinstall-node-modules.cmd
--- a/tools/reinstall-node-modules.js
+++ b/tools/reinstall-node-modules.js
@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+const {exec} = require('child_process');
+const path = require('path');
+
+const isWindows = process.platform === 'win32';
+const command = path.join(__dirname, `reinstall-node-modules${isWindows ? '.cmd' : ''}`);
+
+const proc = exec(command, error => {
+	if (error) {
+		console.error(error);
+	}
+});
+
+proc.stdout.on('data', data => console.log(data.toString()));
+proc.stderr.on('data', data => console.error(data.toString()));
+proc.on('exit', code => {
+	process.exit(code);
+});
Author	SHA1	Message	Date
Akash Nimare	d6738b7087	sentry: Init sentry-electron.	2018-04-13 17:02:57 +05:30
Priyank Patel	f70432f4e3	internal-links: open non-image links in hidden webview. * This will make sure that the current server webview will not reload due to URL change. * Add an option to allow users to download the file attachments. Improves: #469.	2018-04-11 23:21:01 +05:30
Abhigyan Khaund	60d693700e	internal-links: Open image link in webapp lightbox. This will open the image in the webapp lightbox. It shows the same behaviour that happens when clicking on the image preview. Improves: #469.	2018-04-09 18:16:57 +05:30
Akash Nimare	6e7333eab6	shortcut: Add F5 shortcut for reloading the app.	2018-04-07 19:52:46 +05:30
Akash Nimare	0d8dd1cd90	internal-links: Open file attachments within the app. Changing the behaviour of opening the attachments in the default browser to the app. This commit enables users to download the attachments. If the attachment type is image then we open the same in the app though users need to click on the go-back button. To-do - Open the image link in a lightbox. Improves: #469.	2018-04-04 18:02:40 +05:30
Akash Nimare	0ee3757774	shortcuts: Update string for selecting the keyboard shortcuts node.	2018-03-30 14:56:17 +05:30
Akash Nimare	811df9f381	shortcuts: Remove unused shortcuts.	2018-03-30 01:56:48 +05:30
Akash Nimare	8bd02cc7e4	shortcuts: Update toggle sidebar shortcut to CMD/CTRL+SHIFT+S.	2018-03-30 01:53:07 +05:30
Akash Nimare	9d5d221371	test: Add a test for new org link.	2018-03-28 02:36:50 +05:30
Akash Nimare	6006f1a3f8	builder: Update electron-builder to v20.8.1. Fixes: #442.	2018-03-27 21:27:32 +05:30
Robert	4f96df4a34	linux: Add Snap support for Linux. This adds a new build configs in package.json for electron-builder to be able to generate a snap package for zulip. Fixes #443.	2018-03-26 22:27:04 +05:30
Abhigyan Khaund	a13558fa16	org-settings: Responsive UI for connected orgs in smaller window sizes. Fixes: #456.	2018-03-26 21:09:52 +05:30
Abhigyan Khaund	a1d19a385c	menu: Warning dialog box for Reset App Settings.	2018-03-26 21:05:26 +05:30
Robert	c98667236e	tools: Fix reinstall script for working across all platforms. Make reinstall script compatible with Windows. Fixes #440.	2018-03-24 00:04:26 +05:30
Akash Nimare	b80c3d007b	server-page: Responsive tweaks for divider.	2018-03-23 12:18:44 +05:30
Akash Nimare	70fb198a0b	release: 🎉 new-release v1.9.0.	2018-03-23 03:59:56 +05:30
Abhigyan Khaund	7276bfeaa7	org-settings-page: UI fixes and tweaks for the org-settings page. Fixes: * Move "Disconnect" button to be at the far right. * Ellipsis text-overflow for server-url. * Show server url as title tooltip on hover. * Remove settings-card's right transition on hover. Improves: #456.	2018-03-23 03:45:50 +05:30
Akash Nimare	abd71330ba	setting-page: Minor UI fixes for add new server page. Minor fixes - * Update link to create a new organization. * Update placeholder text for demo zulip server. * Remove border from connect button. * Add overflow for smaller window. * Fix a typo in background color. * Use buttons for server actions. * Make new server page responsive. * Focus buttons on tab. * Update styling of button. * Make add new server page responsive. Fixes: #457.	2018-03-23 01:36:43 +05:30
Akash Nimare	e776222d6b	browser-window: Prevent drag and drop events. This stops a remote code execution via drag and drop event in the main/renderer process. Fixes #453.	2018-03-22 23:23:18 +05:30
Akash Nimare	30b05571e7	electron: Upgrade to v1.8.4. This upgrade includes some webview security fixes. https://www.electronjs.org/blog/webview-fix	2018-03-22 11:14:32 +05:30
Akash Nimare	0a155c63e7	security: Do not allow running insecure contents in app.	2018-03-22 10:57:35 +05:30
Akash Nimare	13c750ac6c	tests: Update Spectron to latest.	2018-03-20 20:54:32 +05:30
Akash Nimare	48799f75d1	tests: Fix failing renderer tests.	2018-03-20 20:53:10 +05:30
Akash Nimare	29f4e702ad	Merge branch 'master' of github.com:zulip/zulip-electron	2018-03-19 20:45:54 +05:30
Akash Nimare	3eb4cf4f64	Ubuntu: Add Zulip link to the binrary. Zulip can't be run from the terminal because we were not linking the binary to the bin. The electron-builder used to support this by default but we as we added the afterInstall script it got removed. More info - https://github.com/electron-userland/electron-builder/issues/2682, https://github.com/electron-userland/electron-builder/issues/2689 Fixes #444.	2018-03-19 20:38:38 +05:30
Abhigyan Khaund	1a97d8a5b0	design: Improve connected organization design. This PR updates the connected organization page. Changes - * All the server details are now inline. * Change "Delete" to "Disconnect". * Club org logo and name together on the right, and URL and "Disconnect" to the left. * Link to organization logo on the server tab. Improves #340.	2018-03-19 17:10:42 +05:30
Akash Nimare	2f96ec6199	settings: Fix a typo in silent setting option.	2018-03-17 03:49:43 +05:30
Akash Nimare	52de465457	settings: Fix app settings overriding issue. (#449 ) This fixes an issue which was caused by saving the last active tab before a functional tab activates. The bug was introduced in `f409bb0449`. It was unnoticed from v1.5.0 to the latest v1.8.2. The bug causes a serious issue where the app can't change the app settings and all settings were getting overridden when a user switches back to setting page. Fixes #448.	2018-03-17 03:06:41 +05:30
Ganesha Danu Enastika	e3039cf5a9	tools: Add missing Ubuntu dependancy.	2018-03-14 23:43:07 +05:30
Akash Nimare	6c120269eb	design: Redesign Add new server page. (#446 ) Changes - * New setting nav item for connected organizations. * All new page for adding a new server. * Minor UI changes in setting page. * Update default height, width of the main window. * Fix webview showing outline. * Hide Server nav item in setting page. Fixes #340.	2018-03-14 23:41:12 +05:30
Akash Nimare	b31fc6b66d	setting-page: Better looking nav items.	2018-03-10 23:14:42 +05:30
Akash Nimare	435e5f086e	webview: Fix webview flickering. (#439 ) Rewrote styling for the webview so that it takes the whole window when the app loads up. Fixes #249.	2018-03-09 14:35:13 +05:30
Akash Nimare	603ad7dfcd	setting-page: Make setting navs better.	2018-03-07 21:00:30 +05:30
Akash Nimare	a47a0e3e90	server-page: Improve add new server page. WIP, #340.	2018-03-06 17:45:00 +05:30
Priyank P	8e04920f54	il8n: Add locale helper script. (#437 ) This script automatically builds locales if the locale-template is changed.	2018-03-06 05:08:24 +05:30
Abhigyan Khaund	4a7b84e483	menu: Add "What's new" in help submenu.	2018-03-06 04:49:51 +05:30