Merge with develop

--HG--
branch : compatibility-develop

code/nel/src/misc/common.cpp

@@ -878,8 +878,22 @@ sint launchProgramAndWaitForResult(const std::string &programName, const std::st
 		SetEnvironmentVariable( SE_TRANSLATOR_IN_MAIN_MODULE, NULL );
 	}
 
-	string arg = " " + arguments;
+	const char *sProgramName = programName.c_str();
-	BOOL ok = CreateProcessA(programName.c_str(), (char*)arg.c_str(), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
+
+	std::string args;
+
+	// a .bat file must have first parameter to NULL and use 2nd parameter to pass filename
+	if (CFile::getExtension(programName) == "bat")
+	{
+		sProgramName = NULL;
+		args = "\"" + programName + "\" " + arguments;
+	}
+	else
+	{
+		args = arguments;
+	}
+
+	BOOL ok = CreateProcessA(sProgramName, (char*)args.c_str(), NULL, NULL, FALSE, CREATE_DEFAULT_ERROR_MODE | CREATE_NO_WINDOW, NULL, NULL, &si, &pi);
 
 	if (ok)
 	{

code/ryzom/client/data/gamedev/interfaces_v3/login_main.xml

@@ -361,11 +361,11 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
     fontsize="10" shadow="true" hardtext="uiOnPatchOpt" />
 
     <group id="global_patch" w="382" h="22" posparent="global_win" posref="MM MM" >
-      <view type="text" id="name" posref="BL BL" fontsize="12" x="2" y="0" color="135 243 28 255" shadow="true" hardtext="TOTAL PATCH" />
+      <view type="text" id="name" posref="BL BL" fontsize="12" x="2" y="0" color="135 243 28 255" shadow="true" hardtext="uiTotalPatch" />
       <view type="text" id="size" posref="BR BR" fontsize="12" x="-8" y="0" color="135 243 28 255" shadow="true" hardtext="...Kbs" />
     </group>
       <group id="nonopt_patch" w="382" h="22" posparent="nonopt_win" posref="MM MM" >
-      <view type="text" id="name" posref="BL BL" fontsize="12" x="2" y="0" color="135 243 28 255" shadow="true" hardtext="NON OPTIONAL FILES" />
+      <view type="text" id="name" posref="BL BL" fontsize="12" x="2" y="0" color="135 243 28 255" shadow="true" hardtext="uiRequiredFiles" />
       <view type="text" id="size" posref="BR BR" fontsize="12" x="-8" y="0" color="135 243 28 255" shadow="true" hardtext="...Kbs" />
     </group>
 

code/ryzom/client/src/login_patch.cpp

@@ -1793,7 +1793,7 @@ void CPatchManager::MyPatchingCB::progress(float f)
 {
 	CPatchManager *pPM = CPatchManager::getInstance();
 	double p = 100.0*f;
-	ucstring sTranslate = CI18N::get("uiApplyingDelta") + toString(" %s (%5.02f %%)", patchFilename.c_str(), p);
+	ucstring sTranslate = CI18N::get("uiApplyingDelta") + toString(" %s (%5.02f %%)", CFile::getFilename(patchFilename).c_str(), p);
 	pPM->setState(false, sTranslate);
 }
 
@@ -2711,7 +2711,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP)
 
 			string OutFilename = pPM->ClientPatchPath + rFTP.FileName + ".tmp__" + toString(j);
 
-			sTranslate = CI18N::get("uiApplyingDelta") + " " + PatchName;
+			sTranslate = CI18N::get("uiApplyingDelta") + " " + CFile::getFilename(PatchName);
 			pPM->setState(true, sTranslate);
 
 			xDeltaPatch(PatchName, SourceNameXD, OutFilename);

code/ryzom/client/src/seven_zip/seven_zip.cpp

@@ -259,7 +259,7 @@ bool unpackLZMA(const std::string &lzmaFile, const std::string &destFileName)
 
 bool packLZMA(const std::string &srcFileName, const std::string &lzmaFileName)
 {
-	nldebug("unpackLZMA: compress '%s' to LZMA file '%s", srcFileName.c_str(), lzmaFileName.c_str());
+	nldebug("packLZMA: compress '%s' to LZMA file '%s", srcFileName.c_str(), lzmaFileName.c_str());
 
 	// open file
 	CIFile inStream(srcFileName);