Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-03-01 14:02:18 +01:00
commit 31bdbb1fdc

View file

@ -137,6 +137,7 @@ struct CClientPatcherTranslations : public NLMISC::CI18N::ILoadProxy
"TheSagaOfRyzom [Ryzom]\n" "TheSagaOfRyzom [Ryzom]\n"
"uiErrPatchApply [Error: Patch process ended but the patch has not been successfully applied.]\n" "uiErrPatchApply [Error: Patch process ended but the patch has not been successfully applied.]\n"
"uiErrChecking [Error: Patch files failed - checking.]\n" "uiErrChecking [Error: Patch files failed - checking.]\n"
"uiByte [B]\n"
"uiKb [KiB]\n" "uiKb [KiB]\n"
"uiMb [MiB]\n" "uiMb [MiB]\n"
"uiLoginGetFile [Getting File:]\n" "uiLoginGetFile [Getting File:]\n"