Merge branch 'master' into cap302

src/CMakeLists.txt

@@ -14,11 +14,6 @@
 # limitations under the License.
 #
 
-if(CMAKE_VERSION VERSION_LESS 3.2)
-	# Since 3.2 it does this automatically from BYPRODUCTS
-	set_source_files_properties("versionc.cpp" PROPERTIES GENERATED true)
-endif()
-
 set(znc_cpp "ZNCString.cpp" "znc.cpp" "IRCNetwork.cpp" "Translation.cpp"
 	"IRCSock.cpp" "Client.cpp" "Chan.cpp" "Nick.cpp" "Server.cpp"
 	"Modules.cpp" "MD5.cpp" "Buffer.cpp" "Utils.cpp" "FileUtils.cpp"
@@ -61,27 +56,20 @@ add_custom_target(version
 add_dependencies(znclib copy_csocket_h copy_csocket_cc version)
 
 set(znc_include_dirs
-	"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/bpstd>"
 	"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
 	"$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>"
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>")
 target_link_libraries(znclib PRIVATE ${CMAKE_DL_LIBS} Threads::Threads)
-if(OPENSSL_FOUND)
-	target_link_libraries(znclib PUBLIC ${OPENSSL_LIBRARIES})
-	list(APPEND znc_include_dirs "${OPENSSL_INCLUDE_DIR}")
-endif()
 if(ZLIB_FOUND)
-	target_link_libraries(znclib PRIVATE ${ZLIB_LIBRARIES})
-	list(APPEND znc_include_dirs ${ZLIB_INCLUDE_DIRS})
-endif()
-if(ICU_FOUND)
-	target_link_libraries(znclib PUBLIC ${ICU_LDFLAGS})
-	list(APPEND znc_include_dirs ${ICU_INCLUDE_DIRS})
+	target_link_libraries(znclib PRIVATE ZLIB::ZLIB)
 endif()
 if(Boost_FOUND)
-	target_link_libraries(znclib PRIVATE ${Boost_LIBRARIES})
-	list(APPEND znc_include_dirs ${Boost_INCLUDE_DIRS})
+	target_link_libraries(znclib PRIVATE Boost::locale)
 endif()
+if(ZNC_HAVE_ARGON)
+	target_link_libraries(znclib PRIVATE PkgConfig::ARGON)
+endif()
+target_link_libraries(znclib PUBLIC ${zncpubdeps})
 target_link_libraries(znclib PRIVATE cctz::cctz)
 target_include_directories(znc PUBLIC ${znc_include_dirs})
 target_include_directories(znclib PUBLIC ${znc_include_dirs})
@@ -98,16 +86,11 @@ set_target_properties(znclib PROPERTIES
 	OUTPUT_NAME "znc"
 	SOVERSION "${ZNC_VERSION}")
 
-# CMake started supporting metafeature cxx_std_11 only in 3.8
-set(required_cxx11_features
-	cxx_range_for cxx_nullptr cxx_override
-	cxx_lambdas cxx_auto_type)
-target_compile_features(znc PUBLIC ${required_cxx11_features})
-target_compile_features(znclib PUBLIC ${required_cxx11_features})
-
 add_library(ZNC INTERFACE)
-target_link_libraries(ZNC INTERFACE ${znc_link})
+target_link_libraries(ZNC INTERFACE ${znc_link} ${zncpubdeps})
 target_compile_definitions(ZNC INTERFACE "znc_export_lib_EXPORTS")
+target_compile_features(ZNC INTERFACE cxx_std_17)
+target_compile_features(znclib PUBLIC cxx_std_17)
 
 if(HAVE_I18N)
 	add_subdirectory(po)

src/Client.cpp

@@ -644,11 +644,13 @@ void CClient::PutModNotice(const CString& sModule, const CString& sLine) {
 
     DEBUG("(" << GetFullName()
               << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() +
+                     ((sModule.empty()) ? "status" : sModule) + "!" +
                      ((sModule.empty()) ? "status" : sModule) +
-                     "!znc@znc.in NOTICE " << GetNick() << " :" << sLine
-              << "]");
+                     "@znc.in NOTICE "
+              << GetNick() << " :" << sLine << "]");
     Write(":" + m_pUser->GetStatusPrefix() +
-          ((sModule.empty()) ? "status" : sModule) + "!znc@znc.in NOTICE " +
+          ((sModule.empty()) ? "status" : sModule) + "!" +
+          ((sModule.empty()) ? "status" : sModule) + "@znc.in NOTICE " +
           GetNick() + " :" + sLine + "\r\n");
 }
 
@@ -659,16 +661,18 @@ void CClient::PutModule(const CString& sModule, const CString& sLine) {
 
     DEBUG("(" << GetFullName()
               << ") ZNC -> CLI [:" + m_pUser->GetStatusPrefix() +
+                     ((sModule.empty()) ? "status" : sModule) + "!" +
                      ((sModule.empty()) ? "status" : sModule) +
-                     "!znc@znc.in PRIVMSG " << GetNick() << " :" << sLine
-              << "]");
+                     "@znc.in PRIVMSG "
+              << GetNick() << " :" << sLine << "]");
 
     VCString vsLines;
     sLine.Split("\n", vsLines);
     for (const CString& s : vsLines) {
         Write(":" + m_pUser->GetStatusPrefix() +
-              ((sModule.empty()) ? "status" : sModule) +
-              "!znc@znc.in PRIVMSG " + GetNick() + " :" + s + "\r\n");
+              ((sModule.empty()) ? "status" : sModule) + "!" +
+              ((sModule.empty()) ? "status" : sModule) + "@znc.in PRIVMSG " +
+              GetNick() + " :" + s + "\r\n");
     }
 }
 

src/Message.cpp

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include <string_view>
+
 #include <znc/Message.h>
 #include <znc/Utils.h>
-#include "bpstd/string_view.hpp"
 
 CMessage::CMessage(const CString& sMessage) {
     Parse(sMessage);
@@ -165,7 +166,7 @@ void CMessage::Parse(const CString& sMessage) {
         // Find the end of the first word
         const char* p = begin;
         while (p < end && *p != ' ') ++p;
-        bpstd::string_view result(begin, p - begin);
+        std::string_view result(begin, p - begin);
         begin = p;
         // Prepare for the following word
         while (begin < end && *begin == ' ') ++begin;
@@ -175,12 +176,12 @@ void CMessage::Parse(const CString& sMessage) {
     // <tags>
     m_mssTags.clear();
     if (begin < end && *begin == '@') {
-        bpstd::string_view svTags = next_word().substr(1);
-        std::vector<bpstd::string_view> vsTags;
+        std::string_view svTags = next_word().substr(1);
+        std::vector<std::string_view> vsTags;
         // Split by ';'
         while (true) {
             auto delim = svTags.find_first_of(';');
-            if (delim == bpstd::string_view::npos) {
+            if (delim == std::string_view::npos) {
                 vsTags.push_back(svTags);
                 break;
             }
@@ -188,10 +189,10 @@ void CMessage::Parse(const CString& sMessage) {
             svTags = svTags.substr(delim + 1);
         }
         // Save key and value
-        for (bpstd::string_view svTag : vsTags) {
+        for (std::string_view svTag : vsTags) {
             auto delim = svTag.find_first_of('=');
-            CString sKey = std::string(delim == bpstd::string_view::npos ? svTag : svTag.substr(0, delim));
-            CString sValue = delim == bpstd::string_view::npos ? std::string() : std::string(svTag.substr(delim + 1));
+            CString sKey = std::string(delim == std::string_view::npos ? svTag : svTag.substr(0, delim));
+            CString sValue = delim == std::string_view::npos ? std::string() : std::string(svTag.substr(delim + 1));
             m_mssTags[sKey] =
                 sValue.Escape(CString::EMSGTAG, CString::CString::EASCII);
         }

src/User.cpp

@@ -25,6 +25,10 @@
 #include <time.h>
 #include <algorithm>
 
+#ifdef ZNC_HAVE_ARGON
+#include <argon2.h>
+#endif
+
 using std::vector;
 using std::set;
 
@@ -346,7 +350,12 @@ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
             method = CUser::HASH_MD5;
         else if (sMethod.Equals("sha256"))
             method = CUser::HASH_SHA256;
-        else {
+        else if (sMethod.Equals("Argon2id")) {
+            method = CUser::HASH_ARGON2ID;
+#ifndef ZNC_HAVE_ARGON
+            CUtils::PrintError("ZNC is built without Argon2 support, " + GetUsername() + " won't be able to authenticate");
+#endif
+        } else {
             sError = "Invalid hash method";
             CUtils::PrintError(sError);
             return false;
@@ -958,6 +967,9 @@ CConfig CUser::ToConfig() const {
         case HASH_SHA256:
             sHash = "SHA256";
             break;
+        case HASH_ARGON2ID:
+            sHash = "Argon2id";
+            break;
     }
     passConfig.AddKeyValuePair("Salt", m_sPassSalt);
     passConfig.AddKeyValuePair("Method", sHash);
@@ -1042,20 +1054,43 @@ CConfig CUser::ToConfig() const {
     return config;
 }
 
-bool CUser::CheckPass(const CString& sPass) const {
+bool CUser::CheckPass(const CString& sPass) {
     if(AuthOnlyViaModule() || CZNC::Get().GetAuthOnlyViaModule()) {
         return false;
     }
 
+    bool bResult = false;
+    bool bUpgrade = false;
     switch (m_eHashType) {
         case HASH_MD5:
-            return m_sPass.Equals(CUtils::SaltedMD5Hash(sPass, m_sPassSalt));
+            bResult = m_sPass.Equals(CUtils::SaltedMD5Hash(sPass, m_sPassSalt));
+            bUpgrade = true;
+            break;
         case HASH_SHA256:
-            return m_sPass.Equals(CUtils::SaltedSHA256Hash(sPass, m_sPassSalt));
+            bResult = m_sPass.Equals(CUtils::SaltedSHA256Hash(sPass, m_sPassSalt));
+#if ZNC_HAVE_ARGON
+            bUpgrade = true;
+#endif
+            break;
+        case HASH_ARGON2ID:
+#if ZNC_HAVE_ARGON
+            return argon2id_verify(m_sPass.c_str(), sPass.data(), sPass.length()) == ARGON2_OK;
+#else
+            CUtils::PrintError("ZNC is built without Argon2 support, " + GetUsername() + " cannot authenticate");
+            return false;
+#endif
         case HASH_NONE:
-        default:
+            // Don't upgrade hash, since the only valid use case for plain are
+            // manual tests, where it's simpler this way
             return (sPass == m_sPass);
     }
+
+    if (bResult && bUpgrade) {
+        CString sSalt = CUtils::GetSalt();
+        CString sHash = CUser::SaltedHash(sPass, sSalt);
+        SetPass(sHash, CUser::HASH_DEFAULT, sSalt);
+    }
+    return bResult;
 }
 
 /*CClient* CUser::GetClient() {
@@ -1271,7 +1306,17 @@ void CUser::SetDCCBindHost(const CString& s) { m_sDCCBindHost = s; }
 void CUser::SetPass(const CString& s, eHashType eHash, const CString& sSalt) {
     m_sPass = s;
     m_eHashType = eHash;
-    m_sPassSalt = sSalt;
+    switch (eHash) {
+        case HASH_NONE:
+        case HASH_ARGON2ID:
+            // Salt is embedded in the encoded "hash" in argon
+            m_sPassSalt = "";
+            break;
+        case HASH_MD5:
+        case HASH_SHA256:
+            m_sPassSalt = sSalt;
+            break;
+    }
 }
 void CUser::SetMultiClients(bool b) { m_bMultiClients = b; }
 void CUser::SetDenyLoadMod(bool b) { m_bDenyLoadMod = b; }

src/Utils.cpp

@@ -52,6 +52,10 @@
 #include <unicode/errorcode.h>
 #endif
 
+#ifdef ZNC_HAVE_ARGON
+#include <argon2.h>
+#endif
+
 // Required with GCC 4.3+ if openssl is disabled
 #include <cstring>
 #include <cstdlib>
@@ -176,12 +180,24 @@ unsigned long CUtils::GetLongIP(const CString& sIP) {
     return ret;
 }
 
-// If you change this here and in GetSaltedHashPass(),
-// don't forget CUser::HASH_DEFAULT!
-// TODO refactor this
-const CString CUtils::sDefaultHash = "sha256";
-CString CUtils::GetSaltedHashPass(CString& sSalt) {
-    sSalt = GetSalt();
+#ifdef ZNC_HAVE_ARGON
+static CString SaltedArgonHash(const CString& sPass, const CString& sSalt) {
+#define ZNC_ARGON_PARAMS /* iterations */ 6, /* memory */ 6144, /* parallelism */ 1
+    constexpr int iHashLen = 32;
+    CString sOut;
+    sOut.resize(argon2_encodedlen(ZNC_ARGON_PARAMS, sSalt.length(), iHashLen, Argon2_id) + 1);
+    int err = argon2id_hash_encoded(ZNC_ARGON_PARAMS, sPass.data(), sPass.length(), sSalt.data(), sSalt.length(), iHashLen, &sOut[0], sOut.length());
+    if (err) {
+        CUtils::PrintError(argon2_error_message(err));
+        sOut.clear();
+    }
+    return sOut;
+}
+#undef ZNC_ARGON_PARAMS
+#endif
+
+CString CUtils::AskSaltedHashPassForConfig() {
+    CString sSalt = GetSalt();
 
     while (true) {
         CString pass1;
@@ -195,7 +211,18 @@ CString CUtils::GetSaltedHashPass(CString& sSalt) {
             CUtils::PrintError("The supplied passwords did not match");
         } else {
             // Construct the salted pass
-            return SaltedSHA256Hash(pass1, sSalt);
+            VCString vsLines;
+            vsLines.push_back("<Pass password>");
+#if ZNC_HAVE_ARGON
+            vsLines.push_back("\tMethod = Argon2id");
+            vsLines.push_back("\tHash = " + SaltedArgonHash(pass1, sSalt));
+#else
+            vsLines.push_back("\tMethod = SHA256");
+            vsLines.push_back("\tHash = " + SaltedSHA256Hash(pass1, sSalt));
+            vsLines.push_back("\tSalt = " + sSalt);
+#endif
+            vsLines.push_back("</Pass>");
+            return CString("\n").Join(vsLines.begin(), vsLines.end());
         }
     }
 }
@@ -210,6 +237,14 @@ CString CUtils::SaltedSHA256Hash(const CString& sPass, const CString& sSalt) {
     return CString(sPass + sSalt).SHA256();
 }
 
+CString CUtils::SaltedHash(const CString& sPass, const CString& sSalt) {
+#ifdef ZNC_HAVE_ARGON
+    return SaltedArgonHash(sPass, sSalt);
+#else
+    return SaltedSHA256Hash(sPass, sSalt);
+#endif
+}
+
 CString CUtils::GetPass(const CString& sPrompt) {
 #ifdef HAVE_TCSETATTR
     // Disable echo

src/main.cpp

@@ -383,20 +383,15 @@ int main(int argc, char** argv) {
 #endif /* HAVE_LIBSSL */
 
     if (bMakePass) {
-        CString sSalt;
         CUtils::PrintMessage("Type your new password.");
-        CString sHash = CUtils::GetSaltedHashPass(sSalt);
+        CString sPass = CUtils::AskSaltedHashPassForConfig();
         CUtils::PrintMessage("Kill ZNC process, if it's running.");
         CUtils::PrintMessage(
             "Then replace password in the <User> section of your config with "
             "this:");
         // Not PrintMessage(), to remove [**] from the beginning, to ease
         // copypasting
-        std::cout << "<Pass password>" << std::endl;
-        std::cout << "\tMethod = " << CUtils::sDefaultHash << std::endl;
-        std::cout << "\tHash = " << sHash << std::endl;
-        std::cout << "\tSalt = " << sSalt << std::endl;
-        std::cout << "</Pass>" << std::endl;
+        std::cout << sPass << std::endl;
         CUtils::PrintMessage(
             "After that start ZNC again, and you should be able to login with "
             "the new password.");

src/po/znc.bg_BG.po

@@ -51,27 +51,27 @@ msgid ""
 "code>”). Once you have loaded some Web-enabled modules, the menu will expand."
 msgstr ""
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr ""
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr ""
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr ""
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr ""
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr ""
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgstr ""
 msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr ""
 
@@ -228,48 +228,48 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr ""
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
@@ -1904,34 +1904,34 @@ msgstr ""
 msgid "hostname verification error"
 msgstr ""
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
 msgstr ""
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr ""
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
 msgstr ""
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr ""
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr ""
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr ""
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr ""

src/po/znc.da_DK.po

@@ -51,27 +51,27 @@ msgid ""
 "code>”). Once you have loaded some Web-enabled modules, the menu will expand."
 msgstr ""
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Brugeren eksisterer allerede"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 er ikke aktiveret"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL er ikke aktiveret"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr ""
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Ugyldig port"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgstr ""
 msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Velkommen til ZNC"
 
@@ -228,48 +228,48 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr ""
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
@@ -1904,34 +1904,34 @@ msgstr ""
 msgid "hostname verification error"
 msgstr ""
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
 msgstr ""
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr ""
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
 msgstr ""
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr ""
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr ""
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr ""
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr ""

src/po/znc.de_DE.po

@@ -55,27 +55,27 @@ msgstr ""
 "code>\"). Sobald einige Web-fähige Module geladen wurden, wird das Menü "
 "größer."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Benutzer existiert bereits"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 ist nicht aktiviert"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL ist nicht aktiviert"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Kann PEM-Datei nicht finden: {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Ungültiger Port"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Kann nicht horchen: {1}"
 
@@ -84,7 +84,7 @@ msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 "Springe zu einem Server, da dieser Server nicht länger in der Liste ist"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Willkommen bei ZNC"
 
@@ -253,51 +253,51 @@ msgstr ""
 "Deine Verbindung wird getrennt, da ein anderen Benutzer sich als dich "
 "angemeldet hat."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "Dein CTCP an {1} wurde verloren, du bist nicht mit dem IRC verbunden!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Deine Benachrichtigung an {1} wurde verloren, du bist nicht mit dem IRC "
 "verbunden!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Entferne Kanal {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Deine Nachricht an {1} wurde verloren, du bist nicht mit dem IRC verbunden!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Hallo. Wie kann ich dir helfen?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Verwendung: /attach <#Kanal>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Es gibt einen Kanal, der auf [{2}] passt"
 msgstr[1] "Es gibt {1} Kanäle, die auf [{2}] passen"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Zu {1} Kanal verbunden"
 msgstr[1] "Zu {1} Kanälen verbunden"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Verwendung: /detach <#Kanäle>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Von {1} Kanal getrennt"
@@ -1984,7 +1984,7 @@ msgstr "fehlerhafter Hostname im Zertifikat"
 msgid "hostname verification error"
 msgstr "hostnamen-Überprüfung fehlgeschlagen"
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
@@ -1992,11 +1992,11 @@ msgstr ""
 "Ungültiger Netzwerkname. Er sollte alpha-numerisch sein. Nicht mit Server-"
 "Namen verwechseln"
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr "Netzwerk {1} existiert bereits"
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
@@ -2004,18 +2004,18 @@ msgstr ""
 "Deine Verbindung wird geschlossen da deine IP sich nicht länger zu diesem "
 "Benutzer verbinden darf"
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr "Passwort ist leer"
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr "Benutzername ist leer"
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr "Benutzername ist ungültig"
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr "Kann Modulinformationen für {1} nicht finden: {2}"

src/po/znc.el_GR.po

@@ -51,27 +51,27 @@ msgid ""
 "code>”). Once you have loaded some Web-enabled modules, the menu will expand."
 msgstr ""
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr ""
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr ""
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr ""
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr ""
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr ""
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgstr ""
 msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr ""
 
@@ -228,48 +228,48 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr ""
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
@@ -1904,34 +1904,34 @@ msgstr ""
 msgid "hostname verification error"
 msgstr ""
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
 msgstr ""
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr ""
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
 msgstr ""
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr ""
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr ""
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr ""
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr ""

src/po/znc.es_ES.po

@@ -244,48 +244,48 @@ msgid ""
 msgstr ""
 "Estás siendo desconectado porque otro usuario se ha autenticado por ti."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "Tu CTCP a {1} se ha perdido, ¡no estás conectado al IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "Tu notice a {1} se ha perdido, ¡no estás conectado al IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Eliminando canal {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Tu mensaje a {1} se ha perdido, ¡no estás conectado al IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Hola. ¿En qué te puedo ayudar?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Uso: /attach <#canales>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Hay {1} canal que coincide con [{2}]"
 msgstr[1] "Hay {1} canales que coinciden con [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Vinculado a {1} canal"
 msgstr[1] "Unido a {1} canales"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Uso: /detach <#canales>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Desvinculado {1} canal"

src/po/znc.fr_FR.po

@@ -55,27 +55,27 @@ msgstr ""
 "loadmod &lt;module&gt;</code>”). Les modules avec des capacités web "
 "apparaîtront ci-dessous."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Cet utilisateur existe déjà"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 n'est pas activé"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL n'est pas activé"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Impossible de trouver le fichier pem : {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Port invalide"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Impossible d'utiliser le port : {1}"
 
@@ -84,7 +84,7 @@ msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 "Connexion au serveur suivant, le serveur actuel n'est plus dans la liste"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Bienvenue sur ZNC"
 
@@ -252,49 +252,49 @@ msgstr ""
 "Vous avez été déconnecté car un autre utilisateur s'est authentifié avec le "
 "même identifiant."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Votre connexion CTCP vers {1} a été perdue, vous n'êtes plus connecté à IRC !"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "Votre notice vers {1} a été perdue, vous n'êtes plus connecté à IRC !"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Suppression du salon {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Votre message à {1} a été perdu, vous n'êtes pas connecté à IRC !"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Bonjour. Comment puis-je vous aider ?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Utilisation : /attach <#salons>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Il y avait {1} salon correspondant [{2}]"
 msgstr[1] "Il y avait {1} salons correspondant [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "A attaché {1} salon"
 msgstr[1] "A attaché {1} salons"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Utilisation : /detach <#salons>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "A détaché {1} salon"
@@ -762,7 +762,7 @@ msgstr "Total : {1}, Rejoint : {2}, Détaché : {3}, Désactivé : {4}"
 #: ClientCommand.cpp:600 ClientCommand.cpp:636 ClientCommand.cpp:816
 #: ClientCommand.cpp:842
 msgid "Access denied!"
-msgstr ""
+msgstr "Accès refusé !"
 
 #: ClientCommand.cpp:606
 msgid ""
@@ -1626,17 +1626,17 @@ msgstr "<#chan> <index>"
 #: ClientCommand.cpp:1850
 msgctxt "helpcmd|MoveChan|desc"
 msgid "Move channel in sort order"
-msgstr ""
+msgstr "Déplacer le canal dans l'ordre de tri"
 
 #: ClientCommand.cpp:1852
 msgctxt "helpcmd|SwapChans|args"
 msgid "<#chan1> <#chan2>"
-msgstr ""
+msgstr "<#chan1> <#chan2>"
 
 #: ClientCommand.cpp:1853
 msgctxt "helpcmd|SwapChans|desc"
 msgid "Swap channels in sort order"
-msgstr ""
+msgstr "Échanger les canaux dans l'ordre de tri"
 
 #: ClientCommand.cpp:1854
 msgctxt "helpcmd|Attach|args"
@@ -1977,7 +1977,7 @@ msgstr "le nom d'hôte du certificat est incorrect"
 msgid "hostname verification error"
 msgstr "erreur de vérification du nom d'hôte"
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
@@ -1985,11 +1985,11 @@ msgstr ""
 "Nom de réseau invalide. Il devrait être alphanumérique. Ne pas confondre "
 "avec le nom du serveur"
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr "Le réseau {1} existe déjà"
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
@@ -1997,18 +1997,18 @@ msgstr ""
 "Vous avez été déconnecté car votre adresse IP n'est plus autorisée à se "
 "connecter à cet utilisateur"
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr "Le mot de passe est vide"
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr "L'identifiant est vide"
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr "L'identifiant est invalide"
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr "Impossible de trouver d'information sur le module {1} : {2}"

src/po/znc.id_ID.po

@@ -54,27 +54,27 @@ msgstr ""
 "status help </code>\" dan \"<code>/msg * status loadmod &lt;module&gt;</code>"
 "\"). Setelah anda memuat beberapa modul Web-enabled, menu ini akan diperluas."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Pengguna sudah ada"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 tidak diaktifkan"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL tidak diaktifkan"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Tidak dapat menemukan berkas pem: {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Port tidak valid"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Tidak dapat mengikat: {1}"
 
@@ -82,7 +82,7 @@ msgstr "Tidak dapat mengikat: {1}"
 msgid "Jumping servers because this server is no longer in the list"
 msgstr "Melompati server karena server ini tidak lagi dalam daftar"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Selamat datang di ZNC"
 
@@ -244,46 +244,46 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr "Anda terputus karena pengguna lain hanya diautentikasi sebagai anda."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "CTCP anda untuk {1} tersesat, anda tidak terhubung ke IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "Notice anda untuk {1} tersesat, anda tidak terhubung ke IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Menghapus channel {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Pesan anda untuk {1} tersesat, anda tidak terhubung ke IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Halo. Bagaimana saya bisa membantu anda?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Gunakan: /attach <#chan>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Ada {1} pencocokan saluran [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
@@ -1913,34 +1913,34 @@ msgstr ""
 msgid "hostname verification error"
 msgstr ""
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
 msgstr ""
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr ""
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
 msgstr ""
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr ""
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr ""
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr ""
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr ""

src/po/znc.it_IT.po

@@ -55,27 +55,27 @@ msgstr ""
 "loadmod &lt;nome del modulo&gt;</code>”). Dopo aver caricato alcuni moduli "
 "abilitati per il web, il menù si espanderà."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Utente già esistente"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 non è abilitato"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL non è abilitata"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Impossibile localizzare il file pem: {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Porta non valida"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Impossibile associare: {1}"
 
@@ -83,7 +83,7 @@ msgstr "Impossibile associare: {1}"
 msgid "Jumping servers because this server is no longer in the list"
 msgstr "Salta il server perché non è più in elenco"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Benvenuti nello ZNC"
 
@@ -250,56 +250,56 @@ msgstr ""
 "Stai per essere disconnesso perché un altro utente si è appena autenticato "
 "come te."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "ATTENZIONE: La richiesta di CTCP verso {1} è andata persa. Ora non sei "
 "connesso ad IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "ATTENZIONE: L'invio del tuo NOTICE verso {1} è andato perso. Ora non sei "
 "connesso ad IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Rimozione del canale {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "ATTENZIONE: L'invio del tuo messaggio verso {1} è andato perso. Ora non sei "
 "connesso ad IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr ""
 "Ciao! Per ottenere aiuto su questo e tutti i moduli della ZNC digita help "
 "(da questa finestra) oppure /znc help (in qualsiasi altra finestra)."
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Usa: /attach <#canali>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Trovato {1} canale corrispondente a [{2}]"
 msgstr[1] "Ho trovato {1} canali corrispondenti a [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Agganciato {1} canale (Attached)"
 msgstr[1] "Ho agganciato {1} canali (Attached)"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Usa: /detach <#canali>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Scollegato {1} canale (Detached)"
@@ -1996,7 +1996,7 @@ msgstr "hostname malformato nel certificato"
 msgid "hostname verification error"
 msgstr "errore di verifica dell'hostname"
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
@@ -2004,11 +2004,11 @@ msgstr ""
 "Nome del network non valido. Deve essere alfanumerico. Da non confondere con "
 "il nome del server"
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr "Network {1} già esistente"
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
@@ -2016,18 +2016,18 @@ msgstr ""
 "Sei stato disconnesso perché il tuo indirizzo IP non è più autorizzato a "
 "connettersi a questo utente"
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr "Password è vuota"
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr "Username è vuoto"
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr "Username non è valido"
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr "Impossibile trovare modinfo {1}: {2}"

src/po/znc.nl_NL.po

@@ -54,27 +54,27 @@ msgstr ""
 "msg *status help</code>” en “<code>/msg *status loadmod &lt;module&gt;</"
 "code>”). Zodra je deze geladen hebt zal dit menu zich uitbreiden."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Gebruiker bestaat al"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 is niet ingeschakeld"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL is niet ingeschakeld"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Kan PEM bestand niet vinden: {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Ongeldige poort"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Kan niet binden: {1}"
 
@@ -84,7 +84,7 @@ msgstr ""
 "We schakelen over naar een andere server omdat deze server niet langer in de "
 "lijst staat"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Welkom bij ZNC"
 
@@ -257,50 +257,50 @@ msgstr ""
 "Je verbinding wordt verbroken omdat een andere gebruiker zich net aangemeld "
 "heeft als jou."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "Je CTCP naar {1} is verloren geraakt, je bent niet verbonden met IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Je notice naar {1} is verloren geraakt, je bent niet verbonden met IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Kanaal verwijderen: {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Je bericht naar {1} is verloren geraakt, je bent niet verbonden met IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Hallo. Hoe kan ik je helpen?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Gebruik: /attach <#kanalen>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Er was {1} kanaal overeenkomend met [{2}]"
 msgstr[1] "Er waren {1} kanalen overeenkomend met [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Gekoppeld aan {1} kanaal"
 msgstr[1] "Gekoppeld aan {1} kanalen"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Gebruik: /detach <#kanalen>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Losgekoppeld van {1} kanaal"
@@ -1979,7 +1979,7 @@ msgstr "misvormde hostnaam in certificaat"
 msgid "hostname verification error"
 msgstr "hostnaam verificatiefout"
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
@@ -1987,11 +1987,11 @@ msgstr ""
 "Ongeldige netwerknaam. Deze moet alfanumeriek zijn. Niet te verwarren met "
 "server naam"
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr "Netwerk {1} bestaat al"
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
@@ -1999,18 +1999,18 @@ msgstr ""
 "Je verbinding wordt verbroken omdat het niet meer toegestaan is om met jouw "
 "IP-adres naar deze gebruiker te verbinden"
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr "Wachtwoord is leeg"
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr "Gebruikersnaam is leeg"
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr "Gebruikersnaam is ongeldig"
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr "Kan modinfo niet vinden {1}: {2}"

src/po/znc.pl_PL.po

@@ -56,27 +56,27 @@ msgstr ""
 "msg *status help</code>” i “<code>/msg *status loadmod &lt;moduł&gt;</"
 "code>”). Jak już załadujesz jakieś moduły WWW to menu się rozwinie."
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr "Użytkownik już istnieje"
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr "IPv6 nie jest włączone"
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr "SSL nie jest włączone"
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr "Nie udało się odnaleźć pliku pem: {1}"
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr "Nieprawidłowy port"
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr "Nie udało się przypiąć: {1}"
 
@@ -85,7 +85,7 @@ msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 "Przeskakiwanie na inne serwery, ponieważ tego serwera nie ma już na liście"
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr "Witamy w ZNC"
 
@@ -249,32 +249,32 @@ msgid ""
 msgstr ""
 "Trwa rozłączanie, ponieważ inny użytkownik właśnie uwierzytelnił się jako Ty."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "Twoje CTCP do {1} zostało zgubione, nie jesteś połączony z IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 "Twoje powiadomienie do {1} zostało zgubione, nie jesteś połączony z IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Usuwanie kanału {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Twoja wiadomość do {1} została zgubiona, nie jesteś połączony z IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Witaj. Jak mogę ci pomóc?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Użycie: /attach <#kanały>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
@@ -283,7 +283,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Podłączony {1} kanał"
@@ -291,11 +291,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Użycie: /detach <#kanały>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Odpięto kanał {1}"
@@ -1985,7 +1985,7 @@ msgstr "zniekształcona nazwa hosta w certyfikacie"
 msgid "hostname verification error"
 msgstr "błąd weryfikacji hosta"
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
@@ -1993,11 +1993,11 @@ msgstr ""
 "Nieprawidłowa nazwa sieci. Powinna być alfanumeryczna. Nie należy mylić jej "
 "z nazwą serwera"
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr "Sieć {1} już istnieje"
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
@@ -2005,18 +2005,18 @@ msgstr ""
 "Jesteś rozłączany, ponieważ Twój adres IP nie może już łączyć się z tym "
 "użytkownikiem"
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr "Nie podano hasła"
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr "Nazwa użytkownika jest pusta"
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr "Nazwa użytkownika jest niepoprawna"
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr "Nie można znaleźć modinfo {1}: {2}"

src/po/znc.pot

@@ -42,27 +42,27 @@ msgid ""
 "code>”). Once you have loaded some Web-enabled modules, the menu will expand."
 msgstr ""
 
-#: znc.cpp:1554
+#: znc.cpp:1552
 msgid "User already exists"
 msgstr ""
 
-#: znc.cpp:1662
+#: znc.cpp:1660
 msgid "IPv6 is not enabled"
 msgstr ""
 
-#: znc.cpp:1670
+#: znc.cpp:1668
 msgid "SSL is not enabled"
 msgstr ""
 
-#: znc.cpp:1678
+#: znc.cpp:1676
 msgid "Unable to locate pem file: {1}"
 msgstr ""
 
-#: znc.cpp:1697
+#: znc.cpp:1695
 msgid "Invalid port"
 msgstr ""
 
-#: znc.cpp:1813 ClientCommand.cpp:1720
+#: znc.cpp:1811 ClientCommand.cpp:1720
 msgid "Unable to bind: {1}"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgstr ""
 msgid "Jumping servers because this server is no longer in the list"
 msgstr ""
 
-#: IRCNetwork.cpp:671 User.cpp:690
+#: IRCNetwork.cpp:671 User.cpp:699
 msgid "Welcome to ZNC"
 msgstr ""
 
@@ -219,48 +219,48 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr ""
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr ""
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr ""
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr ""
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] ""
@@ -1895,34 +1895,34 @@ msgstr ""
 msgid "hostname verification error"
 msgstr ""
 
-#: User.cpp:519
+#: User.cpp:528
 msgid ""
 "Invalid network name. It should be alphanumeric. Not to be confused with "
 "server name"
 msgstr ""
 
-#: User.cpp:523
+#: User.cpp:532
 msgid "Network {1} already exists"
 msgstr ""
 
-#: User.cpp:789
+#: User.cpp:798
 msgid ""
 "You are being disconnected because your IP is no longer allowed to connect "
 "to this user"
 msgstr ""
 
-#: User.cpp:929
+#: User.cpp:938
 msgid "Password is empty"
 msgstr ""
 
-#: User.cpp:934
+#: User.cpp:943
 msgid "Username is empty"
 msgstr ""
 
-#: User.cpp:939
+#: User.cpp:948
 msgid "Username is invalid"
 msgstr ""
 
-#: User.cpp:1214
+#: User.cpp:1249
 msgid "Unable to find modinfo {1}: {2}"
 msgstr ""

src/po/znc.pt_BR.po

@@ -98,7 +98,7 @@ msgstr "Esta rede está sendo excluída ou movida para outro usuário."
 
 #: IRCNetwork.cpp:950
 msgid "Invalid index"
-msgstr ""
+msgstr "Índice inválido"
 
 #: IRCNetwork.cpp:958 IRCNetwork.cpp:974 IRCNetwork.cpp:982
 #: ClientCommand.cpp:1425
@@ -248,48 +248,48 @@ msgstr ""
 "Você está sendo desconectado porque outro usuário acabou de autenticar-se "
 "como você."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "O seu CTCP para {1} foi perdido, você não está conectado ao IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "O seu aviso para {1} foi perdido, você não está conectado ao IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Removendo canal {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Sua mensagem para {1} foi perdida, você não está conectado ao IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Olá. Como posso ajudá-lo(a)?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Sintaxe: /attach <#canais>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Foi encontrado {1} canal correspondente a [{2}]"
 msgstr[1] "Foi encontrado {1} canal correspondentes a [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "{1} canal foi anexado"
 msgstr[1] "{1} canais foram anexados"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Sintaxe: /detach <#canais>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "{1} canal foi desanexado"
@@ -505,12 +505,12 @@ msgstr ""
 #: ClientCommand.cpp:203 ClientCommand.cpp:209
 msgctxt "listclientscmd"
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: ClientCommand.cpp:204 ClientCommand.cpp:212
 msgctxt "listclientscmd"
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #: ClientCommand.cpp:205 ClientCommand.cpp:215
 msgctxt "listclientscmd"
@@ -520,7 +520,7 @@ msgstr ""
 #: ClientCommand.cpp:223 ClientCommand.cpp:229
 msgctxt "listuserscmd"
 msgid "Username"
-msgstr ""
+msgstr "Usuário"
 
 #: ClientCommand.cpp:224 ClientCommand.cpp:230
 msgctxt "listuserscmd"
@@ -536,12 +536,12 @@ msgstr ""
 #: ClientCommand.cpp:263
 msgctxt "listallusernetworkscmd"
 msgid "Username"
-msgstr ""
+msgstr "Usuário"
 
 #: ClientCommand.cpp:241 ClientCommand.cpp:251 ClientCommand.cpp:266
 msgctxt "listallusernetworkscmd"
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #: ClientCommand.cpp:242 ClientCommand.cpp:252 ClientCommand.cpp:268
 msgctxt "listallusernetworkscmd"
@@ -556,7 +556,7 @@ msgstr ""
 #: ClientCommand.cpp:244 ClientCommand.cpp:273
 msgctxt "listallusernetworkscmd"
 msgid "IRC Server"
-msgstr ""
+msgstr "Servidor IRC"
 
 #: ClientCommand.cpp:245 ClientCommand.cpp:275
 msgctxt "listallusernetworkscmd"
@@ -566,7 +566,7 @@ msgstr ""
 #: ClientCommand.cpp:246 ClientCommand.cpp:277
 msgctxt "listallusernetworkscmd"
 msgid "Channels"
-msgstr ""
+msgstr "Canais"
 
 #: ClientCommand.cpp:251
 msgid "N/A"
@@ -575,12 +575,12 @@ msgstr ""
 #: ClientCommand.cpp:272
 msgctxt "listallusernetworkscmd"
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: ClientCommand.cpp:281
 msgctxt "listallusernetworkscmd"
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: ClientCommand.cpp:291
 msgid "Usage: SetMOTD <message>"
@@ -686,7 +686,7 @@ msgstr "Não há canais definidos."
 #: ClientCommand.cpp:539 ClientCommand.cpp:557
 msgctxt "listchans"
 msgid "Index"
-msgstr ""
+msgstr "Índice"
 
 #: ClientCommand.cpp:540 ClientCommand.cpp:558
 msgctxt "listchans"

src/po/znc.pt_PT.po

@@ -246,48 +246,48 @@ msgid ""
 msgstr ""
 "Está a ser desligado porque outro utilizador autenticou-se agora como você."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "O seu CTCP para {1} foi perdido, não está ligado ao IRC!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "O seu notice para {1} foi perdido, não está ligado ao IRC!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "A remover o canal {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "A sua mensagem para {1} foi perdida, não está ligado ao IRC!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Olá. Como posso ajudá-lo(a)?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Utilização: /attach <#canais>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
 msgstr[0] "Há {1} canal a coincidir com [{2}]"
 msgstr[1] "Há {1} canais a coincidir com [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "{1} canal unido"
 msgstr[1] "{1} canais unidos"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Utilização: /detach <#canais>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "{1} canal desunido"

src/po/znc.ro_RO.po

@@ -243,31 +243,31 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr ""
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Eliminare canal {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr ""
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Salut. Cu ce te pot ajuta?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Utilizează: /attach <#canale>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
@@ -275,18 +275,18 @@ msgstr[0] "A existat {1} canal care se potrivește cu [{2}]"
 msgstr[1] ""
 msgstr[2] "Au existat {1} canale care se potrivesc cu [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Am atașat {1} canal"
 msgstr[1] ""
 msgstr[2] "Am atașat {1} canale"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Utilizează: /detach <#canale>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Detașează {1} canal"

src/po/znc.ru_RU.po

@@ -243,31 +243,31 @@ msgid ""
 "You are being disconnected because another user just authenticated as you."
 msgstr "Другой пользователь зашёл под вашим именем, отключаем."
 
-#: Client.cpp:1022
+#: Client.cpp:1026
 msgid "Your CTCP to {1} got lost, you are not connected to IRC!"
 msgstr "Вы не подключены к IRC, ваш CTCP-запрос к {1} утерян!"
 
-#: Client.cpp:1148
+#: Client.cpp:1152
 msgid "Your notice to {1} got lost, you are not connected to IRC!"
 msgstr "Вы не подключены к IRC, ваше сообщение к {1} утеряно!"
 
-#: Client.cpp:1187
+#: Client.cpp:1191
 msgid "Removing channel {1}"
 msgstr "Убираю канал {1}"
 
-#: Client.cpp:1265
+#: Client.cpp:1269
 msgid "Your message to {1} got lost, you are not connected to IRC!"
 msgstr "Вы не подключены к IRC, ваше сообщение к {1} утеряно!"
 
-#: Client.cpp:1318 Client.cpp:1324
+#: Client.cpp:1322 Client.cpp:1328
 msgid "Hello. How may I help you?"
 msgstr "Привет, чем могу быть вам полезен?"
 
-#: Client.cpp:1338
+#: Client.cpp:1342
 msgid "Usage: /attach <#chans>"
 msgstr "Использование: /attach <#каналы>"
 
-#: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+#: Client.cpp:1349 Client.cpp:1371 ClientCommand.cpp:129 ClientCommand.cpp:151
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"
@@ -276,7 +276,7 @@ msgstr[1] "{1} канала подходят под маску [{2}]"
 msgstr[2] "{1} каналов подходят под маску [{2}]"
 msgstr[3] "{1} каналов подходят под маску [{2}]"
 
-#: Client.cpp:1348 ClientCommand.cpp:132
+#: Client.cpp:1352 ClientCommand.cpp:132
 msgid "Attached {1} channel"
 msgid_plural "Attached {1} channels"
 msgstr[0] "Прицепляю {1} канал"
@@ -284,11 +284,11 @@ msgstr[1] "Прицепляю {1} канала"
 msgstr[2] "Прицепляю {1} каналов"
 msgstr[3] "Прицепляю {1} каналов"
 
-#: Client.cpp:1360
+#: Client.cpp:1364
 msgid "Usage: /detach <#chans>"
 msgstr "Использование: /detach <#каналы>"
 
-#: Client.cpp:1370 ClientCommand.cpp:154
+#: Client.cpp:1374 ClientCommand.cpp:154
 msgid "Detached {1} channel"
 msgid_plural "Detached {1} channels"
 msgstr[0] "Отцепляю {1} канал"

src/znc.cpp

@@ -734,10 +734,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
     } while (!CUser::IsValidUsername(sUser));
 
     vsLines.push_back("<User " + sUser + ">");
-    CString sSalt;
-    sAnswer = CUtils::GetSaltedHashPass(sSalt);
-    vsLines.push_back("\tPass       = " + CUtils::sDefaultHash + "#" + sAnswer +
-                      "#" + sSalt + "#");
+    sAnswer = CUtils::AskSaltedHashPassForConfig();
+	vsLines.push_back(sAnswer);
 
     vsLines.push_back("\tAdmin      = true");