From 55d44c21a7ce85fc1b8eb0ac316eb6d06dec5134 Mon Sep 17 00:00:00 2001
From: Nobody Atoll <38334355+throwaway-user@users.noreply.github.com>
Date: Thu, 12 Apr 2018 18:34:15 -0400
Subject: [PATCH 1/3] Fix echo-message regression from 1.6.x

This patch prevents PRIVMSGs from clients frmo being echoed to other clients if their target has the status prefix.
---
 src/Client.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Client.cpp b/src/Client.cpp
index c8c7c23c..ac210f3b 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -1241,7 +1241,6 @@ bool CClient::OnTextMessage(CTextMessage& Message) {
         }
 
         if (sTarget.TrimPrefix(m_pUser->GetStatusPrefix())) {
-            EchoMessage(Message);
             if (sTarget.Equals("status")) {
                 CString sMsg = Message.GetText();
                 UserCommand(sMsg);

From 19a53c0994e38bdbf5fbf49721469048b25d81e8 Mon Sep 17 00:00:00 2001
From: ZNC-Jenkins bot <jenkins@znc.in>
Date: Fri, 13 Apr 2018 08:27:28 +0100
Subject: [PATCH 2/3] Update translations from Crowdin (#1509)

---
 modules/po/listsockets.ru.po | 2 +-
 modules/po/send_raw.ru.po    | 2 +-
 src/po/znc.ru.po             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/po/listsockets.ru.po b/modules/po/listsockets.ru.po
index 29dfa0a7..00b1662f 100644
--- a/modules/po/listsockets.ru.po
+++ b/modules/po/listsockets.ru.po
@@ -42,7 +42,7 @@ msgstr "Локальное"
 #: modules/po/../data/listsockets/tmpl/index.tmpl:12 listsockets.cpp:221
 #: listsockets.cpp:242
 msgid "Remote"
-msgstr "Удаленное"
+msgstr "Удалённое"
 
 #: modules/po/../data/listsockets/tmpl/index.tmpl:13
 msgid "Data In"
diff --git a/modules/po/send_raw.ru.po b/modules/po/send_raw.ru.po
index e40b35d9..b38bd601 100644
--- a/modules/po/send_raw.ru.po
+++ b/modules/po/send_raw.ru.po
@@ -24,7 +24,7 @@ msgstr "Пользователь:"
 
 #: modules/po/../data/send_raw/tmpl/index.tmpl:15
 msgid "To change user, click to Network selector"
-msgstr "Чтобы изменить пользователя, щелкните на селектор сети"
+msgstr "Чтобы изменить пользователя, щёлкните на селектор сети"
 
 #: modules/po/../data/send_raw/tmpl/index.tmpl:19
 msgid "User/Network:"
diff --git a/src/po/znc.ru.po b/src/po/znc.ru.po
index bc60f4a7..463b1fab 100644
--- a/src/po/znc.ru.po
+++ b/src/po/znc.ru.po
@@ -1208,7 +1208,7 @@ msgstr "Использование: DelPort <port> <ipv4|ipv6|all> [bindhost]"
 
 #: ClientCommand.cpp:1649
 msgid "Deleted Port"
-msgstr "Удален порт"
+msgstr "Удалён порт"
 
 #: ClientCommand.cpp:1651
 msgid "Unable to find a matching port"

From 9f196ee48b31f46cffae8826e76cc287ebb7c4bc Mon Sep 17 00:00:00 2001
From: ZNC-Jenkins bot <jenkins@znc.in>
Date: Mon, 16 Apr 2018 21:04:05 +0100
Subject: [PATCH 3/3] Update translations from Crowdin (#1515)

---
 src/po/znc.de.po | 14 +++++++-------
 src/po/znc.pot   | 14 +++++++-------
 src/po/znc.ru.po | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/po/znc.de.po b/src/po/znc.de.po
index aec9b13a..5334824a 100644
--- a/src/po/znc.de.po
+++ b/src/po/znc.de.po
@@ -241,35 +241,35 @@ msgstr ""
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1264
+#: Client.cpp:1263
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1317 Client.cpp:1323
+#: Client.cpp:1316 Client.cpp:1322
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1337
+#: Client.cpp:1336
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1344 Client.cpp:1366 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1343 Client.cpp:1365 ClientCommand.cpp:129 ClientCommand.cpp:151
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1347 ClientCommand.cpp:132
+#: Client.cpp:1346 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1359
+#: Client.cpp:1358
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1369 ClientCommand.cpp:154
+#: Client.cpp:1368 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
diff --git a/src/po/znc.pot b/src/po/znc.pot
index 0badeab9..2b974ff3 100644
--- a/src/po/znc.pot
+++ b/src/po/znc.pot
@@ -228,35 +228,35 @@ msgstr ""
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1264
+#: Client.cpp:1263
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1317 Client.cpp:1323
+#: Client.cpp:1316 Client.cpp:1322
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1337
+#: Client.cpp:1336
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1344 Client.cpp:1366 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1343 Client.cpp:1365 ClientCommand.cpp:129 ClientCommand.cpp:151
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1347 ClientCommand.cpp:132
+#: Client.cpp:1346 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1359
+#: Client.cpp:1358
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1369 ClientCommand.cpp:154
+#: Client.cpp:1368 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
diff --git a/src/po/znc.ru.po b/src/po/znc.ru.po
index 463b1fab..d1681337 100644
--- a/src/po/znc.ru.po
+++ b/src/po/znc.ru.po
@@ -243,19 +243,19 @@ msgstr ""
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1264
+#: Client.cpp:1263
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1317 Client.cpp:1323
+#: Client.cpp:1316 Client.cpp:1322
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1337
+#: Client.cpp:1336
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1344 Client.cpp:1366 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1343 Client.cpp:1365 ClientCommand.cpp:129 ClientCommand.cpp:151
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
@@ -263,7 +263,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: Client.cpp:1347 ClientCommand.cpp:132
+#: Client.cpp:1346 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
@@ -271,11 +271,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: Client.cpp:1359
+#: Client.cpp:1358
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1369 ClientCommand.cpp:154
+#: Client.cpp:1368 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""