iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.8.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2020-08-30 10:35:54 +01:00
parent 1b53306424 9f62facd04
commit b0d7a07089
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/data/webadmin/tmpl/del_network.tmpl
View File

@@ -13,7 +13,7 @@
<input type="hidden" name="name" value="<? VAR Network ?>" />
<div class="yesnobutton"><input type="submit" value="<? FORMAT "Yes" ?>"/></div>
</form>
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>listusers" method="get">
<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>edituser?user=<? VAR Username ?>" method="get">
<div class="yesnobutton"><input type="submit" value="<? FORMAT "No" ?>"/></div>
</form>
</div>

8
src/po/znc.pot
View File

@@ -62,7 +62,11 @@ msgstr ""
msgid "Invalid port"
msgstr ""
<<<<<<< HEAD
#: znc.cpp:1813 ClientCommand.cpp:1655
=======
#: znc.cpp:1821 ClientCommand.cpp:1655
>>>>>>> 1.8.x
msgid "Unable to bind: {1}"
msgstr ""
@@ -234,7 +238,11 @@ msgstr ""
msgid "Usage: /attach <#chans>"
msgstr ""
<<<<<<< HEAD
#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
=======
#: Client.cpp:1344 Client.cpp:1366 ClientCommand.cpp:129 ClientCommand.cpp:151
>>>>>>> 1.8.x
#: ClientCommand.cpp:423 ClientCommand.cpp:450
msgid "There was {1} channel matching [{2}]"
msgid_plural "There were {1} channels matching [{2}]"