Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -N -r09d557ffefb1dd57e7606695e16c3151e42285f2 -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 09d557ffefb1dd57e7606695e16c3151e42285f2)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -602,13 +602,13 @@
 	
 	if (rFilter.m_bUseSize)
 	{
-		_sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager()->LoadString(IDS_LT_STRING+rFilter.m_iSizeType1), GetSizeString(rFilter.m_ullSize1, szData, true));
+		_sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager()->LoadString(IDS_LT_STRING+rFilter.m_iSizeType1), GetSizeString(rFilter.m_ullSize1, szData, 64, true));
 		szLoaded[1023] = _T('\0');
 		if (rFilter.m_bUseSize2)
 		{
 			_tcscat(szLoaded, GetResManager()->LoadString(IDS_AND_STRING));
 			CString strLoaded2;
-			strLoaded2.Format(_T("%s %s"), GetResManager()->LoadString(IDS_LT_STRING+rFilter.m_iSizeType2), GetSizeString(rFilter.m_ullSize2, szData, true));
+			strLoaded2.Format(_T("%s %s"), GetResManager()->LoadString(IDS_LT_STRING+rFilter.m_iSizeType2), GetSizeString(rFilter.m_ullSize2, szData, 64, true));
 			_tcscat(szLoaded, strLoaded2);
 		}
 	}
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -re912e0a6b456c2eed24bec7303a908d3ff0aa59a -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -665,8 +665,8 @@
 			ull_t ullFree, ullTotal;
 			if (GetDynamicFreeSpace(strPath, &ullFree, &ullTotal))
 			{
-				m_strTip+=GetResManager()->LoadString(IDS_BDFREESPACE_STRING)+CString(GetSizeString(ullFree, szSizeFree, false))+_T("\n");
-				m_strTip+=GetResManager()->LoadString(IDS_BDCAPACITY_STRING)+CString(GetSizeString(ullTotal, szSizeTotal, false))+_T("\n");
+				m_strTip+=GetResManager()->LoadString(IDS_BDFREESPACE_STRING)+CString(GetSizeString(ullFree, szSizeFree, 32, false))+_T("\n");
+				m_strTip+=GetResManager()->LoadString(IDS_BDCAPACITY_STRING)+CString(GetSizeString(ullTotal, szSizeTotal, 32, false))+_T("\n");
 			}
 		}
 	}
@@ -704,8 +704,8 @@
 	ull_t ullFree, ullTotal;
 	if (GetDynamicFreeSpace(sc.m_strPath, &ullFree, &ullTotal))
 	{
-		m_strTip+=CString(_T("\r\n"))+GetResManager()->LoadString(IDS_BDFREESPACE_STRING)+CString(GetSizeString(ullFree, m_szBuffer, false))+_T("\n");
-		m_strTip+=GetResManager()->LoadString(IDS_BDCAPACITY_STRING)+CString(GetSizeString(ullTotal, m_szBuffer, false));
+		m_strTip+=CString(_T("\r\n"))+GetResManager()->LoadString(IDS_BDFREESPACE_STRING)+CString(GetSizeString(ullFree, m_szBuffer, 2048, false))+_T("\n");
+		m_strTip+=GetResManager()->LoadString(IDS_BDCAPACITY_STRING)+CString(GetSizeString(ullTotal, m_szBuffer, 2048, false));
 	}
 
 	pit->pszText=(LPTSTR)(LPCTSTR)m_strTip;
Index: src/ch/StringHelpers.cpp
===================================================================
diff -u -N -re912e0a6b456c2eed24bec7303a908d3ff0aa59a -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a)
+++ src/ch/StringHelpers.cpp	(.../StringHelpers.cpp)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -58,25 +58,6 @@
 	return pszBuffer;
 }
 
-/*
-LPTSTR GetSizeString(__int64 llData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict)
-{
-	if (llData < 0)
-		llData=0;
-
-	if (llData >= 1258291200 && (!bStrict || (llData % 1073741824) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(llData/1073741824.0), GetResManager()->LoadString(IDS_GBYTE_STRING));
-	else if (llData >= 1228800 && (!bStrict || (llData % 1048576) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(llData/1048576.0), GetResManager()->LoadString(IDS_MBYTE_STRING));
-	else if (llData >= 1200 && (!bStrict || (llData % 1024) == 0))
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%.2f %s"), (double)(llData/1024.0), GetResManager()->LoadString(IDS_KBYTE_STRING));
-	else
-		_sntprintf(pszBuffer, stMaxBufferSize, _T("%I64u %s"), llData, GetResManager()->LoadString(IDS_BYTE_STRING));
-
-	return pszBuffer;
-}
-*/
-
 LPTSTR GetSizeString(ull_t ullData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict)
 {
 	if (ullData < 0)
Index: src/ch/StringHelpers.h
===================================================================
diff -u -N -re912e0a6b456c2eed24bec7303a908d3ff0aa59a -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/ch/StringHelpers.h	(.../StringHelpers.h)	(revision e912e0a6b456c2eed24bec7303a908d3ff0aa59a)
+++ src/ch/StringHelpers.h	(.../StringHelpers.h)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -25,7 +25,6 @@
 #endif
 
 LPTSTR GetSizeString(double dData, LPTSTR pszBuffer, size_t stMaxBufferSize);
-//LPTSTR GetSizeString(__int64 llData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict=false);
-LPTSTR GetSizeString(ull_t ullData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict=false);
+LPTSTR GetSizeString(ull_t ullData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict = false);
 
 #endif
Index: src/chext/StringHelpers.h
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/chext/StringHelpers.h	(.../StringHelpers.h)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/chext/StringHelpers.h	(.../StringHelpers.h)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -25,7 +25,7 @@
 
 LPTSTR GetSizeString(double dData, LPTSTR pszBuffer, size_t stMaxBufferSize);
 
-template<class T> LPTSTR GetSizeString(T tData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict=false)
+template<class T> LPTSTR GetSizeString(T tData, LPTSTR pszBuffer, size_t stMaxBufferSize, bool bStrict = false)
 {
 	if (tData < 0)
 		tData=0;
Index: src/common/version.h
===================================================================
diff -u -N -rff3594f04f2068d92c51d1aa7c78e2a868194fd0 -rd6da900f71c2fb7f65e7443baf279c7f626d057d
--- src/common/version.h	(.../version.h)	(revision ff3594f04f2068d92c51d1aa7c78e2a868194fd0)
+++ src/common/version.h	(.../version.h)	(revision d6da900f71c2fb7f65e7443baf279c7f626d057d)
@@ -13,10 +13,10 @@
 // Version of program
 #define PRODUCT_VERSION1 1
 #define PRODUCT_VERSION2 31
-#define PRODUCT_VERSION3 152
+#define PRODUCT_VERSION3 172
 #define PRODUCT_VERSION4 0
 
-#define PRODUCT_VERSION "1.31beta-svn152"
+#define PRODUCT_VERSION "1.31beta-svn172"
 
 #if SETUP_COMPILER != 1
 	#define SHELLEXT_PRODUCT_FULL_VERSION SHELLEXT_PRODUCT_NAME " " PRODUCT_VERSION
@@ -27,7 +27,7 @@
 #endif
 
 // copyright information
-#define COPYRIGHT_INFO	"Copyright (C) 2001-2008 J�zef Starosczyk"
+#define COPYRIGHT_INFO	"Copyright (C) 2001-2009 J�zef Starosczyk"
 #define PRODUCT_SITE	"http://www.copyhandler.com"
 #define CONTACT_INFO	"ixen@copyhandler.com"