Index: src/ch/FileInfo.cpp
===================================================================
diff -u -N -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 -r336bb030d9b4bff561ff100563725213ed6703c9
--- src/ch/FileInfo.cpp	(.../FileInfo.cpp)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
+++ src/ch/FileInfo.cpp	(.../FileInfo.cpp)	(revision 336bb030d9b4bff561ff100563725213ed6703c9)
@@ -59,14 +59,22 @@
 
 	// set the dest path
 	CString strCheckPath;
-	strCheckPath.Format(GetResManager()->LoadString(IDS_FIRSTCOPY_STRING), strFolderName);
+	ictranslate::CFormat fmt(GetResManager()->LoadString(IDS_FIRSTCOPY_STRING));
+	fmt.SetParam(_t("%name"), strFolderName);
+	strCheckPath = fmt;
 	if (strCheckPath.GetLength() > _MAX_PATH)
 		strCheckPath=strCheckPath.Left(_MAX_PATH);	// max - 260 chars
 
 	// when adding to strDstPath check if the path already exists - if so - try again
 	int iCounter=1;
+	CString strFmt = GetResManager()->LoadString(IDS_NEXTCOPY_STRING);
 	while (CFileInfo::Exist(strDstPath+strCheckPath))
-		strCheckPath.Format(GetResManager()->LoadString(IDS_NEXTCOPY_STRING), ++iCounter, strFolderName);
+	{
+		fmt.SetFormat(strFmt);
+		fmt.SetParam(_t("%name"), strFolderName);
+		fmt.SetParam(_t("%count"), ++iCounter);
+		strCheckPath = fmt;
+	}
 
 	*pstrResult=strCheckPath;
 }