adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-31 22:13:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.7.x

Browse Source
This commit is contained in:
Alexey Sokolov
2018-04-19 23:51:10 +01:00
parent 6922476fcf 9f196ee48b
commit 2e6e2972fc
6 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/po/listsockets.ru.po
+1 -1
View File
@@ -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"
modules/po/send_raw.ru.po
+1 -1
View File
@@ -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:"
src/Client.cpp
-1
View File
@@ -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);
src/po/znc.de.po
+7 -7
View File
@@ -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] ""
src/po/znc.pot
+7 -7
View File
@@ -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] ""
src/po/znc.ru.po
+8 -8
View File
@@ -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] ""
@@ -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"