Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2019-07-17 08:33:16 +01:00
9 changed files with 24 additions and 24 deletions
+2 -2
View File
@@ -1824,7 +1824,7 @@ void CClient::HelpUser(const CString& sFilter) {
if (!m_pUser->DenyLoadMod()) {
AddCommandHelp("LoadMod",
t_s("[--type=global|user|network] <module>",
t_s("[--type=global|user|network] <module> [args]",
"helpcmd|LoadMod|args"),
t_s("Load a module", "helpcmd|LoadMod|desc"));
AddCommandHelp("UnloadMod",
@@ -1832,7 +1832,7 @@ void CClient::HelpUser(const CString& sFilter) {
"helpcmd|UnloadMod|args"),
t_s("Unload a module", "helpcmd|UnloadMod|desc"));
AddCommandHelp("ReloadMod",
t_s("[--type=global|user|network] <module>",
t_s("[--type=global|user|network] <module> [args]",
"helpcmd|ReloadMod|args"),
t_s("Reload a module", "helpcmd|ReloadMod|desc"));
if (m_pUser->IsAdmin()) {
+2 -2
View File
@@ -1496,7 +1496,7 @@ msgstr ""
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
@@ -1516,7 +1516,7 @@ msgstr ""
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
+4 -4
View File
@@ -1568,8 +1568,8 @@ msgstr "Zeige wie lange ZNC schon läuft"
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <Modul>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
msgctxt "helpcmd|LoadMod|desc"
@@ -1588,8 +1588,8 @@ msgstr "Entlade ein Modul"
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <Modul>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
msgctxt "helpcmd|ReloadMod|desc"
+4 -4
View File
@@ -1550,8 +1550,8 @@ msgstr "Mostrar cuanto tiempo lleva ZNC ejecutándose"
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <módulo>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
msgctxt "helpcmd|LoadMod|desc"
@@ -1570,8 +1570,8 @@ msgstr "Descargar un módulo"
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <módulo>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
msgctxt "helpcmd|ReloadMod|desc"
+2 -2
View File
@@ -1505,7 +1505,7 @@ msgstr ""
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
@@ -1525,7 +1525,7 @@ msgstr ""
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
+4 -4
View File
@@ -1513,8 +1513,8 @@ msgstr "Mostra da quanto tempo lo ZNC è in esecuzione"
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <modulo>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
msgctxt "helpcmd|LoadMod|desc"
@@ -1533,8 +1533,8 @@ msgstr "Scarica un modulo"
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgstr "[--type=global|user|network] <modulo>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
msgctxt "helpcmd|ReloadMod|desc"
+2 -2
View File
@@ -1487,7 +1487,7 @@ msgstr ""
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
@@ -1507,7 +1507,7 @@ msgstr ""
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
+2 -2
View File
@@ -1516,7 +1516,7 @@ msgstr ""
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
@@ -1536,7 +1536,7 @@ msgstr ""
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837
+2 -2
View File
@@ -1548,7 +1548,7 @@ msgstr ""
#: ClientCommand.cpp:1827
msgctxt "helpcmd|LoadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1829
@@ -1568,7 +1568,7 @@ msgstr ""
#: ClientCommand.cpp:1835
msgctxt "helpcmd|ReloadMod|args"
msgid "[--type=global|user|network] <module>"
msgid "[--type=global|user|network] <module> [args]"
msgstr ""
#: ClientCommand.cpp:1837