diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index c1bc62e8..dfbf54fb 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -26,12 +26,11 @@ class CAdminLogMod : public CModule {
   public:
     MODCONSTRUCTOR(CAdminLogMod) {
         AddHelpCommand();
-        AddCommand("Show", static_cast<CModCommand::ModCmdFunc>(
-                               &CAdminLogMod::OnShowCommand),
-                   "", "Show the logging target");
-        AddCommand("Target", static_cast<CModCommand::ModCmdFunc>(
-                                 &CAdminLogMod::OnTargetCommand),
-                   "<file|syslog|both> [path]", "Set the logging target");
+        AddCommand("Show", "", t_d("Show the logging target"),
+                   [=](const CString& sLine) { OnShowCommand(sLine); });
+        AddCommand("Target", "<file|syslog|both> [path]",
+                   t_d("Set the logging target"),
+                   [=](const CString& sLine) { OnTargetCommand(sLine); });
         openlog("znc", LOG_PID, LOG_DAEMON);
     }
 
@@ -142,7 +141,7 @@ class CAdminLogMod : public CModule {
 
     void OnModCommand(const CString& sCommand) override {
         if (!GetUser()->IsAdmin()) {
-            PutModule("Access denied");
+            PutModule(t_s("Access denied"));
         } else {
             HandleCommand(sCommand);
         }
@@ -156,21 +155,21 @@ class CAdminLogMod : public CModule {
 
         if (sArg.Equals("file")) {
             sTarget = "file";
-            sMessage = "Now logging to file";
+            sMessage = t_s("Now logging to file");
             mode = LOG_TO_FILE;
         } else if (sArg.Equals("syslog")) {
             sTarget = "syslog";
-            sMessage = "Now only logging to syslog";
+            sMessage = t_s("Now only logging to syslog");
             mode = LOG_TO_SYSLOG;
         } else if (sArg.Equals("both")) {
             sTarget = "both";
-            sMessage = "Now logging to syslog and file";
+            sMessage = t_s("Now logging to syslog and file");
             mode = LOG_TO_BOTH;
         } else {
             if (sArg.empty()) {
-                PutModule("Usage: Target <file|syslog|both> [path]");
+                PutModule(t_s("Usage: Target <file|syslog|both> [path]"));
             } else {
-                PutModule("Unknown target");
+                PutModule(t_s("Unknown target"));
             }
             return;
         }
@@ -192,19 +191,19 @@ class CAdminLogMod : public CModule {
 
         switch (m_eLogMode) {
             case LOG_TO_FILE:
-                sTarget = "file";
+                sTarget = t_s("Logging is enabled for file");
                 break;
             case LOG_TO_SYSLOG:
-                sTarget = "syslog";
+                sTarget = t_s("Logging is enabled for syslog");
                 break;
             case LOG_TO_BOTH:
-                sTarget = "both, file and syslog";
+                sTarget = t_s("Logging is enabled for both, file and syslog");
                 break;
         }
 
-        PutModule("Logging is enabled for " + sTarget);
+        PutModule(sTarget);
         if (m_eLogMode != LOG_TO_SYSLOG)
-            PutModule("Log file will be written to [" + m_sLogFile + "]");
+            PutModule(t_f("Log file will be written to {1}")(m_sLogFile));
     }
 
   private:
@@ -222,4 +221,4 @@ void TModInfo<CAdminLogMod>(CModInfo& Info) {
     Info.SetWikiPage("adminlog");
 }
 
-GLOBALMODULEDEFS(CAdminLogMod, "Log ZNC events to file and/or syslog.")
+GLOBALMODULEDEFS(CAdminLogMod, t_s("Log ZNC events to file and/or syslog."))
diff --git a/modules/alias.cpp b/modules/alias.cpp
index bc1c70c4..3ad5e4be 100644
--- a/modules/alias.cpp
+++ b/modules/alias.cpp
@@ -92,8 +92,8 @@ class CAlias {
     // appends it to 'output', and updates 'caret'.
     // 'skip' is updated based on the logic that we should skip the % at the
     // caret if we fail to parse the token.
-    static void ParseToken(const CString& alias_data, const CString& line,
-                           CString& output, size_t& caret, size_t& skip) {
+    void ParseToken(const CString& alias_data, const CString& line,
+                    CString& output, size_t& caret, size_t& skip) const {
         bool optional = false;
         bool subsequent = false;
         size_t index = caret + 1;
@@ -101,31 +101,33 @@ class CAlias {
 
         skip = 1;
 
+        // try to read optional flag
         if (alias_data.length() > index && alias_data[index] == '?') {
             optional = true;
             ++index;
-        }  // try to read optional flag
+        }
+        // try to read integer
         if (alias_data.length() > index &&
-            CString(alias_data.substr(index))
-                .Convert(&token))  // try to read integer
-        {
+            CString(alias_data.substr(index)).Convert(&token)) {
+            // skip any numeric digits in string (supposed to fail if
+            // whitespace precedes integer)
             while (alias_data.length() > index && alias_data[index] >= '0' &&
                    alias_data[index] <= '9')
                 ++index;
-            // skip any numeric digits in string (supposed to fail if
-            // whitespace precedes integer)
         } else {
             // token was malformed. leave caret unchanged, and flag first
             // character for skipping
             return;
         }
+        // try to read subsequent flag
         if (alias_data.length() > index && alias_data[index] == '+') {
             subsequent = true;
             ++index;
-        }  // try to read subsequent flag
+        }
+        // try to read end-of-substitution marker
         if (alias_data.length() > index && alias_data[index] == '%') {
             ++index;
-        }  // try to read end-of-substitution marker
+        }
         else
             return;
 
@@ -134,14 +136,17 @@ class CAlias {
         CString stok = line.Token(token, subsequent, " ");
 
         if (stok.empty() && !optional)
+            // blow up if token is required and also empty
             throw std::invalid_argument(
-                CString("missing required parameter: ") +
-                CString(token));  // blow up if token is required and also empty
-        output.append(stok);      // write token value to output
+                parent->t_f("missing required parameter: {1}")(CString(token)));
+        // write token value to output
+        output.append(stok);
 
-        skip = 0;  // since we're moving the cursor after the end of the token,
-                   // skip no characters
-        caret = index;  // advance the cursor forward by the size of the token
+        // since we're moving the cursor after the end of the token, skip no
+        // characters
+        skip = 0;
+        // advance the cursor forward by the size of the token
+        caret = index;
     }
 
   public:
@@ -167,7 +172,8 @@ class CAlias {
             // if (found >= (int) alias_data.length()) break;
             // ^ shouldn't be possible.
             size_t found = alias_data.find("%", lastfound + skip);
-            if (found == CString::npos) break;  // if we found nothing, break
+            // if we found nothing, break
+            if (found == CString::npos) break;
             // capture everything between the last stopping point and here
             output.append(alias_data.substr(lastfound, found - lastfound));
             // attempt to read a token, updates indices based on
@@ -176,7 +182,8 @@ class CAlias {
             lastfound = found;
         }
 
-        output += alias_data.substr(lastfound);  // append from the final
+        // append from the final
+        output += alias_data.substr(lastfound);
         return output;
     }
 };
@@ -191,19 +198,19 @@ class CAliasMod : public CModule {
         if (!CAlias::AliasExists(this, name)) {
             CAlias na(this, name);
             na.Commit();
-            PutModule("Created alias: " + na.GetName());
+            PutModule(t_f("Created alias: {1}")(na.GetName()));
         } else
-            PutModule("Alias already exists.");
+            PutModule(t_s("Alias already exists."));
     }
 
     void DeleteCommand(const CString& sLine) {
         CString name = sLine.Token(1, false, " ");
         CAlias delete_alias;
         if (CAlias::AliasGet(delete_alias, this, name)) {
-            PutModule("Deleted alias: " + delete_alias.GetName());
+            PutModule(t_f("Deleted alias: {1}")(delete_alias.GetName()));
             delete_alias.Delete();
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     void AddCmd(const CString& sLine) {
@@ -212,9 +219,9 @@ class CAliasMod : public CModule {
         if (CAlias::AliasGet(add_alias, this, name)) {
             add_alias.AliasCmds().push_back(sLine.Token(2, true, " "));
             add_alias.Commit();
-            PutModule("Modified alias.");
+            PutModule(t_s("Modified alias."));
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     void InsertCommand(const CString& sLine) {
@@ -226,7 +233,7 @@ class CAliasMod : public CModule {
             // input
             if (!sLine.Token(2, false, " ").Convert(&index) || index < 0 ||
                 index > (int)insert_alias.AliasCmds().size()) {
-                PutModule("Invalid index.");
+                PutModule(t_s("Invalid index."));
                 return;
             }
 
@@ -234,9 +241,9 @@ class CAliasMod : public CModule {
                 insert_alias.AliasCmds().begin() + index,
                 sLine.Token(3, true, " "));
             insert_alias.Commit();
-            PutModule("Modified alias.");
+            PutModule(t_s("Modified alias."));
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     void RemoveCommand(const CString& sLine) {
@@ -246,16 +253,16 @@ class CAliasMod : public CModule {
         if (CAlias::AliasGet(remove_alias, this, name)) {
             if (!sLine.Token(2, false, " ").Convert(&index) || index < 0 ||
                 index > (int)remove_alias.AliasCmds().size() - 1) {
-                PutModule("Invalid index.");
+                PutModule(t_s("Invalid index."));
                 return;
             }
 
             remove_alias.AliasCmds().erase(remove_alias.AliasCmds().begin() +
                                            index);
             remove_alias.Commit();
-            PutModule("Modified alias.");
+            PutModule(t_s("Modified alias."));
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     void ClearCommand(const CString& sLine) {
@@ -264,27 +271,31 @@ class CAliasMod : public CModule {
         if (CAlias::AliasGet(clear_alias, this, name)) {
             clear_alias.AliasCmds().clear();
             clear_alias.Commit();
-            PutModule("Modified alias.");
+            PutModule(t_s("Modified alias."));
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     void ListCommand(const CString& sLine) {
-        CString output = "The following aliases exist:";
         MCString::iterator i = BeginNV();
-        if (i == EndNV()) output += " [none]";
-        for (; i != EndNV(); ++i) {
-            output.append(" ");
-            output.append(i->first);
+        if (i == EndNV()) {
+            PutModule(t_s("There are no aliases."));
+            return;
         }
-        PutModule(output);
+        VCString vsAliases;
+        for (; i != EndNV(); ++i) {
+            vsAliases.push_back(i->first);
+        }
+        PutModule(t_f("The following aliases exist: {1}")(
+            CString(t_s(", ", "list|separator"))
+                .Join(vsAliases.begin(), vsAliases.end())));
     }
 
     void DumpCommand(const CString& sLine) {
         MCString::iterator i = BeginNV();
 
         if (i == EndNV()) {
-            PutModule("There are no aliases.");
+            PutModule(t_s("There are no aliases."));
             return;
         }
 
@@ -310,48 +321,46 @@ class CAliasMod : public CModule {
         CString name = sLine.Token(1, false, " ");
         CAlias info_alias;
         if (CAlias::AliasGet(info_alias, this, name)) {
-            PutModule("Actions for alias " + info_alias.GetName() + ":");
+            PutModule(t_f("Actions for alias {1}:")(info_alias.GetName()));
             for (size_t i = 0; i < info_alias.AliasCmds().size(); ++i) {
                 CString num(i);
                 CString padding(4 - (num.length() > 3 ? 3 : num.length()), ' ');
                 PutModule(num + padding + info_alias.AliasCmds()[i]);
             }
-            PutModule("End of actions for alias " + info_alias.GetName() + ".");
+            PutModule(
+                t_f("End of actions for alias {1}.")(info_alias.GetName()));
         } else
-            PutModule("Alias does not exist.");
+            PutModule(t_s("Alias does not exist."));
     }
 
     MODCONSTRUCTOR(CAliasMod), sending_lines(false) {
         AddHelpCommand();
-        AddCommand("Create", static_cast<CModCommand::ModCmdFunc>(
-                                 &CAliasMod::CreateCommand),
-                   "<name>", "Creates a new, blank alias called name.");
-        AddCommand("Delete", static_cast<CModCommand::ModCmdFunc>(
-                                 &CAliasMod::DeleteCommand),
-                   "<name>", "Deletes an existing alias.");
-        AddCommand("Add",
-                   static_cast<CModCommand::ModCmdFunc>(&CAliasMod::AddCmd),
-                   "<name> <action ...>", "Adds a line to an existing alias.");
-        AddCommand("Insert", static_cast<CModCommand::ModCmdFunc>(
-                                 &CAliasMod::InsertCommand),
-                   "<name> <pos> <action ...>",
-                   "Inserts a line into an existing alias.");
-        AddCommand("Remove", static_cast<CModCommand::ModCmdFunc>(
-                                 &CAliasMod::RemoveCommand),
-                   "<name> <pos>", "Removes a line from an existing alias.");
-        AddCommand("Clear", static_cast<CModCommand::ModCmdFunc>(
-                                &CAliasMod::ClearCommand),
-                   "<name>", "Removes all line from an existing alias.");
-        AddCommand("List", static_cast<CModCommand::ModCmdFunc>(
-                               &CAliasMod::ListCommand),
-                   "", "Lists all aliases by name.");
-        AddCommand("Info", static_cast<CModCommand::ModCmdFunc>(
-                               &CAliasMod::InfoCommand),
-                   "<name>", "Reports the actions performed by an alias.");
+        AddCommand("Create", "<name>",
+                   t_d("Creates a new, blank alias called name."),
+                   [=](const CString& sLine) { CreateCommand(sLine); });
+        AddCommand("Delete", "<name>", t_d("Deletes an existing alias."),
+                   [=](const CString& sLine) { DeleteCommand(sLine); });
+        AddCommand("Add", "<name> <action ...>",
+                   t_d("Adds a line to an existing alias."),
+                   [=](const CString& sLine) { AddCmd(sLine); });
+        AddCommand("Insert", "<name> <pos> <action ...>",
+                   t_d("Inserts a line into an existing alias."),
+                   [=](const CString& sLine) { InsertCommand(sLine); });
+        AddCommand("Remove", "<name> <pos>",
+                   t_d("Removes a line from an existing alias."),
+                   [=](const CString& sLine) { RemoveCommand(sLine); });
+        AddCommand("Clear", "<name>",
+                   t_d("Removes all lines from an existing alias."),
+                   [=](const CString& sLine) { ClearCommand(sLine); });
+        AddCommand("List", "", t_d("Lists all aliases by name."),
+                   [=](const CString& sLine) { ListCommand(sLine); });
+        AddCommand("Info", "<name>",
+                   t_d("Reports the actions performed by an alias."),
+                   [=](const CString& sLine) { InfoCommand(sLine); });
         AddCommand(
-            "Dump",
-            static_cast<CModCommand::ModCmdFunc>(&CAliasMod::DumpCommand), "",
-            "Generate a list of commands to copy your alias config.");
+            "Dump", "",
+            t_d("Generate a list of commands to copy your alias config."),
+            [=](const CString& sLine) { DumpCommand(sLine); });
     }
 
     EModRet OnUserRaw(CString& sLine) override {
@@ -362,7 +371,7 @@ class CAliasMod : public CModule {
         try {
             if (sLine.Equals("ZNC-CLEAR-ALL-ALIASES!")) {
                 ListCommand("");
-                PutModule("Clearing all of them!");
+                PutModule(t_s("Clearing all of them!"));
                 ClearNV();
                 return HALT;
             } else if (CAlias::AliasGet(current_alias, this, sLine)) {
@@ -397,4 +406,4 @@ void TModInfo<CAliasMod>(CModInfo& Info) {
     Info.AddType(CModInfo::NetworkModule);
 }
 
-USERMODULEDEFS(CAliasMod, "Provides bouncer-side command alias support.")
+USERMODULEDEFS(CAliasMod, t_s("Provides bouncer-side command alias support."))
diff --git a/modules/po/adminlog.pot b/modules/po/adminlog.pot
new file mode 100644
index 00000000..4977d589
--- /dev/null
+++ b/modules/po/adminlog.pot
@@ -0,0 +1,51 @@
+#: adminlog.cpp:29
+msgid "Show the logging target"
+msgstr ""
+
+#: adminlog.cpp:32
+msgid "Set the logging target"
+msgstr ""
+
+#: adminlog.cpp:144
+msgid "Access denied"
+msgstr ""
+
+#: adminlog.cpp:158
+msgid "Now logging to file"
+msgstr ""
+
+#: adminlog.cpp:162
+msgid "Now only logging to syslog"
+msgstr ""
+
+#: adminlog.cpp:166
+msgid "Now logging to syslog and file"
+msgstr ""
+
+#: adminlog.cpp:170
+msgid "Usage: Target <file|syslog|both> [path]"
+msgstr ""
+
+#: adminlog.cpp:172
+msgid "Unknown target"
+msgstr ""
+
+#: adminlog.cpp:194
+msgid "Logging is enabled for file"
+msgstr ""
+
+#: adminlog.cpp:197
+msgid "Logging is enabled for syslog"
+msgstr ""
+
+#: adminlog.cpp:200
+msgid "Logging is enabled for both, file and syslog"
+msgstr ""
+
+#: adminlog.cpp:206
+msgid "Log file will be written to {1}"
+msgstr ""
+
+#: adminlog.cpp:224
+msgid "Log ZNC events to file and/or syslog."
+msgstr ""
diff --git a/modules/po/alias.pot b/modules/po/alias.pot
new file mode 100644
index 00000000..37211c0a
--- /dev/null
+++ b/modules/po/alias.pot
@@ -0,0 +1,93 @@
+#: alias.cpp:141
+msgid "missing required parameter: {1}"
+msgstr ""
+
+#: alias.cpp:201
+msgid "Created alias: {1}"
+msgstr ""
+
+#: alias.cpp:203
+msgid "Alias already exists."
+msgstr ""
+
+#: alias.cpp:210
+msgid "Deleted alias: {1}"
+msgstr ""
+
+#: alias.cpp:213 alias.cpp:224 alias.cpp:246 alias.cpp:265 alias.cpp:276
+#: alias.cpp:332
+msgid "Alias does not exist."
+msgstr ""
+
+#: alias.cpp:222 alias.cpp:244 alias.cpp:263 alias.cpp:274
+msgid "Modified alias."
+msgstr ""
+
+#: alias.cpp:236 alias.cpp:256
+msgid "Invalid index."
+msgstr ""
+
+#: alias.cpp:282 alias.cpp:298
+msgid "There are no aliases."
+msgstr ""
+
+#: alias.cpp:289
+msgid "The following aliases exist: {1}"
+msgstr ""
+
+#: alias.cpp:290
+msgctxt "list|separator"
+msgid ", "
+msgstr ""
+
+#: alias.cpp:324
+msgid "Actions for alias {1}:"
+msgstr ""
+
+#: alias.cpp:330
+msgid "End of actions for alias {1}."
+msgstr ""
+
+#: alias.cpp:338
+msgid "Creates a new, blank alias called name."
+msgstr ""
+
+#: alias.cpp:340
+msgid "Deletes an existing alias."
+msgstr ""
+
+#: alias.cpp:343
+msgid "Adds a line to an existing alias."
+msgstr ""
+
+#: alias.cpp:346
+msgid "Inserts a line into an existing alias."
+msgstr ""
+
+#: alias.cpp:349
+msgid "Removes a line from an existing alias."
+msgstr ""
+
+#: alias.cpp:352
+msgid "Removes all lines from an existing alias."
+msgstr ""
+
+#: alias.cpp:354
+msgid "Lists all aliases by name."
+msgstr ""
+
+#: alias.cpp:357
+msgid "Reports the actions performed by an alias."
+msgstr ""
+
+#: alias.cpp:361
+msgid "Generate a list of commands to copy your alias config."
+msgstr ""
+
+#: alias.cpp:373
+msgid "Clearing all of them!"
+msgstr ""
+
+#: alias.cpp:408
+msgid "Provides bouncer-side command alias support."
+msgstr ""
diff --git a/modules/po/cert.pot b/modules/po/cert.pot
index 710ef253..15907264 100644
--- a/modules/po/cert.pot
+++ b/modules/po/cert.pot
@@ -17,7 +17,7 @@ msgstr ""
 msgid "You do not have a certificate yet."
 msgstr ""
 
-#: modules/po/../data/cert/tmpl/index.tmpl:14 cert.cpp:73
+#: modules/po/../data/cert/tmpl/index.tmpl:14 cert.cpp:72
 msgid "Certificate"
 msgstr ""
 
@@ -47,18 +47,18 @@ msgid ""
 "certificate"
 msgstr ""
 
-#: cert.cpp:45
+#: cert.cpp:44
 msgid "Alternatively you can either place one at {1}"
 msgstr ""
 
-#: cert.cpp:53
+#: cert.cpp:52
 msgid "Delete the current certificate"
 msgstr ""
 
-#: cert.cpp:55
+#: cert.cpp:54
 msgid "Show the current certificate"
 msgstr ""
 
-#: cert.cpp:106
+#: cert.cpp:105
 msgid "Use a ssl certificate to connect to a server"
 msgstr ""
diff --git a/modules/po/cert.ru.po b/modules/po/cert.ru.po
index 51182cbd..ed83dbeb 100644
--- a/modules/po/cert.ru.po
+++ b/modules/po/cert.ru.po
@@ -35,7 +35,7 @@ msgstr ""
 msgid "You do not have a certificate yet."
 msgstr "У вас пока нет сертификата."
 
-#: modules/po/../data/cert/tmpl/index.tmpl:14 cert.cpp:73
+#: modules/po/../data/cert/tmpl/index.tmpl:14 cert.cpp:72
 msgid "Certificate"
 msgstr "Сертификат"
 
@@ -65,18 +65,18 @@ msgid ""
 "certificate"
 msgstr "У вас нет сертификата. Пожалуйста, добавьте его через веб-интерфейс."
 
-#: cert.cpp:45
+#: cert.cpp:44
 msgid "Alternatively you can either place one at {1}"
 msgstr "Либо вы можете положить его в {1}"
 
-#: cert.cpp:53
+#: cert.cpp:52
 msgid "Delete the current certificate"
 msgstr "Удалить текущий сертификат"
 
-#: cert.cpp:55
+#: cert.cpp:54
 msgid "Show the current certificate"
 msgstr "Показать текущий сертификат"
 
-#: cert.cpp:106
+#: cert.cpp:105
 msgid "Use a ssl certificate to connect to a server"
 msgstr "Соединение с сервером с помошью сертификата SSL"
diff --git a/modules/po/pyeval.pot b/modules/po/pyeval.pot
new file mode 100644
index 00000000..14fa714a
--- /dev/null
+++ b/modules/po/pyeval.pot
@@ -0,0 +1,7 @@
+#: pyeval.py:49
+msgid "You must have admin privileges to load this module."
+msgstr ""
+
+#: pyeval.py:82
+msgid "Evaluates python code"
+msgstr ""
diff --git a/modules/po/webadmin.pot b/modules/po/webadmin.pot
index 220f06c2..71966684 100644
--- a/modules/po/webadmin.pot
+++ b/modules/po/webadmin.pot
@@ -62,19 +62,19 @@ msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:67
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:399
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:270
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:282
 msgid "Module {1}"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:75
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:408
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:278
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:290
 msgid "Save and return"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:76
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:409
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:279
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:291
 msgid "Save and continue"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgid "Listen Port(s)"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:13
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:90
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:102
 msgid "Port"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgid "BindHost"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:15
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:91
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:103
 msgid "SSL"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:53
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:140
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:204
 msgid "Del"
 msgstr ""
 
@@ -147,7 +147,8 @@ msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:72
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:123
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:173
+#: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:343
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:185
 #: modules/po/../data/webadmin/tmpl/listusers.tmpl:15
 msgid "Add"
 msgstr ""
@@ -248,20 +249,20 @@ msgstr ""
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:170
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:125
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:168
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:176
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:216
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:188
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:228
 msgid "Name"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:171
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:169
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:217
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:229
 msgid "Arguments"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:172
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:170
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:218
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:230
 msgid "Description"
 msgstr ""
 
@@ -276,7 +277,7 @@ msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:231
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:419
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:175
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:187
 msgid "Save"
 msgstr ""
 
@@ -410,7 +411,7 @@ msgid "← Add a network (opens in same page)"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:140
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:204
 #: modules/po/../data/webadmin/tmpl/listusers.tmpl:27
 msgid "Edit"
 msgstr ""
@@ -428,17 +429,17 @@ msgid ""
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:162
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:210
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:222
 msgid "Modules"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:171
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:219
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:231
 msgid "Loaded globally"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:225
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:164
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:176
 msgid "Channels"
 msgstr ""
 
@@ -685,131 +686,150 @@ msgid "Connect to IRC &amp; automatically re-connect"
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:77
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:84
-msgid "Servers of this IRC network:"
+msgid "Trust all certs:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:81
-msgid "One server per line, “host [[+]port] [password]”, + means SSL"
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:79
+msgid ""
+"Disable certificate validation (takes precedence over TrustPKI). INSECURE!"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:83
+msgid "Trust the PKI:"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:85
+msgid ""
+"Setting this to false will trust only certificates you added fingerprints "
+"for."
 msgstr ""
 
 #: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:89
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:96
+msgid "Servers of this IRC network:"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:93
+msgid "One server per line, “host [[+]port] [password]”, + means SSL"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:101
 msgid "Hostname"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:92
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:104
 msgid "Password"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:104
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:116
 msgid "SHA-256 fingerprints of trusted SSL certificates of this IRC network:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:108
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:120
 msgid ""
 "When these certificates are encountered, checks for hostname, expiration "
 "date, CA are skipped"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:112
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:124
 msgid "Flood protection:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:115
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:127
 msgid ""
 "You might enable the flood protection. This prevents “excess flood” errors, "
 "which occur, when your IRC bot is command flooded or spammed. After changing "
 "this, reconnect ZNC to server."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:118
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:130
 msgctxt "Flood Protection"
 msgid "Enabled"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:122
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:134
 msgid "Flood protection rate:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:125
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:137
 msgid ""
 "The number of seconds per line. After changing this, reconnect ZNC to server."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:128
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:140
 msgid "{1} seconds per line"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:132
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:144
 msgid "Flood protection burst:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:135
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:147
 msgid ""
 "Defines the number of lines, which can be sent immediately. After changing "
 "this, reconnect ZNC to server."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:138
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:150
 msgid "{1} lines can be sent immediately"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:142
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:154
 msgid "Channel join delay:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:145
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:157
 msgid ""
 "Defines the delay in seconds, until channels are joined after getting "
 "connected."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:148
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:160
 msgid "{1} seconds"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:153
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:165
 msgid "Character encoding used between ZNC and IRC server."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:154
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:166
 msgid "Server encoding:"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:166
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:178
 msgid ""
 "You will be able to add + modify channels here after you created the network."
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:177
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:189
 msgid "CurModes"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:178
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:190
 msgid "DefModes"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:179
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:191
 msgid "BufferSize"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:180
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
 msgid "Options"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:182
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:194
 msgid "← Add a channel (opens in same page)"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:220
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:232
 msgid "Loaded by user"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:281
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:293
 msgid "Add Network and return"
 msgstr ""
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:282
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:294
 msgid "Add Network and continue"
 msgstr ""
 
@@ -916,19 +936,19 @@ msgstr ""
 msgid "Are you sure you want to delete user “{1}”?"
 msgstr ""
 
-#: webadmin.cpp:91 webadmin.cpp:1833
+#: webadmin.cpp:91 webadmin.cpp:1843
 msgid "Global Settings"
 msgstr ""
 
-#: webadmin.cpp:92
+#: webadmin.cpp:93
 msgid "Your Settings"
 msgstr ""
 
-#: webadmin.cpp:94 webadmin.cpp:1645
+#: webadmin.cpp:94 webadmin.cpp:1655
 msgid "Traffic Info"
 msgstr ""
 
-#: webadmin.cpp:97 webadmin.cpp:1624
+#: webadmin.cpp:97 webadmin.cpp:1634
 msgid "Manage Users"
 msgstr ""
 
@@ -940,7 +960,7 @@ msgstr ""
 msgid "Invalid Submission [Passwords do not match]"
 msgstr ""
 
-#: webadmin.cpp:383 webadmin.cpp:411 webadmin.cpp:1152 webadmin.cpp:2015
+#: webadmin.cpp:383 webadmin.cpp:411 webadmin.cpp:1161 webadmin.cpp:2025
 msgid "Unable to load module [{1}]: {2}"
 msgstr ""
 
@@ -949,7 +969,7 @@ msgid "Unable to load module [{1}] with arguments [{2}]"
 msgstr ""
 
 #: webadmin.cpp:497 webadmin.cpp:601 webadmin.cpp:626 webadmin.cpp:648
-#: webadmin.cpp:682 webadmin.cpp:1219
+#: webadmin.cpp:682 webadmin.cpp:1228
 msgid "No such user"
 msgstr ""
 
@@ -965,11 +985,11 @@ msgstr ""
 msgid "Please don't delete yourself, suicide is not the answer!"
 msgstr ""
 
-#: webadmin.cpp:691 webadmin.cpp:912 webadmin.cpp:1283
+#: webadmin.cpp:691 webadmin.cpp:913 webadmin.cpp:1292
 msgid "Edit User [{1}]"
 msgstr ""
 
-#: webadmin.cpp:695 webadmin.cpp:941
+#: webadmin.cpp:695 webadmin.cpp:945
 msgid "Edit Network [{1}]"
 msgstr ""
 
@@ -981,170 +1001,170 @@ msgstr ""
 msgid "Edit Channel [{1}]"
 msgstr ""
 
-#: webadmin.cpp:719
+#: webadmin.cpp:720
 msgid "Add Channel to Network [{1}] of User [{2}]"
 msgstr ""
 
-#: webadmin.cpp:724
+#: webadmin.cpp:725
 msgid "Add Channel"
 msgstr ""
 
-#: webadmin.cpp:731 webadmin.cpp:1471
+#: webadmin.cpp:732 webadmin.cpp:1481
 msgid "Auto Clear Chan Buffer"
 msgstr ""
 
-#: webadmin.cpp:733
+#: webadmin.cpp:734
 msgid "Automatically Clear Channel Buffer After Playback"
 msgstr ""
 
-#: webadmin.cpp:741
+#: webadmin.cpp:742
 msgid "Detached"
 msgstr ""
 
-#: webadmin.cpp:748
+#: webadmin.cpp:749
 msgid "Enabled"
 msgstr ""
 
-#: webadmin.cpp:772
+#: webadmin.cpp:773
 msgid "Channel name is a required argument"
 msgstr ""
 
-#: webadmin.cpp:781
+#: webadmin.cpp:782
 msgid "Channel [{1}] already exists"
 msgstr ""
 
-#: webadmin.cpp:788
+#: webadmin.cpp:789
 msgid "Could not add channel [{1}]"
 msgstr ""
 
-#: webadmin.cpp:836
+#: webadmin.cpp:837
 msgid "Channel was added/modified, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:920
+#: webadmin.cpp:921
 msgid "Edit Network [{1}] of User [{2}]"
 msgstr ""
 
-#: webadmin.cpp:978 webadmin.cpp:1044
+#: webadmin.cpp:982 webadmin.cpp:1050
 msgid ""
 "Network number limit reached. Ask an admin to increase the limit for you, or "
 "delete unneeded networks from Your Settings."
 msgstr ""
 
-#: webadmin.cpp:986
+#: webadmin.cpp:990
 msgid "Add Network for User [{1}]"
 msgstr ""
 
-#: webadmin.cpp:992
+#: webadmin.cpp:998
 msgid "Add Network"
 msgstr ""
 
-#: webadmin.cpp:1038
+#: webadmin.cpp:1044
 msgid "Network name is a required argument"
 msgstr ""
 
-#: webadmin.cpp:1159 webadmin.cpp:2021
+#: webadmin.cpp:1168 webadmin.cpp:2032
 msgid "Unable to reload module [{1}]: {2}"
 msgstr ""
 
-#: webadmin.cpp:1196
+#: webadmin.cpp:1205
 msgid "Network was added/modified, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1225
+#: webadmin.cpp:1234
 msgid "That network doesn't exist for this user"
 msgstr ""
 
-#: webadmin.cpp:1242
+#: webadmin.cpp:1251
 msgid "Network was deleted, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1256
+#: webadmin.cpp:1265
 msgid "That channel doesn't exist for this network"
 msgstr ""
 
-#: webadmin.cpp:1265
+#: webadmin.cpp:1274
 msgid "Channel was deleted, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1290
+#: webadmin.cpp:1300
 msgid "Clone User [{1}]"
 msgstr ""
 
-#: webadmin.cpp:1473
+#: webadmin.cpp:1483
 msgid ""
 "Automatically Clear Channel Buffer After Playback (the default value for new "
 "channels)"
 msgstr ""
 
-#: webadmin.cpp:1483
+#: webadmin.cpp:1493
 msgid "Multi Clients"
 msgstr ""
 
-#: webadmin.cpp:1490
+#: webadmin.cpp:1500
 msgid "Append Timestamps"
 msgstr ""
 
-#: webadmin.cpp:1497
+#: webadmin.cpp:1507
 msgid "Prepend Timestamps"
 msgstr ""
 
-#: webadmin.cpp:1505
+#: webadmin.cpp:1515
 msgid "Deny LoadMod"
 msgstr ""
 
-#: webadmin.cpp:1512
+#: webadmin.cpp:1522
 msgid "Admin"
 msgstr ""
 
-#: webadmin.cpp:1522
+#: webadmin.cpp:1532
 msgid "Deny SetBindHost"
 msgstr ""
 
-#: webadmin.cpp:1530
+#: webadmin.cpp:1540
 msgid "Auto Clear Query Buffer"
 msgstr ""
 
-#: webadmin.cpp:1532
+#: webadmin.cpp:1542
 msgid "Automatically Clear Query Buffer After Playback"
 msgstr ""
 
-#: webadmin.cpp:1556
+#: webadmin.cpp:1566
 msgid "Invalid Submission: User {1} already exists"
 msgstr ""
 
-#: webadmin.cpp:1578 webadmin.cpp:1589
+#: webadmin.cpp:1588 webadmin.cpp:1599
 msgid "Invalid submission: {1}"
 msgstr ""
 
-#: webadmin.cpp:1584
+#: webadmin.cpp:1594
 msgid "User was added, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1595
+#: webadmin.cpp:1605
 msgid "User was edited, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1753
+#: webadmin.cpp:1763
 msgid "Choose either IPv4 or IPv6 or both."
 msgstr ""
 
-#: webadmin.cpp:1770
+#: webadmin.cpp:1780
 msgid "Choose either IRC or HTTP or both."
 msgstr ""
 
-#: webadmin.cpp:1783 webadmin.cpp:1819
+#: webadmin.cpp:1793 webadmin.cpp:1829
 msgid "Port was changed, but config file was not written"
 msgstr ""
 
-#: webadmin.cpp:1809
+#: webadmin.cpp:1819
 msgid "Invalid request."
 msgstr ""
 
-#: webadmin.cpp:1823
+#: webadmin.cpp:1833
 msgid "The specified listener was not found."
 msgstr ""
 
-#: webadmin.cpp:2050
+#: webadmin.cpp:2061
 msgid "Settings were changed, but config file was not written"
 msgstr ""
diff --git a/modules/po/webadmin.ru.po b/modules/po/webadmin.ru.po
index bbf2ff32..6423e77e 100644
--- a/modules/po/webadmin.ru.po
+++ b/modules/po/webadmin.ru.po
@@ -71,19 +71,19 @@ msgstr "Сохранять в файл конфигурации"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:67
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:399
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:270
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:282
 msgid "Module {1}"
 msgstr "Модуль {1}"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:75
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:408
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:278
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:290
 msgid "Save and return"
 msgstr "Сохранить и вернуться"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_chan.tmpl:76
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:409
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:279
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:291
 msgid "Save and continue"
 msgstr "Сохранить и продолжить"
 
@@ -100,7 +100,7 @@ msgid "Listen Port(s)"
 msgstr "Слушающие порты"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:13
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:90
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:102
 msgid "Port"
 msgstr "Порт"
 
@@ -109,7 +109,7 @@ msgid "BindHost"
 msgstr "Хост"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:15
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:91
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:103
 msgid "SSL"
 msgstr "SSL"
 
@@ -140,7 +140,7 @@ msgstr "Удалить"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:53
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:140
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:204
 msgid "Del"
 msgstr "Удалить"
 
@@ -159,7 +159,8 @@ msgstr "Текущий"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:72
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:123
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:173
+#: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:343
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:185
 #: modules/po/../data/webadmin/tmpl/listusers.tmpl:15
 msgid "Add"
 msgstr "Добавить"
@@ -266,20 +267,20 @@ msgstr "Глобальные модули"
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:170
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:125
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:168
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:176
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:216
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:188
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:228
 msgid "Name"
 msgstr "Название"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:171
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:169
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:217
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:229
 msgid "Arguments"
 msgstr "Параметры"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:172
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:170
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:218
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:230
 msgid "Description"
 msgstr "Описание"
 
@@ -294,7 +295,7 @@ msgstr "Загружено пользо&shy;вателями"
 
 #: modules/po/../data/webadmin/tmpl/settings.tmpl:231
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:419
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:175
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:187
 msgid "Save"
 msgstr "Сохранить"
 
@@ -434,7 +435,7 @@ msgid "← Add a network (opens in same page)"
 msgstr "← Новая сеть (открывается на той же странице)"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:140
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:204
 #: modules/po/../data/webadmin/tmpl/listusers.tmpl:27
 msgid "Edit"
 msgstr "Изменить"
@@ -454,17 +455,17 @@ msgstr ""
 "Здесь после создания пользователя вы сможете добавлять и изменять сети."
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:162
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:210
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:222
 msgid "Modules"
 msgstr "Модули"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:171
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:219
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:231
 msgid "Loaded globally"
 msgstr "Загру&shy;жено гло&shy;бально"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_user.tmpl:225
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:164
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:176
 msgid "Channels"
 msgstr "Каналы"
 
@@ -735,29 +736,48 @@ msgid "Connect to IRC &amp; automatically re-connect"
 msgstr "Подключаться к IRC и автоматически переподключаться"
 
 #: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:77
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:84
+msgid "Trust all certs:"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:79
+msgid ""
+"Disable certificate validation (takes precedence over TrustPKI). INSECURE!"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:83
+msgid "Trust the PKI:"
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:85
+msgid ""
+"Setting this to false will trust only certificates you added fingerprints "
+"for."
+msgstr ""
+
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:89
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:96
 msgid "Servers of this IRC network:"
 msgstr "Серверы этой сети IRC:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:81
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:93
 msgid "One server per line, “host [[+]port] [password]”, + means SSL"
 msgstr ""
 "По одному серверу в каждой строке в формате «хост [[+]порт] [пароль]», + "
 "означает SSL"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:89
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:101
 msgid "Hostname"
 msgstr "Хост"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:92
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:104
 msgid "Password"
 msgstr "Пароль"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:104
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:116
 msgid "SHA-256 fingerprints of trusted SSL certificates of this IRC network:"
 msgstr "Отпечатки пальцев SHA-256 доверенных сертификатов SSL этой сети IRC:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:108
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:120
 msgid ""
 "When these certificates are encountered, checks for hostname, expiration "
 "date, CA are skipped"
@@ -766,11 +786,11 @@ msgstr ""
 "продолжено независимо от времени окончания сертификата, наличия подписи "
 "известным центром сертификации и имени хоста"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:112
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:124
 msgid "Flood protection:"
 msgstr "Защита от флуда:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:115
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:127
 msgid ""
 "You might enable the flood protection. This prevents “excess flood” errors, "
 "which occur, when your IRC bot is command flooded or spammed. After changing "
@@ -780,31 +800,31 @@ msgstr ""
 "flood», которые случаются, когда ZNC шлёт данные на сервер слишком быстро. "
 "После изменения переподключите ZNC к серверу."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:118
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:130
 msgctxt "Flood Protection"
 msgid "Enabled"
 msgstr "Включена"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:122
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:134
 msgid "Flood protection rate:"
 msgstr "Скорость флуда:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:125
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:137
 msgid ""
 "The number of seconds per line. After changing this, reconnect ZNC to server."
 msgstr ""
 "Сколько секунд ждать между отправкой двух строк. После изменения "
 "переподключите ZNC к серверу."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:128
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:140
 msgid "{1} seconds per line"
 msgstr "{1} секунд на строку"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:132
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:144
 msgid "Flood protection burst:"
 msgstr "Взрыв флуда:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:135
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:147
 msgid ""
 "Defines the number of lines, which can be sent immediately. After changing "
 "this, reconnect ZNC to server."
@@ -812,15 +832,15 @@ msgstr ""
 "Количество строк, которые могут посланы на сервер без задержки. После "
 "изменения переподключите ZNC к серверу."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:138
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:150
 msgid "{1} lines can be sent immediately"
 msgstr "{1} строк отсылаются без задержки"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:142
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:154
 msgid "Channel join delay:"
 msgstr "Задержка входа на каналы:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:145
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:157
 msgid ""
 "Defines the delay in seconds, until channels are joined after getting "
 "connected."
@@ -828,52 +848,52 @@ msgstr ""
 "Время в секундах, которое надо ждать между установлением соединения и "
 "заходом на каналы."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:148
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:160
 msgid "{1} seconds"
 msgstr "{1} секунд"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:153
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:165
 msgid "Character encoding used between ZNC and IRC server."
 msgstr "Кодировка символов, используемая между ZNC и сервером IRC."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:154
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:166
 msgid "Server encoding:"
 msgstr "Кодировка сервера:"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:166
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:178
 msgid ""
 "You will be able to add + modify channels here after you created the network."
 msgstr "Здесь после создания сети вы сможете добавлять и изменять каналы."
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:177
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:189
 msgid "CurModes"
 msgstr "Текущие режимы"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:178
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:190
 msgid "DefModes"
 msgstr "Режимы по умолчанию"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:179
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:191
 msgid "BufferSize"
 msgstr "Размер буфера"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:180
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:192
 msgid "Options"
 msgstr "Опции"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:182
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:194
 msgid "← Add a channel (opens in same page)"
 msgstr "← Новый канал (открывается на той же странице)"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:220
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:232
 msgid "Loaded by user"
 msgstr "Загру&shy;жено пользо&shy;вателем"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:281
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:293
 msgid "Add Network and return"
 msgstr "Добавить сеть и вернуться"
 
-#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:282
+#: modules/po/../data/webadmin/tmpl/add_edit_network.tmpl:294
 msgid "Add Network and continue"
 msgstr "Добавить сеть и продолжить"
 
@@ -980,19 +1000,19 @@ msgstr "Подтверждение удаления пользователя"
 msgid "Are you sure you want to delete user “{1}”?"
 msgstr "Вы действительно хотите удалить пользователя «{1}»?"
 
-#: webadmin.cpp:91 webadmin.cpp:1833
+#: webadmin.cpp:91 webadmin.cpp:1843
 msgid "Global Settings"
 msgstr "Глобальные настройки"
 
-#: webadmin.cpp:92
+#: webadmin.cpp:93
 msgid "Your Settings"
 msgstr "Мои настройки"
 
-#: webadmin.cpp:94 webadmin.cpp:1645
+#: webadmin.cpp:94 webadmin.cpp:1655
 msgid "Traffic Info"
 msgstr "Трафик"
 
-#: webadmin.cpp:97 webadmin.cpp:1624
+#: webadmin.cpp:97 webadmin.cpp:1634
 msgid "Manage Users"
 msgstr "Пользователи"
 
@@ -1004,7 +1024,7 @@ msgstr "Ошибка: необходимо имя пользователя"
 msgid "Invalid Submission [Passwords do not match]"
 msgstr "Ошибка: пароли не совпадают"
 
-#: webadmin.cpp:383 webadmin.cpp:411 webadmin.cpp:1152 webadmin.cpp:2015
+#: webadmin.cpp:383 webadmin.cpp:411 webadmin.cpp:1161 webadmin.cpp:2025
 msgid "Unable to load module [{1}]: {2}"
 msgstr "Не могу загрузить модуль [{1}]: {2}"
 
@@ -1013,7 +1033,7 @@ msgid "Unable to load module [{1}] with arguments [{2}]"
 msgstr "Не могу загрузить модуль [{1}] с аргументами [{2}]"
 
 #: webadmin.cpp:497 webadmin.cpp:601 webadmin.cpp:626 webadmin.cpp:648
-#: webadmin.cpp:682 webadmin.cpp:1219
+#: webadmin.cpp:682 webadmin.cpp:1228
 msgid "No such user"
 msgstr "Нет такого пользователя"
 
@@ -1029,11 +1049,11 @@ msgstr "Нет такого канала"
 msgid "Please don't delete yourself, suicide is not the answer!"
 msgstr "Пожалуйста, не удаляйте себя, самоубийство — не ответ!"
 
-#: webadmin.cpp:691 webadmin.cpp:912 webadmin.cpp:1283
+#: webadmin.cpp:691 webadmin.cpp:913 webadmin.cpp:1292
 msgid "Edit User [{1}]"
 msgstr "Пользователь [{1}]"
 
-#: webadmin.cpp:695 webadmin.cpp:941
+#: webadmin.cpp:695 webadmin.cpp:945
 msgid "Edit Network [{1}]"
 msgstr "Сеть [{1}]"
 
@@ -1045,51 +1065,51 @@ msgstr "Канал [{1}] в сети [{2}] пользователя [{3}]"
 msgid "Edit Channel [{1}]"
 msgstr "Канал [{1}]"
 
-#: webadmin.cpp:719
+#: webadmin.cpp:720
 msgid "Add Channel to Network [{1}] of User [{2}]"
 msgstr "Новый канал для сети [{1}] пользователя [{2}]"
 
-#: webadmin.cpp:724
+#: webadmin.cpp:725
 msgid "Add Channel"
 msgstr "Новый канал"
 
-#: webadmin.cpp:731 webadmin.cpp:1471
+#: webadmin.cpp:732 webadmin.cpp:1481
 msgid "Auto Clear Chan Buffer"
 msgstr "Автоматически очищать буфер канала"
 
-#: webadmin.cpp:733
+#: webadmin.cpp:734
 msgid "Automatically Clear Channel Buffer After Playback"
 msgstr "Автоматически очищать буфер канала после воспроизведения"
 
-#: webadmin.cpp:741
+#: webadmin.cpp:742
 msgid "Detached"
 msgstr "Отделён"
 
-#: webadmin.cpp:748
+#: webadmin.cpp:749
 msgid "Enabled"
 msgstr "Включена"
 
-#: webadmin.cpp:772
+#: webadmin.cpp:773
 msgid "Channel name is a required argument"
 msgstr "Необходимо имя канала"
 
-#: webadmin.cpp:781
+#: webadmin.cpp:782
 msgid "Channel [{1}] already exists"
 msgstr "Канал [{1}] уже существует"
 
-#: webadmin.cpp:788
+#: webadmin.cpp:789
 msgid "Could not add channel [{1}]"
 msgstr "Не могу добавить канал [{1}]"
 
-#: webadmin.cpp:836
+#: webadmin.cpp:837
 msgid "Channel was added/modified, but config file was not written"
 msgstr "Канал добавлен/изменён, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:920
+#: webadmin.cpp:921
 msgid "Edit Network [{1}] of User [{2}]"
 msgstr "Сеть [{1}] пользователя [{2}]"
 
-#: webadmin.cpp:978 webadmin.cpp:1044
+#: webadmin.cpp:982 webadmin.cpp:1050
 msgid ""
 "Network number limit reached. Ask an admin to increase the limit for you, or "
 "delete unneeded networks from Your Settings."
@@ -1097,47 +1117,47 @@ msgstr ""
 "Достигнуто ограничение на количество сетей. Попросите администратора поднять "
 "вам лимит или удалите ненужные сети в «Моих настройках»"
 
-#: webadmin.cpp:986
+#: webadmin.cpp:990
 msgid "Add Network for User [{1}]"
 msgstr "Новая сеть пользователя [{1}]"
 
-#: webadmin.cpp:992
+#: webadmin.cpp:998
 msgid "Add Network"
 msgstr "Новая сеть"
 
-#: webadmin.cpp:1038
+#: webadmin.cpp:1044
 msgid "Network name is a required argument"
 msgstr "Необходимо имя сети"
 
-#: webadmin.cpp:1159 webadmin.cpp:2021
+#: webadmin.cpp:1168 webadmin.cpp:2032
 msgid "Unable to reload module [{1}]: {2}"
 msgstr "Не могу перегрузить модуль [{1}]: {2}"
 
-#: webadmin.cpp:1196
+#: webadmin.cpp:1205
 msgid "Network was added/modified, but config file was not written"
 msgstr "Сеть добавлена/изменена, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1225
+#: webadmin.cpp:1234
 msgid "That network doesn't exist for this user"
 msgstr "У этого пользователя нет такой сети"
 
-#: webadmin.cpp:1242
+#: webadmin.cpp:1251
 msgid "Network was deleted, but config file was not written"
 msgstr "Сеть удалена, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1256
+#: webadmin.cpp:1265
 msgid "That channel doesn't exist for this network"
 msgstr "В этой сети нет такого канала"
 
-#: webadmin.cpp:1265
+#: webadmin.cpp:1274
 msgid "Channel was deleted, but config file was not written"
 msgstr "Канал удалён, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1290
+#: webadmin.cpp:1300
 msgid "Clone User [{1}]"
 msgstr "Клон пользователя [{1}]"
 
-#: webadmin.cpp:1473
+#: webadmin.cpp:1483
 msgid ""
 "Automatically Clear Channel Buffer After Playback (the default value for new "
 "channels)"
@@ -1145,75 +1165,74 @@ msgstr ""
 "Автоматически очищать буфер канала после воспроизведения (значение по "
 "умолчанию для новых каналов)"
 
-#: webadmin.cpp:1483
+#: webadmin.cpp:1493
 msgid "Multi Clients"
 msgstr "Много клиентов"
 
-#: webadmin.cpp:1490
+#: webadmin.cpp:1500
 msgid "Append Timestamps"
 msgstr "Метка времени в конце"
 
-#: webadmin.cpp:1497
+#: webadmin.cpp:1507
 msgid "Prepend Timestamps"
 msgstr "Метка времени в начале"
 
-#: webadmin.cpp:1505
+#: webadmin.cpp:1515
 msgid "Deny LoadMod"
 msgstr "Запрет загрузки модулей"
 
-#: webadmin.cpp:1512
+#: webadmin.cpp:1522
 msgid "Admin"
 msgstr "Администратор"
 
-#: webadmin.cpp:1522
+#: webadmin.cpp:1532
 msgid "Deny SetBindHost"
 msgstr "Запрет смены хоста"
 
-#: webadmin.cpp:1530
+#: webadmin.cpp:1540
 msgid "Auto Clear Query Buffer"
 msgstr "Автоматически очищать буфер личных сообщений"
 
-#: webadmin.cpp:1532
+#: webadmin.cpp:1542
 msgid "Automatically Clear Query Buffer After Playback"
 msgstr "Автоматически очищать буфер личных сообщений после воспроизведения"
 
-#: webadmin.cpp:1556
+#: webadmin.cpp:1566
 msgid "Invalid Submission: User {1} already exists"
 msgstr "Ошибка: пользователь {1} уже существует"
 
-#: webadmin.cpp:1578 webadmin.cpp:1589
+#: webadmin.cpp:1588 webadmin.cpp:1599
 msgid "Invalid submission: {1}"
 msgstr "Ошибка: {1}"
 
-#: webadmin.cpp:1584
+#: webadmin.cpp:1594
 msgid "User was added, but config file was not written"
 msgstr "Пользователь добавлен, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1595
+#: webadmin.cpp:1605
 msgid "User was edited, but config file was not written"
 msgstr "Пользователь изменён, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1753
+#: webadmin.cpp:1763
 msgid "Choose either IPv4 or IPv6 or both."
 msgstr "Выберите IPv4, IPv6 или и то, и другое."
 
-#: webadmin.cpp:1770
+#: webadmin.cpp:1780
 msgid "Choose either IRC or HTTP or both."
 msgstr "Выберите IRC, HTTP или и то, и другое."
 
-#: webadmin.cpp:1783 webadmin.cpp:1819
+#: webadmin.cpp:1793 webadmin.cpp:1829
 msgid "Port was changed, but config file was not written"
 msgstr "Порт изменён, но записать конфигурацию в файл не удалось"
 
-#: webadmin.cpp:1809
+#: webadmin.cpp:1819
 msgid "Invalid request."
 msgstr "Некорректный запрос."
 
-#: webadmin.cpp:1823
+#: webadmin.cpp:1833
 msgid "The specified listener was not found."
 msgstr "Указанный порт не найден."
 
-#: webadmin.cpp:2050
+#: webadmin.cpp:2061
 msgid "Settings were changed, but config file was not written"
 msgstr "Настройки изменены, но записать конфигурацию в файл не удалось"
-