Merge branch 'fixes' into yubo

code/ryzom/client/src/client_cfg.cpp

@@ -439,8 +439,8 @@ CClientConfig::CClientConfig()
 	CurlMaxConnections = 5;
 	CurlCABundle.clear();
 
-	RingReleaseNotePath = WebIgMainDomain + "/releasenotes_ring/index.php";
-	ReleaseNotePath = WebIgMainDomain + "/releasenotes/index.php";
+	RingReleaseNotePath = WebIgMainDomain + "/app_releasenotes/index.php";
+	ReleaseNotePath = WebIgMainDomain + "/app_releasenotes/index.php";
 
 
 	///////////////

code/ryzom/client/src/string_manager_client.cpp

@@ -390,7 +390,7 @@ restartLoop4:
 			else
 			{
 				result = it->second;
-				if (result.size() > 9 && result.substr(0, 9) == ucstring("<missing:")) 
+				if (result.size() > 9 && result.substr(0, 9) == ucstring("<missing:"))
 				{
 					map<ucstring, ucstring>::iterator itds = _DynStrings.find(result.substr(9, result.size()-10));
 					if (itds != _DynStrings.end())
@@ -747,6 +747,12 @@ restartLoop:
 							str = CEntityCL::removeTitleFromName(str);
 						}
 
+						// if the string contains a special rename of creature, remove it
+						if (str.size() > 2 && str[0] == '<' && str[1] == '#')
+						{
+							str = str.substr(2);
+						}
+
 						// append this string
 						temp.append(move, src+param.ReplacementPoint);
 						temp += str;
@@ -1625,7 +1631,7 @@ const ucchar *CStringManagerClient::getTitleLocalizedName(const ucstring &titleI
 		_TitleWords.push_back(listInfos[0]);
 		return getLocalizedName(_TitleWords.back());
 	}
-	
+
 	return getLocalizedName(titleId);
 }