Merge branch 'master' into pisteampackerconfig

# Conflicts:
#	libs/client_server/piclientserver_server.cpp
#	libs/crypt/picrypt.cpp
#	libs/io_utils/pistreampacker.cpp
#	main.cpp

libs/io_utils/piethutilbase.cpp

@@ -18,6 +18,8 @@
 */
 
 #include "piethutilbase.h"
+
+#include "pitranslator.h"
 #ifdef PIP_CRYPT
 #  include "picrypt.h"
 #endif
@@ -85,7 +87,8 @@ void PIEthUtilBase::createCryptKey(const PIString & k) {
 	_key = PICrypt::hash("sodium_bug");
 	_key = PICrypt::hash(k);
 #else
-	piCout << "[PIEthUtilBase] PICrypt wasn`t built!";
+	piCout << "[PIEthUtilBase]"
+		   << "PICrypt wasn`t built!"_tr("PIEthUtilBase");
 #endif
 	_crypt = true;
 }

libs/io_utils/pistreampacker.cpp

@@ -24,6 +24,7 @@
 #include "pistreampacker.h"
 
 #include "piiodevice.h"
+#include "pitranslator.h"
 #ifdef __GNUC__
 #  pragma GCC diagnostic pop
 #endif
@@ -164,7 +165,7 @@ void PIStreamPacker::assignDevice(PIIODevice * dev) {
 		return;
 	}
 	if (!dev->infoFlags()[PIIODevice::Reliable]) {
-		piCoutObj << "Warning! Not recommended to use with non-reliable" << dev;
+		piCoutObj << "Warning! Not recommended to use with non-reliable device"_tr("PIStreamPacker") << dev;
 	}
 	CONNECT2(void, const uchar *, ssize_t, dev, threadedReadEvent, this, received);
 	CONNECT1(void, PIByteArray, this, sendRequest, dev, write);