Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/czech.txt
#	src/order_backup.h
#	src/settings_internal.h
#	src/string.cpp
#	src/viewport.cpp

src/misc/countedptr.hpp

@@ -125,12 +125,6 @@ public:
 		return m_pT == nullptr;
 	}
 
-	/** another way how to test for nullptr value */
-	//inline bool operator == (const CCountedPtr &sp) const {return m_pT == sp.m_pT;}
-
-	/** yet another way how to test for nullptr value */
-	//inline bool operator != (const CCountedPtr &sp) const {return m_pT != sp.m_pT;}
-
 	/** assign pointer w/o incrementing ref count */
 	inline void Attach(Tcls *pT)
 	{