From d15b8385041aca3edb122d5539700dbfa9678b11 Mon Sep 17 00:00:00 2001
From: Jos Ahrens <buughost@gmail.com>
Date: Sun, 23 Dec 2018 18:23:59 +0000
Subject: [PATCH 1/2] ctcp: Distinguish Channel CTCP Requests and Replies

Fixes #1624
---
 src/IRCSock.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index 259881dc..83584d85 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -429,7 +429,12 @@ bool CIRCSock::OnCTCPMessage(CCTCPMessage& Message) {
         if (pChan) {
             Message.SetChan(pChan);
             FixupChanNick(Message.GetNick(), pChan);
-            IRCSOCKMODULECALL(OnChanCTCPMessage(Message), &bResult);
+            if (Message.IsReply()) {
+                IRCSOCKMODULECALL(OnCTCPReplyMessage(Message), &bResult);
+                return bResult;
+            } else {
+                IRCSOCKMODULECALL(OnChanCTCPMessage(Message), &bResult);
+            }
             if (bResult) return true;
         }
     }

From a6256e522a118d2260c836ada5bd23c803f8afaf Mon Sep 17 00:00:00 2001
From: ZNC-Jenkins <jenkins@znc.in>
Date: Wed, 9 Jan 2019 00:27:15 +0000
Subject: [PATCH 2/2] Update translations from Crowdin for de_DE es_ES fr_FR
 id_ID nl_NL pt_BR ru_RU

---
 src/po/znc.de_DE.po | 32 ++++++++++++++++----------------
 src/po/znc.es_ES.po | 32 ++++++++++++++++----------------
 src/po/znc.fr_FR.po | 32 ++++++++++++++++----------------
 src/po/znc.id_ID.po | 32 ++++++++++++++++----------------
 src/po/znc.nl_NL.po | 32 ++++++++++++++++----------------
 src/po/znc.pot      | 32 ++++++++++++++++----------------
 src/po/znc.pt_BR.po | 32 ++++++++++++++++----------------
 src/po/znc.ru_RU.po | 32 ++++++++++++++++----------------
 8 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/src/po/znc.de_DE.po b/src/po/znc.de_DE.po
index 3a7974b3..379925a4 100644
--- a/src/po/znc.de_DE.po
+++ b/src/po/znc.de_DE.po
@@ -116,70 +116,70 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Ein Modul hat den Verbindungsversuch abgebrochen"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Fehler vom Server: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr "ZNC scheint zu sich selbst verbunden zu sein, trenne die Verbindung..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr "Der Server {1} hat uns zu {2}:{3} umgeleitet mit der Begründung: {4}"
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Vielleicht möchtest du dies als einen neuen Server hinzufügen."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr ""
 "Kanal {1} ist mit einem anderen Kanal verbunden und wurde daher deaktiviert."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Zu SSL gewechselt (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Du hast die Verbindung getrennt: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "IRC-Verbindung getrennt. Verbinde erneut..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Kann nicht mit IRC verbinden ({1}). Versuche es erneut..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "IRC-Verbindung getrennt ({1}). Verbinde erneut..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Falls du diesem Zertifikat vertraust, mache /znc AddTrustedServerFingerprint "
 "{1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "Zeitüberschreitung der IRC-Verbindung. Verbinde erneut..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Verbindung abgelehnt. Verbinde erneut..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "Eine zu lange Zeile wurde vom IRC-Server empfangen!"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Kein freier Nick verfügbar"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Kein freier Nick gefunden"
 
diff --git a/src/po/znc.es_ES.po b/src/po/znc.es_ES.po
index a8c2285e..13da31d5 100644
--- a/src/po/znc.es_ES.po
+++ b/src/po/znc.es_ES.po
@@ -111,68 +111,68 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Algún módulo ha abortado el intento de conexión"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Error del servidor: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr "ZNC parece que se ha conectado a si mismo, desconectando..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr "Servidor {1} nos redirige a {2}:{3} por: {4}"
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Puede que quieras añadirlo como nuevo servidor."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr "El canal {1} está enlazado a otro canal y por eso está deshabilitado."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Cambiado a SSL (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Has salido: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Desconectado del IRC. Volviendo a conectar..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "No se puede conectar al IRC ({1}). Reintentándolo..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "Desconectado del IRC ({1}). Volviendo a conectar..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Si confías en este certificado, ejecuta /znc AddTrustedServerFingerprint {1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "Tiempo de espera agotado en la conexión al IRC. Reconectando..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Conexión rechazada. Reconectando..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "¡Recibida línea demasiado larga desde el servidor de IRC!"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "No hay ningún nick disponible"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "No se ha encontrado ningún nick disponible"
 
diff --git a/src/po/znc.fr_FR.po b/src/po/znc.fr_FR.po
index aacef981..6d27b368 100644
--- a/src/po/znc.fr_FR.po
+++ b/src/po/znc.fr_FR.po
@@ -117,69 +117,69 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Un module a annulé la tentative de connexion"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Erreur du serveur : {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr "ZNC semble s'être connecté à lui-même, déconnexion..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr "Le serveur {1} redirige vers {2}:{3} avec pour motif : {4}"
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Vous souhaitez peut-être l'ajouter comme un nouveau server."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr "Le salon {1} est lié à un autre salon et est par conséquent désactivé."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Passage à SSL (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Vous avez quitté : {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Déconnecté d'IRC. Reconnexion..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Échec de la connexion à IRC ({1}). Nouvel essai..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "Déconnecté de IRC ({1}). Reconnexion..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Si vous avez confiance en ce certificat, tapez /znc "
 "AddTrustedServerFingerprint {1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "La connexion à IRC a expiré. Reconnexion..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Connexion refusée. Reconnexion..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "Le serveur IRC a envoyé une ligne trop longue !"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Aucun pseudonyme n'est disponible"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Aucun pseudonyme disponible n'a été trouvé"
 
diff --git a/src/po/znc.id_ID.po b/src/po/znc.id_ID.po
index d89f2a3b..1346649a 100644
--- a/src/po/znc.id_ID.po
+++ b/src/po/znc.id_ID.po
@@ -113,69 +113,69 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Beberapa modul membatalkan upaya koneksi"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Kesalahan dari server: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr "ZNC tampaknya terhubung dengan sendiri, memutuskan..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr "Server {1} mengalihkan ke {2}: {3} dengan alasan: {4}"
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Mungkin anda ingin menambahkannya sebagai server baru."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr "Channel {1} terhubung ke channel lain dan karenanya dinonaktifkan."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Beralih ke SSL (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Anda keluar: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Terputus dari IRC. Menghubungkan..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Tidak dapat terhubung ke IRC ({1}). Mencoba lagi..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "Terputus dari IRC ({1}). Menghubungkan..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Jika anda mempercayai sertifikat ini, lakukan /znc "
 "AddTrustedServerFingerprint {1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "Koneksi IRC kehabisan waktu. Menghubungkan..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Koneksi tertolak. Menguhungkan..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "Menerima baris terlalu panjang dari server IRC!"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Tidak ada nick tersedia"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Tidak ada nick ditemukan"
 
diff --git a/src/po/znc.nl_NL.po b/src/po/znc.nl_NL.po
index efdabdcd..3f54c166 100644
--- a/src/po/znc.nl_NL.po
+++ b/src/po/znc.nl_NL.po
@@ -119,72 +119,72 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Een module heeft de verbindingspoging afgebroken"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Fout van server: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr ""
 "ZNC blijkt verbonden te zijn met zichzelf... De verbinding zal verbroken "
 "worden..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr "Server {1} stuurt ons door naar {2}:{3} met reden: {4}"
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Misschien wil je het toevoegen als nieuwe server."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr ""
 "Kanaal {1} is verbonden naar een andere kanaal en is daarom uitgeschakeld."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Omgeschakeld naar een veilige verbinding (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Je hebt het netwerk verlaten: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Verbinding met IRC verbroken. We proberen opnieuw te verbinden..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Kan niet verbinden met IRC ({1}). We proberen opnieuw te verbinden..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr ""
 "Verbinding met IRC verbroken ({1}). We proberen opnieuw te verbinden..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Als je dit certificaat vertrouwt, doe: /znc AddTrustedServerFingerprint {1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "IRC verbinding time-out. We proberen opnieuw te verbinden..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Verbinding geweigerd. We proberen opnieuw te verbinden..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "Een te lange regel ontvangen van de IRC server!"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Geen beschikbare bijnaam"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Geen beschikbare bijnaam gevonden"
 
diff --git a/src/po/znc.pot b/src/po/znc.pot
index 8daa3b2c..714b55ab 100644
--- a/src/po/znc.pot
+++ b/src/po/znc.pot
@@ -98,67 +98,67 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr ""
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr ""
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr ""
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr ""
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr ""
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr ""
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr ""
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr ""
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr ""
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr ""
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr ""
 
diff --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po
index 79a00b7e..f0be16c8 100644
--- a/src/po/znc.pt_BR.po
+++ b/src/po/znc.pt_BR.po
@@ -108,67 +108,67 @@ msgstr ""
 msgid "Some module aborted the connection attempt"
 msgstr "Algum módulo cancelou a tentativa de conexão"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Erro do servidor: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr ""
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr ""
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr ""
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr ""
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Você saiu: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Desconectado. Reconectando..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Não foi possível conectar-se ao IRC ({1}). Tentando novamente..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "Desconectado do IRC ({1}). Reconectando..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr ""
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "Conexão rejeitada. Reconectando..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr ""
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Não há apelidos livres disponíveis"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Nenhum apelido livre foi encontrado"
 
diff --git a/src/po/znc.ru_RU.po b/src/po/znc.ru_RU.po
index 3e4bfa5b..d38bcd84 100644
--- a/src/po/znc.ru_RU.po
+++ b/src/po/znc.ru_RU.po
@@ -113,69 +113,69 @@ msgstr "Не могу подключиться к {1}, т. к. ZNC собран
 msgid "Some module aborted the connection attempt"
 msgstr "Какой-то модуль оборвал попытку соединения"
 
-#: IRCSock.cpp:485
+#: IRCSock.cpp:490
 msgid "Error from server: {1}"
 msgstr "Ошибка от сервера: {1}"
 
-#: IRCSock.cpp:687
+#: IRCSock.cpp:692
 msgid "ZNC seems to be connected to itself, disconnecting..."
 msgstr "Похоже, ZNC подключён к самому себе, отключаюсь..."
 
-#: IRCSock.cpp:734
+#: IRCSock.cpp:739
 msgid "Server {1} redirects us to {2}:{3} with reason: {4}"
 msgstr ""
 
-#: IRCSock.cpp:738
+#: IRCSock.cpp:743
 msgid "Perhaps you want to add it as a new server."
 msgstr "Возможно, вам стоит добавить его в качестве нового сервера."
 
-#: IRCSock.cpp:968
+#: IRCSock.cpp:973
 msgid "Channel {1} is linked to another channel and was thus disabled."
 msgstr "Канал {1} отсылает к другому каналу и потому будет выключен."
 
-#: IRCSock.cpp:980
+#: IRCSock.cpp:985
 msgid "Switched to SSL (STARTTLS)"
 msgstr "Перешёл на SSL (STARTTLS)"
 
-#: IRCSock.cpp:1033
+#: IRCSock.cpp:1038
 msgid "You quit: {1}"
 msgstr "Вы вышли: {1}"
 
-#: IRCSock.cpp:1239
+#: IRCSock.cpp:1244
 msgid "Disconnected from IRC. Reconnecting..."
 msgstr "Отключён от IRC. Переподключаюсь..."
 
-#: IRCSock.cpp:1270
+#: IRCSock.cpp:1275
 msgid "Cannot connect to IRC ({1}). Retrying..."
 msgstr "Не могу подключиться к IRC ({1}). Пытаюсь ещё раз..."
 
-#: IRCSock.cpp:1273
+#: IRCSock.cpp:1278
 msgid "Disconnected from IRC ({1}). Reconnecting..."
 msgstr "Отключён от IRC ({1}). Переподключаюсь..."
 
-#: IRCSock.cpp:1303
+#: IRCSock.cpp:1308
 msgid "If you trust this certificate, do /znc AddTrustedServerFingerprint {1}"
 msgstr ""
 "Если вы доверяете этому сертификату, введите /znc "
 "AddTrustedServerFingerprint {1}"
 
-#: IRCSock.cpp:1320
+#: IRCSock.cpp:1325
 msgid "IRC connection timed out.  Reconnecting..."
 msgstr "Подключение IRC завершилось по тайм-ауту. Переподключаюсь..."
 
-#: IRCSock.cpp:1332
+#: IRCSock.cpp:1337
 msgid "Connection Refused.  Reconnecting..."
 msgstr "В соединении отказано. Переподключаюсь..."
 
-#: IRCSock.cpp:1340
+#: IRCSock.cpp:1345
 msgid "Received a too long line from the IRC server!"
 msgstr "От IRC-сервера получена слишком длинная строка!"
 
-#: IRCSock.cpp:1444
+#: IRCSock.cpp:1449
 msgid "No free nick available"
 msgstr "Не могу найти свободный ник"
 
-#: IRCSock.cpp:1452
+#: IRCSock.cpp:1457
 msgid "No free nick found"
 msgstr "Не могу найти свободный ник"