fixup! qt: remove util/translation.h

willcl-ark · Jan 29, 2024 · b701a8a · b701a8a
1 parent 8310616
commit b701a8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/clientversion.cpp b/src/clientversion.cpp
@@ -76,7 +76,7 @@ std::string FormatSubVersion(const std::string& name, int nClientVersion, const
 
 std::string CopyrightHolders(const std::string& strPrefix)
 {
-    const auto copyright_devs = strprintf(COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION);
+    const auto copyright_devs = strprintf("%s\n%s", COPYRIGHT_HOLDERS, COPYRIGHT_HOLDERS_SUBSTITUTION);
     std::string strCopyrightHolders = strPrefix + copyright_devs;
 
     // Make sure Bitcoin Core copyright is not removed by accident

diff --git a/src/net.cpp b/src/net.cpp
@@ -3018,7 +3018,7 @@ bool CConnman::BindListenPort(const CService& addrBind, std::string& strError, N
 #ifdef WIN32
         int nProtLevel = PROTECTION_LEVEL_UNRESTRICTED;
         if (sock->SetSockOpt(IPPROTO_IPV6, IPV6_PROTECTION_LEVEL, (const char*)&nProtLevel, sizeof(int)) == SOCKET_ERROR) {
-            strError = strprintf("Error setting IPV6_PROTECTION_LEVEL on socket: %s, continuing anyway"), NetworkErrorString(WSAGetLastError());
+            strError = strprintf("Error setting IPV6_PROTECTION_LEVEL on socket: %s, continuing anyway", NetworkErrorString(WSAGetLastError()));
             LogPrintf("%s\n", strError);
         }
 #endif

diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
@@ -191,7 +191,7 @@ bool BerkeleyEnvironment::Open(std::string& err)
             LogPrintf("BerkeleyEnvironment::Open: Error %d closing failed database environment: %s\n", ret2, DbEnv::strerror(ret2));
         }
         Reset();
-        err = strprintf("Error initializing wallet database environment %s!"), fs::quoted(fs::PathToString(Directory()));
+        err = strprintf("Error initializing wallet database environment %s!", fs::quoted(fs::PathToString(Directory())));
         if (ret == DB_RUNRECOVERY) {
             err += (" This error could occur if this wallet was not shutdown cleanly and was last loaded using a build with a newer version of Berkeley DB. If so, please use the software that last loaded this wallet");
         }