diff --git a/po/af.po b/po/af.po
diff --git a/po/am.po b/po/am.po
diff --git a/po/ast.po b/po/ast.po
diff --git a/po/az.po b/po/az.po
diff --git a/po/be.po b/po/be.po
diff --git a/po/bg.po b/po/bg.po
diff --git a/po/ca.po b/po/ca.po
diff --git a/po/cs.po b/po/cs.po
diff --git a/po/da.po b/po/da.po
diff --git a/po/de.po b/po/de.po
diff --git a/po/el.po b/po/el.po
diff --git a/po/en_GB.po b/po/en_GB.po
diff --git a/po/es.po b/po/es.po
diff --git a/po/et.po b/po/et.po
diff --git a/po/eu.po b/po/eu.po
diff --git a/po/fi.po b/po/fi.po
diff --git a/po/fr.po b/po/fr.po
diff --git a/po/gl.po b/po/gl.po
diff --git a/po/gu.po b/po/gu.po
diff --git a/po/hi.po b/po/hi.po
diff --git a/po/hu.po b/po/hu.po
diff --git a/po/id.po b/po/id.po
diff --git a/po/it.po b/po/it.po
diff --git a/po/ja_JP.po b/po/ja_JP.po
diff --git a/po/kn.po b/po/kn.po
diff --git a/po/ko.po b/po/ko.po
diff --git a/po/lt.po b/po/lt.po
diff --git a/po/lv.po b/po/lv.po
diff --git a/po/meson.build b/po/meson.build
@@ -1 +1,9 @@
 i18n.gettext('hexchat', preset: 'glib')
+
+validate_translations = find_program('validate-textevent-translations')
+test('Validate translations', validate_translations,
+  args: [
+    join_paths(meson.current_source_dir(), 'LINGUAS'),
+    meson.current_source_dir(),
+  ]
+)
diff --git a/po/mk.po b/po/mk.po
diff --git a/po/ml.po b/po/ml.po
diff --git a/po/ms.po b/po/ms.po
diff --git a/po/nb.po b/po/nb.po
diff --git a/po/nl.po b/po/nl.po
diff --git a/po/no.po b/po/no.po
diff --git a/po/pa.po b/po/pa.po
diff --git a/po/pl.po b/po/pl.po
diff --git a/po/pt.po b/po/pt.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
diff --git a/po/ru.po b/po/ru.po
diff --git a/po/rw.po b/po/rw.po
diff --git a/po/sk.po b/po/sk.po
diff --git a/po/sl.po b/po/sl.po
diff --git a/po/sq.po b/po/sq.po
diff --git a/po/sr.po b/po/sr.po
diff --git a/po/sr@latin.po b/po/sr@latin.po
diff --git a/po/sv.po b/po/sv.po
diff --git a/po/th.po b/po/th.po
diff --git a/po/tr.po b/po/tr.po
diff --git a/po/uk.po b/po/uk.po
diff --git a/po/validate-textevent-translations b/po/validate-textevent-translations
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import os
+import re
+import sys
+
+ret = 0
+
+
+def log(prefix, suffix, fallback):
+    try:
+        print(prefix, suffix)  # Non-utf8 output...
+    except UnicodeEncodeError:
+        print(prefix, fallback)
+
+
+def validate_translation(input, translation):
+    if not translation:
+        return True
+
+    if re.findall(r'(?:(?<!%)%[^%OCRUHBIH]|\$[^at1234])', translation):
+        log('Translation includes invalid formatting:', translation, input)
+        return False
+
+    in_vars = re.findall(r'(\$(?:\d|t))', input)
+    if not all(var in translation for var in in_vars):
+        log('Translation does not contain all variables:', translation, input)
+        return False
+
+    in_ascii = re.findall(r'\$a(\d{3})', translation)
+    if any(int(i) > 256 for i in in_ascii):
+        log('Translation contains invalid ascii value:', translation, input)
+        return False
+
+    # We could try to validate colors but that is pretty flexible
+    return True
+
+
+def validate_language(path):
+    global ret
+
+    print('Validating', path)
+
+    with open(path, 'r', encoding='utf-8') as f:
+        in_event = False
+        event_input = ''
+
+        for line in f:
+            if 'textevents.h' in line:
+                in_event = True
+            elif in_event is False:
+                continue
+            elif line.startswith('msgid'):
+                event_input = line[7:-2]
+            elif line.startswith('msgstr'):
+                if not validate_translation(event_input, line[8:-2]):
+                    ret = 1
+                in_event = False
+            elif line == '\n':
+                print('Failed to find translation for', event_input)
+                in_event = False
+
+
+with open(sys.argv[1], 'r') as linguas:
+    for lang in linguas:
+        path = os.path.join(sys.argv[2], lang.strip() + '.po')
+        validate_language(path)
+
+sys.exit(ret)
diff --git a/po/vi.po b/po/vi.po
diff --git a/po/wa.po b/po/wa.po
diff --git a/po/zh_CN.po b/po/zh_CN.po
diff --git a/po/zh_TW.po b/po/zh_TW.po
diff --git a/src/common/outbound.c b/src/common/outbound.c
@@ -2610,7 +2610,7 @@ cmd_load (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	}
 
 #ifdef USE_PLUGIN
-	if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
+	if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
 	{
 		arg = NULL;
 		if (word_eol[3][0])
@@ -3616,7 +3616,7 @@ cmd_unload (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 #ifdef USE_PLUGIN
 	gboolean by_file = FALSE;
 
-	if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
+	if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
 		by_file = TRUE;
 
 	switch (plugin_kill (word[2], by_file))
@@ -3641,7 +3641,7 @@ cmd_reload (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 #ifdef USE_PLUGIN
 	gboolean by_file = FALSE;
 
-	if (g_str_has_suffix (word[2], "."G_MODULE_SUFFIX))
+	if (g_str_has_suffix (word[2], "."PLUGIN_SUFFIX))
 		by_file = TRUE;
 
 	switch (plugin_reload (sess, word[2], by_file))

diff --git a/src/common/plugin.c b/src/common/plugin.c
@@ -464,10 +464,10 @@ plugin_auto_load (session *sess)
 	for_files (lib_dir, "hcwinamp.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcsysinfo.dll", plugin_auto_load_cb);
 #else
-	for_files (lib_dir, "*."G_MODULE_SUFFIX, plugin_auto_load_cb);
+	for_files (lib_dir, "*."PLUGIN_SUFFIX, plugin_auto_load_cb);
 #endif
 
-	for_files (sub_dir, "*."G_MODULE_SUFFIX, plugin_auto_load_cb);
+	for_files (sub_dir, "*."PLUGIN_SUFFIX, plugin_auto_load_cb);
 
 	g_free (sub_dir);
 }
@@ -2010,7 +2010,7 @@ hexchat_pluginpref_list (hexchat_plugin *pl, char* dest)
 	else													/* existing config file, get list of settings */
 	{
 		strcpy (dest, "");									/* clean up garbage */
-		while (fscanf (fpIn, " %[^\n]", bufp) != EOF)	/* read whole lines including whitespaces */
+		while (fscanf (fpIn, " %511[^\n]", bufp) != EOF)	/* read whole lines including whitespaces */
 		{
 			token = strtok (buffer, "=");
 			g_strlcat (dest, g_strchomp (token), 4096); /* Dest must not be smaller than this */

diff --git a/src/common/plugin.h b/src/common/plugin.h
@@ -181,4 +181,12 @@ int plugin_show_help (session *sess, char *cmd);
 void plugin_command_foreach (session *sess, void *userdata, void (*cb) (session *sess, void *userdata, char *name, char *usage));
 session *plugin_find_context (const char *servname, const char *channel, server *current_server);
 
+/* On macOS, G_MODULE_SUFFIX says "so" but meson uses "dylib"
+ * https://github.com/mesonbuild/meson/issues/1160 */
+#if defined(__APPLE__)
+#  define PLUGIN_SUFFIX "dylib"
+#else
+#  define PLUGIN_SUFFIX G_MODULE_SUFFIX
+#endif
+
 #endif
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
@@ -53,7 +53,9 @@ irc_login (server *serv, char *user, char *realname)
 
 	if (serv->password[0] && serv->loginmethod == LOGIN_PASS)
 	{
-		tcp_sendf (serv, "PASS %s\r\n", serv->password);
+		tcp_sendf (serv, "PASS %s%s\r\n",
+			(serv->password[0] == ':' || strchr (serv->password, ' ')) ? ":" : "",
+			serv->password);
 	}
 
 	tcp_sendf (serv,

diff --git a/src/common/server.c b/src/common/server.c
@@ -748,14 +748,14 @@ server_connect_success (server *serv)
 
 		/* it'll be a memory leak, if connection isn't terminated by
 		   server_cleanup() */
-		serv->ssl = _SSL_socket (serv->ctx, serv->sok);
 		if ((err = _SSL_set_verify (serv->ctx, ssl_cb_verify, NULL)))
 		{
 			EMIT_SIGNAL (XP_TE_CONNFAIL, serv->server_session, err, NULL,
 							 NULL, NULL, 0);
 			server_cleanup (serv);	/* ->connecting = FALSE */
 			return;
 		}
+		serv->ssl = _SSL_socket (serv->ctx, serv->sok);
 		/* FIXME: it'll be needed by new servers */
 		/* send(serv->sok, "STLS\r\n", 6, 0); sleep(1); */
 		set_nonblocking (serv->sok);

diff --git a/src/common/textevents.in b/src/common/textevents.in
@@ -325,7 +325,7 @@ pevt_generic_none_help
 DCC Malformed
 XP_TE_MALFORMED
 pevt_malformed_help
-%C20*%O$tReceived a malformed DCC request from %C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O
+%C20*%O$tReceived a malformed DCC request from %C18$1%O.$a010%C23*%O$tContents of packet: %C23$2%O
 2
 
 DCC Offer

diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
@@ -1585,8 +1585,8 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch)
 static gboolean
 mg_tab_contextmenu_cb (chanview *cv, chan *ch, int tag, gpointer ud, GdkEventButton *event)
 {
-	/* middle-click or shift-click to close a tab */
-	if (((prefs.hex_gui_tab_middleclose && event->button == 2) || (event->button == 1 && event->state & STATE_SHIFT))
+	/* middle-click to close a tab */
+	if (((prefs.hex_gui_tab_middleclose && event->button == 2))
 		&& event->type == GDK_BUTTON_PRESS)
 	{
 		mg_xbutton_cb (cv, ch, tag, ud);

diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
@@ -359,6 +359,7 @@ tray_toggle_visibility (gboolean force_hide)
 		if (fullscreen)
 			gtk_window_fullscreen (win);
 		gtk_widget_show (GTK_WIDGET (win));
+		gtk_window_deiconify (win);
 		gtk_window_present (win);
 	}
 

diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c
@@ -162,7 +162,7 @@ plugingui_load (void)
 	char *sub_dir = g_build_filename (get_xdir(), "addons", NULL);
 
 	gtkutil_file_req (_("Select a Plugin or Script to load"), plugingui_load_cb, current_sess,
-							sub_dir, "*."G_MODULE_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);
+							sub_dir, "*."PLUGIN_SUFFIX";*.lua;*.pl;*.py;*.tcl;*.js", FRF_FILTERISINITIAL|FRF_EXTENSIONS);
 
 	g_free (sub_dir);
 }
@@ -185,7 +185,7 @@ plugingui_unload (GtkWidget * wid, gpointer unused)
 	                                    FILEPATH_COLUMN, &file, -1))
 		return;
 
-	if (g_str_has_suffix (file, "."G_MODULE_SUFFIX))
+	if (g_str_has_suffix (file, "."PLUGIN_SUFFIX))
 	{
 		if (plugin_kill (modname, FALSE) == 2)
 			fe_message (_("That plugin is refusing to unload.\n"), FE_MSG_ERROR);

diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
@@ -157,10 +157,7 @@ static char * gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** r
 #define EMPH_BOLD 2
 #define EMPH_HIDDEN 4
 static PangoAttrList *attr_lists[4];
-#ifdef G_OS_WIN32
-/* the fontwidths variable is used on Windows only. */
 static int fontwidths[4][128];
-#endif
 
 static PangoAttribute *
 xtext_pango_attr (PangoAttribute *attr)
@@ -173,10 +170,7 @@ xtext_pango_attr (PangoAttribute *attr)
 static void
 xtext_pango_init (GtkXText *xtext)
 {
-	int i;
-#ifdef G_OS_WIN32
-	int j;
-#endif
+	int i, j;
 	char buf[2] = "\000";
 
 	if (attr_lists[0])
@@ -208,7 +202,6 @@ xtext_pango_init (GtkXText *xtext)
 			break;
 		}
 
-#ifdef G_OS_WIN32
 		/* Now initialize fontwidths[i] */
 		pango_layout_set_attributes (xtext->layout, attr_lists[i]);
 		for (j = 0; j < 128; j++)
@@ -217,14 +210,8 @@ xtext_pango_init (GtkXText *xtext)
 			pango_layout_set_text (xtext->layout, buf, 1);
 			pango_layout_get_pixel_size (xtext->layout, &fontwidths[i][j], NULL);
 		}
-#endif
 	}
-
-	/* re-compute space_width without using fontwidths */
-	pango_layout_set_attributes (xtext->layout, attr_lists[0]);
-	buf[0] = ' ';
-	pango_layout_set_text (xtext->layout, buf, 1);
-	pango_layout_get_pixel_size (xtext->layout, &(xtext->space_width), NULL);
+	xtext->space_width = fontwidths[0][' '];
 }
 
 static void
@@ -302,10 +289,8 @@ static int
 backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis)
 {
 	int width;
-#ifdef G_OS_WIN32
 	int deltaw;
 	int mbl;
-#endif
 
 	if (*str == 0)
 		return 0;
@@ -316,8 +301,6 @@ backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis
 
 	width = 0;
 	pango_layout_set_attributes (xtext->layout, attr_lists[emphasis]);
-
-#ifdef G_OS_WIN32
 	while (len > 0)
 	{
 		mbl = charlen(str);
@@ -332,12 +315,6 @@ backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis
 		str += mbl;
 		len -= mbl;
 	}
-#else
-	/* This code is slow on Windows,
-	   but it will get the correct width from pango on Linux. */
-	pango_layout_set_text (xtext->layout, str, len);
-	pango_layout_get_pixel_size (xtext->layout, &width, NULL);
-#endif
 
 	return width;
 }

diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
@@ -26,16 +26,18 @@
     <None Include="$(DepsRoot)\bin\cert.pem" />
     <None Include="$(DepsRoot)\bin\atk-1.0-0.dll" />
     <None Include="$(DepsRoot)\bin\cairo.dll" />
+    <None Include="$(DepsRoot)\bin\freetype.dll" />
+    <None Include="$(DepsRoot)\bin\fribidi-0.dll" />
     <None Include="$(DepsRoot)\bin\fontconfig.dll" />
     <None Include="$(DepsRoot)\bin\gdk_pixbuf-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gdk-win32-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gio-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\glib-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gmodule-2.0.dll" />
-    <None Include="$(DepsRoot)\bin\gobject-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gio-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\glib-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\gmodule-2.0-0.dll" />
+    <None Include="$(DepsRoot)\bin\gobject-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper.exe" />
     <None Include="$(DepsRoot)\bin\gspawn-win$(PlatformArchitecture)-helper-console.exe" />
-    <None Include="$(DepsRoot)\bin\gthread-2.0.dll" />
+    <None Include="$(DepsRoot)\bin\gthread-2.0-0.dll" />
     <None Include="$(DepsRoot)\bin\gtk-win32-2.0.dll" />
     <None Include="$(DepsRoot)\bin\iconv.dll" />
     <None Include="$(DepsRoot)\bin\libeay32.dll" />

diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt
@@ -119,21 +119,23 @@ Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createal
 
 Source: "atk-1.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "cairo.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "freetype.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "fribidi-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "fontconfig.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk_pixbuf-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gdk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gio-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "glib-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gmodule-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
-Source: "gobject-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gio-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "glib-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gmodule-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gobject-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 #if APPARCH == "x64"
 Source: "gspawn-win64-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gspawn-win64-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 #else
 Source: "gspawn-win32-helper.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gspawn-win32-helper-console.exe"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 #endif
-Source: "gthread-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
+Source: "gthread-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "gtk-win32-2.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "iconv.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs