adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-08 01:43:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:znc/znc

Browse Source
This commit is contained in:
Alexey Sokolov
2020-10-04 21:08:03 +01:00
parent d505a6d4db 1b96a06719
commit 7035b378a8
25 changed files with 86 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/po/sasl.bg_BG.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Bulgarian\n"
"Language: bg_BG\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.de_DE.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: German\n"
"Language: de_DE\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr "SASL"
@@ -172,7 +172,7 @@ msgstr "{1} Mechanismus erfolgreich."
msgid "{1} mechanism failed."
msgstr "{1} Mechanismus fehlgeschlagen."
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.el_GR.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Greek\n"
"Language: el_GR\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.es_ES.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Spanish\n"
"Language: es_ES\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr "SASL"
@@ -171,7 +171,7 @@ msgstr "Mecanismo {1} conseguido."
msgid "{1} mechanism failed."
msgstr "Mecanismo {1} fallido."
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.fr_FR.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: French\n"
"Language: fr_FR\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.id_ID.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Indonesian\n"
"Language: id_ID\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.it_IT.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Italian\n"
"Language: it_IT\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr "SASL"
@@ -172,7 +172,7 @@ msgstr "{1} meccanismo riuscito."
msgid "{1} mechanism failed."
msgstr "{1} meccanismo fallito."
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.nl_NL.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Dutch\n"
"Language: nl_NL\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr "SASL"
@@ -172,7 +172,7 @@ msgstr "{1} mechanisme gelukt."
msgid "{1} mechanism failed."
msgstr "{1} mechanisme gefaalt."
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.pl_PL.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"Language-Team: Polish\n"
"Language: pl_PL\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr "SASL"
@@ -173,7 +173,7 @@ msgstr "Mechanizm {1} zadziałał."
msgid "{1} mechanism failed."
msgstr "Mechanizm {1} nie powiódł się."
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.pot
+2 -2
View File
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -158,7 +158,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.pt_BR.po
+2 -2
View File
@@ -12,7 +12,7 @@ msgstr ""
"Language-Team: Portuguese, Brazilian\n"
"Language: pt_BR\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -167,7 +167,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/po/sasl.ru_RU.po
+2 -2
View File
@@ -14,7 +14,7 @@ msgstr ""
"Language-Team: Russian\n"
"Language: ru_RU\n"
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:301
#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:303
msgid "SASL"
msgstr ""
@@ -169,7 +169,7 @@ msgstr ""
msgid "{1} mechanism failed."
msgstr ""
#: sasl.cpp:346
#: sasl.cpp:348
msgid ""
"Adds support for sasl authentication capability to authenticate to an IRC "
"server"
modules/sasl.cpp
+2
View File
@@ -283,6 +283,8 @@ class CSASLMod : public CModule {
m_bAuthenticated = true;
GetNetwork()->GetIRCSock()->ResumeCap();
DEBUG("sasl: Received 907 -- We are already registered");
} else if (msg.GetCode() == 908) {
return HALT;
} else {
return CONTINUE;
}
src/po/znc.bg_BG.po
+5 -5
View File
@@ -1818,25 +1818,25 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr ""
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr ""
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
msgstr ""
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
src/po/znc.de_DE.po
+5 -5
View File
@@ -1894,11 +1894,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Starte ZNC neu"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Kann den Hostnamen des Servers nicht auflösen"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1906,15 +1906,15 @@ msgstr ""
"Kann Binde-Hostnamen nicht auflösen. Versuche /znc ClearBindHost und /znc "
"ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr "Server hat nur eine IPv4-Adresse, aber Binde-Hostname ist nur IPv6"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr "Server hat nur eine IPv6-Adresse, aber Binde-Hostname ist nur IPv4"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
"Eine Verbindung hat ihre maximale Puffergrenze erreicht und wurde "
src/po/znc.el_GR.po
+5 -5
View File
@@ -1818,25 +1818,25 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr ""
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr ""
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
msgstr ""
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
src/po/znc.es_ES.po
+5 -5
View File
@@ -1873,11 +1873,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Reiniciar ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "No se puede resolver el hostname del servidor"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1885,15 +1885,15 @@ msgstr ""
"No se puede resolver el bindhost. Prueba /znc ClearBindHost y /znc "
"ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr "La dirección del servidor es solo-IPv4, pero el bindhost es solo-IPv6"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr "La dirección del servidor es solo-IPv6, pero el bindhost es solo-IPv4"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
"¡Algún socket ha alcanzado el límite de su búfer máximo y se ha cerrado!"
src/po/znc.fr_FR.po
+5 -5
View File
@@ -1885,11 +1885,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Redémarre ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Impossible de résoudre le nom de domaine"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1897,17 +1897,17 @@ msgstr ""
"Impossible de résoudre le nom de domaine de l'hôte. Essayez /znc "
"ClearBindHost et /znc ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
"L'adresse du serveur est IPv4 uniquement, mais l'hôte lié est IPv6 seulement"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
"L'adresse du serveur est IPv6 uniquement, mais l'hôte lié est IPv4 seulement"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr "Un socket a atteint sa limite maximale de tampon et s'est fermé !"
src/po/znc.id_ID.po
+5 -5
View File
@@ -1825,25 +1825,25 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr ""
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr ""
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
msgstr ""
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
src/po/znc.it_IT.po
+5 -5
View File
@@ -1883,11 +1883,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Riavvia lo ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Impossibile risolvere il nome dell'host del server"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1895,15 +1895,15 @@ msgstr ""
"Impossibile risolvere l'hostname allegato. Prova /znc ClearBindHost e /znc "
"ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr "L'indirizzo del server è IPv4-only, ma il bindhost è IPv6-only"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr "L'indirizzo del server è IPv6-only, ma il bindhost è IPv4-only"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
"Alcuni socket hanno raggiunto il limite massimo di buffer e sono stati "
src/po/znc.nl_NL.po
+5 -5
View File
@@ -1889,11 +1889,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Herstart ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Kan server hostnaam niet oplossen"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1901,15 +1901,15 @@ msgstr ""
"Kan bindhostnaam niet oplossen. Probeer /znc ClearBindHost en /znc "
"ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr "Server adres is alleen IPv4, maar de bindhost is alleen IPv6"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr "Server adres is alleen IPv6, maar de bindhost is alleen IPv4"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
"Een of andere socket heeft de maximale buffer limiet bereikt en was "
src/po/znc.pl_PL.po
+5 -5
View File
@@ -1893,11 +1893,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Uruchamia ponownie ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Nie można rozwiązać nazwy hosta serwera"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1905,15 +1905,15 @@ msgstr ""
"Nie mogę rozwiązać nazwy hosta. Spróbuj /znc ClearBindHost oraz /znc "
"ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr "Adres serwera jest tylko IPv4, ale podłączony host jest tylko IPv6"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr "Adres serwera jest tylko IPv6, ale podłączony host jest tylko IPv4"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
"Niektóre gniazda osiągnęły limit swego maksymalnego bufora i zostały "
src/po/znc.pot
+5 -5
View File
@@ -1809,25 +1809,25 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr ""
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr ""
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
msgstr ""
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""
src/po/znc.pt_BR.po
+5 -5
View File
@@ -1870,11 +1870,11 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr "Reinicia o ZNC"
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr "Não é possível resolver o nome do host do servidor"
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
@@ -1882,17 +1882,17 @@ msgstr ""
"Não é possível resolver o nome do host de ligação (BindHost). Tente /znc "
"ClearBindHost e /znc ClearUserBindHost"
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
"O endereço do servidor permite apenas IPv4, mas o bindhost é apenas IPv6"
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
"O endereço do servidor permite apenas IPv6, mas o bindhost é apenas IPv4"
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr "Algum socket atingiu seu limite máximo de buffer e foi fechado!"
src/po/znc.ru_RU.po
+5 -5
View File
@@ -1874,25 +1874,25 @@ msgctxt "helpcmd|Restart|desc"
msgid "Restart ZNC"
msgstr ""
#: Socket.cpp:342
#: Socket.cpp:336
msgid "Can't resolve server hostname"
msgstr ""
#: Socket.cpp:349
#: Socket.cpp:343
msgid ""
"Can't resolve bind hostname. Try /znc ClearBindHost and /znc "
"ClearUserBindHost"
msgstr ""
#: Socket.cpp:354
#: Socket.cpp:348
msgid "Server address is IPv4-only, but bindhost is IPv6-only"
msgstr ""
#: Socket.cpp:363
#: Socket.cpp:357
msgid "Server address is IPv6-only, but bindhost is IPv4-only"
msgstr ""
#: Socket.cpp:521
#: Socket.cpp:515
msgid "Some socket reached its max buffer limit and was closed!"
msgstr ""