Merge with develop

This commit is contained in:
kervala 2016-11-26 13:20:32 +01:00
parent 5daac508c1
commit 99ab8fba3e
26 changed files with 598 additions and 534 deletions

View file

@ -291,7 +291,7 @@ inline sint nlstricmp(const char *lhs, const std::string &rhs) { return stricmp(
#define tStrToUtf8(str) (ucstring((ucchar*)(LPCWSTR)str).toUtf8())
#define utf8ToTStr(str) ((wchar_t*)ucstring::makeFromUtf8(str).c_str())
#else
#define tStrToUtf8(str) ((LPCSTR)str)
#define tStrToUtf8(str) (std::string((LPCSTR)str))
#define utf8ToTStr(str) (str.c_str())
#endif

View file

@ -1120,8 +1120,6 @@ void CPSConstraintMesh::getShapesNames(std::string *shapesNames) const
#endif
}
//====================================================================================
void CPSConstraintMesh::setShape(uint index, const std::string &shapeName)
{
@ -1132,7 +1130,6 @@ void CPSConstraintMesh::setShape(uint index, const std::string &shapeName)
_ValidBuild = 0;
}
//====================================================================================
const std::string &CPSConstraintMesh::getShape(uint index) const
{

View file

@ -4,17 +4,17 @@ ADD_LIBRARY(ligoscape_utility SHARED ligoscape_utility.rc ${SRC} ligoscape_utili
INCLUDE_DIRECTORIES(${MAXSDK_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ligoscape_utility
nelmisc
TARGET_LINK_LIBRARIES(ligoscape_utility
nelmisc
nelligo
nel3d
nelpacs
${MAXSDK_LIBRARIES}
nel_patch_lib
${MAXSDK_LIBRARIES}
nel_patch_lib
nel_mesh_lib
nel_3dsmax_shared
comctl32)
SET_TARGET_PROPERTIES(ligoscape_utility PROPERTIES SUFFIX ".dlx")
NL_DEFAULT_PROPS(ligoscape_utility "MAX Plugin: Ligoscape Utility")
NL_ADD_RUNTIME_FLAGS(ligoscape_utility)

View file

@ -88,7 +88,7 @@ BOOL CAboutDialog::OnInitDialog()
}
}
}
return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}

View file

@ -287,6 +287,7 @@ void CAnimationSetDlg::refresh (BOOL update)
// Keyframer ?
UTrackKeyframer *keyTrack=dynamic_cast<UTrackKeyframer *>(track);
if (keyTrack)
{
// Get number of keys
@ -316,7 +317,7 @@ void CAnimationSetDlg::refresh (BOOL update)
std::string name = NLMISC::CFile::getFilenameWithoutExtension(object->Saved.SWTFileName[i]);
// Get the animation pointer
CSkeletonWeight *swt = object->AnimationSet.getSkeletonWeight (object->AnimationSet.getSkeletonWeightIdByName (name));
CSkeletonWeight *swt = object->AnimationSet.getSkeletonWeight(object->AnimationSet.getSkeletonWeightIdByName(name));
// Insert an intem
HTREEITEM item=SkelTree.InsertItem(utf8ToTStr(name));

View file

@ -104,8 +104,8 @@ public:
// SchemeWrapper[k].S reference the atriobute maker being edited
if (_EditedScheme->supportOp( (NL3D::CPSBinOp::BinOp) k))
{
sint index = m_BinOp.AddString(ops[k]) ;
m_BinOp.SetItemData(index, k) ;
sint index = m_BinOp.AddString(ops[k]);
m_BinOp.SetItemData(index, k);
if ((uint) _EditedScheme->getOp() == k)
{
m_BinOp.SetCurSel(k) ;

View file

@ -185,7 +185,6 @@ BOOL CLocatedTargetDlg::OnInitDialog()
}
}
const sint posX = 5;
sint posY = 180;

View file

@ -111,8 +111,10 @@ void CMeshDlg::OnBrowseShape()
{
MessageBox(utf8ToTStr(e.what()), _T("shape loading error"));
}
updateMeshErrorString();
}
UpdateData(FALSE);
}

View file

@ -220,6 +220,7 @@ void CParticleSystemEdit::updateDieOnEventParams()
{
ew = FALSE;
}
GetDlgItem(IDC_APPLY_AFTER_DELAY)->EnableWindow(ew);
CString out;
@ -232,6 +233,7 @@ void CParticleSystemEdit::updateDieOnEventParams()
{
out = _T("???");
}
GetDlgItem(IDC_APPLY_AFTER_DELAY)->SetWindowText(out);
((CButton *) GetDlgItem(IDC_AUTO_DELAY))->SetCheck(autoDelay ? 1 : 0);
}

View file

@ -386,6 +386,7 @@ CParticleWorkspace::CNode *CParticleWorkspace::addNode(const std::string &filena
{
relativePath = resultPath;
}
if (relativePath.size() >= 2)
{
if (relativePath[0] == '\\' && relativePath[1] != '\\')
@ -393,6 +394,7 @@ CParticleWorkspace::CNode *CParticleWorkspace::addNode(const std::string &filena
relativePath = relativePath.substr(1);
}
}
CNode *newNode = new CNode;
newNode->init(this);
newNode->setRelativePath(relativePath);

View file

@ -199,12 +199,15 @@ void CSkeletonScaleDlg::setSkeletonToEdit(NL3D::CSkeletonModel *skel, const std
{
for(uint i=0;i<_SkeletonModel->Bones.size();i++)
{
const std::string tabStr= " ";
std::string name= _SkeletonModel->Bones[i].getBoneName();
const std::string tabStr = " ";
std::string name = _SkeletonModel->Bones[i].getBoneName();
// append a tab for easy hierarchy
uint boneId= i;
uint boneId = i;
while((boneId=_SkeletonModel->Bones[boneId].getFatherId())!=-1)
name= tabStr + name;
name = tabStr + name;
// append to the list
_BoneList.AddString(utf8ToTStr(name));
}
@ -1222,7 +1225,7 @@ void CSkeletonScaleDlg::OnSsdButtonSaveScale()
return;
// choose the file
std::string defaultFileName= _SkeletonFileName;
std::string defaultFileName = _SkeletonFileName;
NLMISC::strFindReplace(defaultFileName, ".skel", ".scale");
CFileDialog fd(FALSE, _T("scale"), utf8ToTStr(defaultFileName), OFN_OVERWRITEPROMPT, _T("SkelScaleFiles (*.scale)|*.scale|All Files (*.*)|*.*||"), this) ;

View file

@ -114,6 +114,7 @@ void CSnapshotToolDlg::stringFromRegistry(HKEY hKey, const TCHAR *name, CString
DWORD type;
DWORD size;
LONG result = RegQueryValueEx(hKey, name, NULL, &type, NULL, &size);
if (type != REG_SZ || result != ERROR_SUCCESS || size == 0)
{
dest = defaultStr;
@ -144,18 +145,22 @@ template <class T, class U> void integralTypeFromRegistry(HKEY hKey, const TCHAR
DWORD type;
DWORD size;
LONG result = RegQueryValueEx(hKey, name, NULL, &type, NULL, &size);
if (type != REG_DWORD || result != ERROR_SUCCESS || size == 0)
{
dest = (T) defaultValue;
return;
}
DWORD value;
result = RegQueryValueEx(hKey, name, NULL, &type, LPBYTE(&value), &size);
if (result != ERROR_SUCCESS)
{
dest = defaultValue;
return;
}
dest = (T) value;
}
@ -175,6 +180,7 @@ void CSnapshotToolDlg::fromRegistry()
NLMISC::splitString(tStrToUtf8(filters), ",", filterList);
m_Filters.ResetContent();
for (uint k = 0; k < filterList.size(); ++k)
{
m_Filters.AddString(utf8ToTStr(filterList[k]));
@ -431,7 +437,6 @@ void CSnapshotToolDlg::OnGo()
}
}
// make sure that the screen can contains the window client area
RECT desktopSize;
::GetClientRect(::GetDesktopWindow(), &desktopSize);

View file

@ -36,11 +36,11 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
{
// Result to return
bool bRet = false;
TCHAR tempFileName[MAX_PATH] = { 0 };
TCHAR tempFileName[MAX_PATH] = { 0 };
TCHAR tempPathBuffer[MAX_PATH] = { 0 };
try
{
{
DWORD dwRetVal = GetTempPath(MAX_PATH, tempPathBuffer);
if (dwRetVal > MAX_PATH || (dwRetVal == 0))
nlerror("GetTempPath failed");
@ -85,7 +85,7 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
skeletonShape = NULL;
}
}
DWORD t = timeGetTime();
if (InfoLog)
InfoLog->display("Beg buildShape %s \n", node.GetName());
@ -93,7 +93,7 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
IShape *pShape = _ExportNel->buildShape(node, time, mapIdPtr, true);
if (InfoLog)
InfoLog->display("End buildShape in %d ms \n", timeGetTime()-t);
// Conversion success ?
if (pShape)
{
@ -105,7 +105,7 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
{
// Create a streamable shape
CShapeStream shapeStream(pShape);
// Serial the shape
shapeStream.serial(file);
@ -250,9 +250,9 @@ bool CNelExport::exportAnim (const char *sPath, std::vector<INode*>& vectNode, T
{
// Result to return
bool bRet=false;
char tempFileName[MAX_PATH] = { 0 };
char tempFileName[MAX_PATH] = { 0 };
char tempPathBuffer[MAX_PATH] = { 0 };
try
{
DWORD dwRetVal = GetTempPathA(MAX_PATH, tempPathBuffer);
@ -261,19 +261,19 @@ bool CNelExport::exportAnim (const char *sPath, std::vector<INode*>& vectNode, T
UINT uRetVal = GetTempFileNameA(tempPathBuffer, TEXT("_nel_export_mesh_"), 0, tempFileName);
if (uRetVal == 0)
nlerror("GetTempFileName failed");
// Create an animation file
CAnimation animFile;
// For each node to export
for (uint n=0; n<vectNode.size(); n++)
{
{
// Get name
std::string nodeName="";
// Get NEL3D_APPDATA_EXPORT_ANIMATION_PREFIXE_NAME
int prefixe = CExportNel::getScriptAppData (vectNode[n], NEL3D_APPDATA_EXPORT_ANIMATION_PREFIXE_NAME, 0);
// Set the name only if it is a scene animation
if (scene || prefixe)
{
@ -290,7 +290,7 @@ bool CNelExport::exportAnim (const char *sPath, std::vector<INode*>& vectNode, T
bool root = vectNode[n]->GetParentNode () == _Ip->GetRootNode();
// Add animation
_ExportNel->addAnimation (animFile, *vectNode[n], nodeName.c_str(), root);
_ExportNel->addAnimation (animFile, *vectNode[n], nodeName.c_str(), root);
}
if (vectNode.size())
@ -401,7 +401,7 @@ bool CNelExport::exportSkeleton (const char *sPath, INode* pNode, TimeValue time
{
// Create a streamable shape
CShapeStream shapeStream (skeletonShape);
// Serial the shape
shapeStream.serial (file);

View file

@ -2372,11 +2372,13 @@ INT_PTR CALLBACK MiscDialogCallback (
currentParam->RemanenceShiftingTexture = SendMessage (GetDlgItem (hwndDlg, IDC_REMANENCE_SHIFTING_TEXTURE), BM_GETCHECK, 0, 0);
GetWindowText (GetDlgItem (hwndDlg, IDC_REMANENCE_SLICE_NUMBER), tmp, 512);
uint rsn;
if (NLMISC::fromString(tStrToUtf8(tmp), rsn))
{
currentParam->RemanenceSliceNumber = rsn;
}
GetWindowText (GetDlgItem (hwndDlg, IDC_REMANENCE_SAMPLING_PERIOD), tmp, 512);
toFloatMax(tmp, currentParam->RemanenceSamplingPeriod);
GetWindowText (GetDlgItem (hwndDlg, IDC_REMANENCE_ROLLUP_RATIO), tmp, 512);

View file

@ -35,8 +35,8 @@ enum { po2rpo_params };
//TODO: Add enums for various parameters
enum { pb_spin,};
static ParamBlockDesc2 po2rpo_param_blk ( po2rpo_params, _T("params"), 0, &PO2RPODesc,
P_AUTO_CONSTRUCT + P_AUTO_UI, PBLOCK_REF,
static ParamBlockDesc2 po2rpo_param_blk ( po2rpo_params, _T("params"), 0, &PO2RPODesc,
P_AUTO_CONSTRUCT + P_AUTO_UI, PBLOCK_REF,
//rollout
IDD_PANEL, IDS_PARAMS, 0, 0, NULL,
// params
@ -67,11 +67,11 @@ PO2RPO::~PO2RPO()
Interval PO2RPO::LocalValidity(TimeValue t)
{
// if being edited, return NEVER forces a cache to be built
// if being edited, return NEVER forces a cache to be built
// after previous modifier.
if (TestAFlag(A_MOD_BEING_EDITED))
{
return NEVER;
return NEVER;
}
//TODO: Return the validity interval of the modifier
return NEVER;
@ -81,7 +81,7 @@ Interval PO2RPO::LocalValidity(TimeValue t)
RefTargetHandle PO2RPO::Clone(RemapDir& remap)
{
PO2RPO* newmod = new PO2RPO();
PO2RPO* newmod = new PO2RPO();
//TODO: Add the cloning code here
newmod->ReplaceReference(0,pblock->Clone(remap));
return(newmod);
@ -90,7 +90,7 @@ RefTargetHandle PO2RPO::Clone(RemapDir& remap)
// -----------------------------------------------------------------------------------------------------------------------------------------------------------
static int done=0;
void PO2RPO::ModifyObject(TimeValue t, ModContext &mc, ObjectState * os, INode *node)
void PO2RPO::ModifyObject(TimeValue t, ModContext &mc, ObjectState * os, INode *node)
{
/*
if (!done)
@ -121,12 +121,12 @@ void PO2RPO::ModifyObject(TimeValue t, ModContext &mc, ObjectState * os, INode *
// -----------------------------------------------------------------------------------------------------------------------------------------------------------
extern HINSTANCE hInstance;
INT_PTR CALLBACK DlgProc_Panel(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK DlgProc_Panel(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
switch (message)
switch (message)
{
// -----
case WM_INITDIALOG:
case WM_INITDIALOG:
{
// Get the module path
HMODULE hModule = hInstance;
@ -214,7 +214,7 @@ void PO2RPO::BeginEditParams( IObjParam *ip, ULONG flags,Animatable *prev )
void PO2RPO::EndEditParams( IObjParam *ip, ULONG flags,Animatable *next)
{
//PO2RPODesc.EndEditParams(ip, this, flags, next);
ip->DeleteRollupPage(hRollup);
ip->DeleteRollupPage(hRollup);
this->ip = NULL;
}
@ -230,21 +230,21 @@ RefResult PO2RPO::NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget,P
// -----------------------------------------------------------------------------------------------------------------------------------------------------------
//From Object
BOOL PO2RPO::HasUVW()
{
BOOL PO2RPO::HasUVW()
{
//TODO: Return whether the object has UVW coordinates or not
return TRUE;
return TRUE;
}
// -----------------------------------------------------------------------------------------------------------------------------------------------------------
void PO2RPO::SetGenUVW(BOOL sw)
{
if (sw==HasUVW())
void PO2RPO::SetGenUVW(BOOL sw)
{
if (sw==HasUVW())
{
return;
}
//TODO: Set the plugin internal value to sw
//TODO: Set the plugin internal value to sw
}
// -----------------------------------------------------------------------------------------------------------------------------------------------------------

View file

@ -435,6 +435,7 @@ public:
CBankManager ()
{
}
const NL3D::CTileBank& getBank (std::string& path=GetBankPathName ())
{
if (path!=_lastPath)

View file

@ -371,19 +371,19 @@ RefResult RGBAdd::NotifyRefChanged(Interval changeInt, RefTargetHandle hTarget,
case REFMSG_CHANGE:
ivalid.SetEmpty();
if (hTarget == pblock)
{
// see if this message came from a changing parameter in the pblock,
// if so, limit rollout update to the changing item and update any active viewport texture
{
// see if this message came from a changing parameter in the pblock,
// if so, limit rollout update to the changing item and update any active viewport texture
ParamID changing_param = pblock->LastNotifyParamID();
RGBAdd_param_blk.InvalidateUI(changing_param);
// notify our dependents that we've changed
// notify our dependents that we've changed
// NotifyChanged(); //DS this is redundant
}
}
break;
}
return(REF_SUCCEED);
}
return(REF_SUCCEED);
}
#define MTL_HDR_CHUNK 0x4000

View file

@ -29,7 +29,7 @@ extern HINSTANCE hInstance;
using namespace NLMISC;
using namespace NL3D;
class Tile_utility : public UtilityObj
class Tile_utility : public UtilityObj
{
public:
HWND hPanel;
@ -44,8 +44,8 @@ public:
void Init(HWND hWnd);
void Destroy(HWND hWnd);
void DeleteThis() { }
void DeleteThis() { }
void Load (const std::string& path);
void SetLand (sint land);
@ -55,7 +55,7 @@ public:
//Constructor/Destructor
Tile_utility();
~Tile_utility();
~Tile_utility();
};
CTileBank Tile_utility::Bank;
@ -64,11 +64,11 @@ std::string Tile_utility::Path;
static Tile_utility theTile_utility;
class Tile_utilityClassDesc:public ClassDesc2
class Tile_utilityClassDesc:public ClassDesc2
{
public:
int IsPublic() {return 1;}
void * Create(BOOL loading = FALSE)
void * Create(BOOL loading = FALSE)
{
return &theTile_utility;
}
@ -85,7 +85,7 @@ ClassDesc2* GetTile_utilityDesc() {return &Tile_utilityDesc;}
static INT_PTR CALLBACK Tile_utilityDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
switch (msg)
{
case WM_INITDIALOG:
{
@ -159,12 +159,12 @@ static INT_PTR CALLBACK Tile_utilityDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
case WM_LBUTTONDOWN:
case WM_LBUTTONUP:
case WM_MOUSEMOVE:
theTile_utility.ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
theTile_utility.ip->RollupMouseMessage(hWnd,msg,wParam,lParam);
break;
case WM_COMMAND:
{
int id = LOWORD(wParam);
switch (id)
switch (id)
{
case IDC_BANK_PATH:
{
@ -240,7 +240,7 @@ static INT_PTR CALLBACK Tile_utilityDlgProc(HWND hWnd, UINT msg, WPARAM wParam,
Tile_utility::Tile_utility()
{
iu = NULL;
ip = NULL;
ip = NULL;
hPanel = NULL;
Bank.clear();
Land=0;
@ -252,7 +252,7 @@ Tile_utility::~Tile_utility()
}
void Tile_utility::BeginEditParams(Interface *ip,IUtil *iu)
void Tile_utility::BeginEditParams(Interface *ip,IUtil *iu)
{
this->iu = iu;
this->ip = ip;
@ -264,8 +264,8 @@ void Tile_utility::BeginEditParams(Interface *ip,IUtil *iu)
0);
SetupUI ();
}
void Tile_utility::EndEditParams(Interface *ip,IUtil *iu)
void Tile_utility::EndEditParams(Interface *ip,IUtil *iu)
{
this->iu = NULL;
this->ip = NULL;
@ -319,7 +319,7 @@ void Tile_utility::SetLand (sint land)
Land=0;
SetBankTileSetSet (Land);
}
void Tile_utility::SetupUI ()
{
// Clear combo box
@ -333,7 +333,7 @@ void Tile_utility::SetupUI ()
// Enable combo box
if (Bank.getLandCount())
EnableWindow (hCombo, TRUE);
else
else
EnableWindow (hCombo, FALSE);
}

View file

@ -1296,6 +1296,7 @@ void CTView::DrawTile(tilelist::iterator i,CDC *pDC,int clear, int n)
{
Name = NLMISC::toString("%d", i->id);
}
rect_txt.top = pt.y + sizetile_y + spacing_tile_text;
rect_txt.bottom += rect_txt.top + sizetext_y;
rect_txt.left -= spacing_x;

View file

@ -232,8 +232,8 @@ int main(int argc, char *argv[])
dialog.setSelectedComponents(components);
// TODO: check real return codes from Uninstallers
if (!dialog.exec()) return 1;
// exit if press Cancel button or close dialog
if (!dialog.exec()) return 0;
components = dialog.getSelectedCompenents();
}

View file

@ -4,42 +4,46 @@
<context>
<name>CDownloader</name>
<message>
<location filename="../src/downloader.cpp" line="156"/>
<location filename="../src/downloader.cpp" line="158"/>
<source>File is larger (%1B) than expected (%2B)</source>
<translation>Die Datei ist (%1B) größer als erwartet (%2B)</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="186"/>
<location filename="../src/downloader.cpp" line="190"/>
<source>Error &apos;%1&apos; occurred when trying to check free disk space on %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="198"/>
<source>You only have %1 bytes left on the device, but %2 bytes are needed.</source>
<translation>Auf dem Gerät sind nur noch %1 Byte Speicherplatz verfügbar, es werden aber %2 Byte benötigt.</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="192"/>
<location filename="../src/downloader.cpp" line="204"/>
<source>Unable to write file</source>
<translation>Datei kann nicht geschrieben werden</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="227"/>
<location filename="../src/downloader.cpp" line="239"/>
<source>Timeout</source>
<translation>Zeitüberschreitung</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="264"/>
<location filename="../src/downloader.cpp" line="287"/>
<source>Redirection URL is not defined</source>
<translation>Weiterleitungs-URL ist nicht definiert</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="329"/>
<source>File is not available, please retry later (status code: %1)</source>
<translation>Datei ist nicht abrufbar, bitte versuch es später noch einmal (Status-Code: %1)</translation>
<translation type="vanished">Datei ist nicht abrufbar, bitte versuch es später noch einmal (Status-Code: %1)</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="336"/>
<location filename="../src/downloader.cpp" line="357"/>
<source>Incorrect status code: %1</source>
<translation>Falscher Status-Code: %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="382"/>
<location filename="../src/downloader.cpp" line="411"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
@ -59,7 +63,7 @@
<translation type="vanished">Internet (%1 herunterzuladen)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="80"/>
<location filename="../src/installdialog.cpp" line="81"/>
<source>Files will be installed to (requires %1):</source>
<translation>Dateien werden installiert nach (benötigt %1):</translation>
</message>
@ -76,7 +80,7 @@
<translation type="vanished">Ryzom konnte im gewählten Verzeichnis nicht gefunden werden. Wähle bitte ein anderes Verzeichnis oder brich ab.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="115"/>
<location filename="../src/installdialog.cpp" line="116"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
</message>
@ -89,32 +93,32 @@
<translation type="vanished">Undefiniert</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>Unable to write in directory</source>
<translation>In das Verzeichnis konnte nicht geschrieben werden</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Du hast nicht die Berechtigungen, um mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>Directory not empty</source>
<translation>Verzeichnist ist nicht leer</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes.</translation>
</message>
@ -122,27 +126,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="287"/>
<source>About %1</source>
<translation>Über %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="289"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Programm, um Ryzom-Profile zu installieren, herunterzuladen und zu verwalten.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="291"/>
<source>Author: %1</source>
<translation>Autor: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="275"/>
<location filename="../src/mainwindow.cpp" line="292"/>
<source>Copyright: %1</source>
<translation>Copyright: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="276"/>
<location filename="../src/mainwindow.cpp" line="293"/>
<source>Support: %1</source>
<translation>Support: %1</translation>
</message>
@ -150,42 +154,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="94"/>
<location filename="../src/migratedialog.cpp" line="72"/>
<source>Files will be installed to (requires %1):</source>
<translation>Dateien werden installiert nach (benötigt %1):</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="131"/>
<location filename="../src/migratedialog.cpp" line="109"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Bitte wähle ein Verzeichnis, in dem Ryzom installiert werden soll.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>Not enough free disk space</source>
<translation>Nicht genügend freier Festplattenspeicher</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Auf diesem Laufwerk ist nicht genügend freier Speicher verfügbar, bitte schaffe mehr Platz oder wähle ein Verzeichnis auf einem anderen Laufwerk.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>Unable to write in directory</source>
<translation>Kann nicht in dieses Verzeichnis schreiben</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Du hast nicht die Berechtigungen, mit deinem derzeitigen Benutzer-Konto in dieses Verzeichnis zu schreiben, bitte wähle ein anderes Verzeichnis.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>Directory not empty</source>
<translation>Verzeichnis ist nicht leer</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Dieses Verzeichnis ist nicht leer, bitte wähle ein anderes.</translation>
</message>
@ -197,109 +201,109 @@
<translation type="vanished">Profile aktualisieren</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="275"/>
<location filename="../src/operationdialog.cpp" line="276"/>
<source>Updating profiles...</source>
<translation>Aktualisiere Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Confirmation</source>
<translation>Bestätigung</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>Warnung: dieser Server unterstützt kein Fortsetzen! Wenn du jetzt den Download abbrichst, wirst du nicht in der Lage sein, ihn später wieder fortzusetzen.
Willst du den Download wirklich abbrechen?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="453"/>
<location filename="../src/operationdialog.cpp" line="454"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m KiB)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="513"/>
<location filename="../src/operationdialog.cpp" line="514"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="534"/>
<location filename="../src/operationdialog.cpp" line="535"/>
<source>Downloading data required by server %1...</source>
<translation>Herunterzuladende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="545"/>
<location filename="../src/operationdialog.cpp" line="546"/>
<source>Extracting data required by server %1...</source>
<translation>Zu extrahierende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="569"/>
<location filename="../src/operationdialog.cpp" line="570"/>
<source>Downloading client required by server %1...</source>
<translation>Herunterzuladender Client benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="580"/>
<location filename="../src/operationdialog.cpp" line="581"/>
<source>Extracting client required by server %1...</source>
<translation>Zu extrahierender Client benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="602"/>
<location filename="../src/operationdialog.cpp" line="603"/>
<source>Copying data required by server %1...</source>
<translation>Zu kopierende Daten benötigt von Server %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="631"/>
<location filename="../src/operationdialog.cpp" line="632"/>
<source>Copying old profile to new location...</source>
<translation>Kopiere alte Profile zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="661"/>
<location filename="../src/operationdialog.cpp" line="662"/>
<source>Extracting client to new location...</source>
<translation>Extrahiere Client an neuem Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="726"/>
<location filename="../src/operationdialog.cpp" line="727"/>
<source>Copying installer to new location...</source>
<translation>Kopiere Installer zum neuen Zielort...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="847"/>
<location filename="../src/operationdialog.cpp" line="855"/>
<source>Cleaning obsolete files...</source>
<translation>Bereinige überholte Dateien...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="862"/>
<location filename="../src/operationdialog.cpp" line="870"/>
<source>Creating default profile...</source>
<translation>Erstelle Standard-Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="921"/>
<location filename="../src/operationdialog.cpp" line="929"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Erstelle Verknüpfungen für Profile %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1007"/>
<location filename="../src/operationdialog.cpp" line="1015"/>
<source>Deleting client...</source>
<translation>Lösche Client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1067"/>
<location filename="../src/operationdialog.cpp" line="1075"/>
<source>Adding profiles...</source>
<translation>Füge Profile hinzu...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1087"/>
<location filename="../src/operationdialog.cpp" line="1095"/>
<source>Deleting profiles...</source>
<translation>Lösche Profile...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1140"/>
<location filename="../src/operationdialog.cpp" line="1148"/>
<source>Deleting installer...</source>
<translation>Lösche Installer...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1192"/>
<location filename="../src/operationdialog.cpp" line="1200"/>
<source>Deleting downloaded files...</source>
<translation>Lösche heruntergeladene Dateien...</translation>
</message>
@ -349,12 +353,12 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Kopiere Installer an neuen Ort</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>Uninstall old client</source>
<translation>Deinstalliere alten Client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>Eine ältere Version von Ryzom wurde auf diesem System gefunden, möchtest du sie deinstallieren, um Festplattenspeicher zu sparen?</translation>
</message>
@ -379,7 +383,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Client-Dateien</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1037"/>
<location filename="../src/operationdialog.cpp" line="1045"/>
<source>Unable to delete files for client %1</source>
<translation>Dateien für Client %1 konnten nicht gelöscht werden</translation>
</message>
@ -400,7 +404,7 @@ Willst du den Download wirklich abbrechen?</translation>
<translation type="vanished">Lösche Profil %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1116"/>
<location filename="../src/operationdialog.cpp" line="1124"/>
<source>Unable to delete files for profile %1</source>
<translation>Dateien für Profil %1 konnten nicht gelöscht werden</translation>
</message>
@ -433,17 +437,17 @@ Are you sure to delete this profile?</source>
Bist du sicher, dass du dieses Profil löschen willst?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="277"/>
<location filename="../src/profilesdialog.cpp" line="278"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<location filename="../src/profilesdialog.cpp" line="284"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Bitte wähle die ausführbare Datei, um den Ryzom-Client zu starten</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="275"/>
<location filename="../src/profilesdialog.cpp" line="276"/>
<source>Executables (*.exe)</source>
<translation>Ausführbare Dateien (*.exe)</translation>
</message>
@ -753,7 +757,7 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation>Löschen</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="72"/>
<location filename="../ui/profilesdialog.ui" line="75"/>
<source>Profile:</source>
<translation>Profil:</translation>
</message>
@ -762,27 +766,27 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
<location filename="../ui/profilesdialog.ui" line="89"/>
<source>Name:</source>
<translation>Name:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="96"/>
<location filename="../ui/profilesdialog.ui" line="99"/>
<source>Server:</source>
<translation>Server:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="107"/>
<location filename="../ui/profilesdialog.ui" line="110"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="112"/>
<location filename="../ui/profilesdialog.ui" line="115"/>
<source>Yubo</source>
<translation>Yubo</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="120"/>
<location filename="../ui/profilesdialog.ui" line="123"/>
<source>Executable:</source>
<translation>Ausführbare Datei:</translation>
</message>
@ -791,27 +795,27 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="136"/>
<location filename="../ui/profilesdialog.ui" line="139"/>
<source>Default</source>
<translation>Standard</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="143"/>
<location filename="../ui/profilesdialog.ui" line="146"/>
<source>Browse...</source>
<translation>Durchsuchen...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="152"/>
<location filename="../ui/profilesdialog.ui" line="155"/>
<source>Arguments:</source>
<translation>Argumente:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="162"/>
<location filename="../ui/profilesdialog.ui" line="165"/>
<source>Comments:</source>
<translation>Kommentare:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="179"/>
<location filename="../ui/profilesdialog.ui" line="182"/>
<source>Directory:</source>
<translation>Verzeichnis:</translation>
</message>
@ -820,22 +824,22 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="195"/>
<location filename="../ui/profilesdialog.ui" line="198"/>
<source>Open</source>
<translation>Öffnen</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="204"/>
<location filename="../ui/profilesdialog.ui" line="207"/>
<source>Create shortcuts:</source>
<translation>Erstelle Verknüpfungen:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="213"/>
<location filename="../ui/profilesdialog.ui" line="216"/>
<source>Desktop</source>
<translation>Desktop</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="220"/>
<location filename="../ui/profilesdialog.ui" line="223"/>
<source>Start Menu</source>
<translation>Start-Menü</translation>
</message>
@ -843,116 +847,123 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<context>
<name>QApplication</name>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Unable to find ryzom_installer.ini</source>
<translation>ryzom_installer.ini konnte nicht gefunden werden</translation>
</message>
<message>
<location filename="../src/main.cpp" line="119"/>
<location filename="../src/main.cpp" line="123"/>
<source>Installation and launcher tool for Ryzom</source>
<translation>Installations- und Startprogramm für Ryzom</translation>
</message>
<message>
<location filename="../src/main.cpp" line="122"/>
<location filename="../src/main.cpp" line="126"/>
<source>Uninstall</source>
<translation>Deinstallieren</translation>
</message>
<message>
<location filename="../src/main.cpp" line="125"/>
<location filename="../src/main.cpp" line="129"/>
<source>Silent mode</source>
<translation>Stiller Modus</translation>
</message>
<message>
<location filename="../src/main.cpp" line="128"/>
<location filename="../src/main.cpp" line="132"/>
<source>Version</source>
<translation>Version</translation>
</message>
<message>
<location filename="../src/main.cpp" line="131"/>
<location filename="../src/main.cpp" line="135"/>
<source>Install itself</source>
<translation>Selbstinstallation</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<location filename="../src/filesextractor.cpp" line="324"/>
<location filename="../src/filesextractor.cpp" line="629"/>
<source>Unable to open %1</source>
<translation>%1 konnte nicht geöffnet werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Ausgabe-Datei konnte nicht geöffnet werden</translation>
<translation type="vanished">Ausgabe-Datei konnte nicht geöffnet werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Ausgabe-Datei konnte nicht geschrieben werden</translation>
<translation type="vanished">Ausgabe-Datei konnte nicht geschrieben werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<location filename="../src/filesextractor.cpp" line="471"/>
<source>Unable to open output file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="494"/>
<source>Unable to write output file %1 (%2 bytes written but expecting %3 bytes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="538"/>
<location filename="../src/filesextractor.cpp" line="546"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>7zip-Decoder unterstützt dieses Archiv nicht</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="499"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to allocate memory</source>
<translation>Speicher konnte nicht zugewiesen werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="507"/>
<location filename="../src/filesextractor.cpp" line="550"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<location filename="../src/filesextractor.cpp" line="558"/>
<source>Error %1</source>
<translation>Fehler %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="542"/>
<location filename="../src/filesextractor.cpp" line="587"/>
<source>Unable to create directory %1</source>
<translation>Verzeichnis %1 konnte nicht erstellt werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="548"/>
<location filename="../src/filesextractor.cpp" line="595"/>
<source>Unable to set permissions of %1</source>
<translation>Berechtigungen für %1 konnten nicht gesetzt werden</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="663"/>
<location filename="../src/filesextractor.cpp" line="718"/>
<source>disk full</source>
<translation>Festplatte voll</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="667"/>
<location filename="../src/filesextractor.cpp" line="724"/>
<source>unable to write %1</source>
<translation>Konnte %1 nicht schreiben</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="671"/>
<location filename="../src/filesextractor.cpp" line="730"/>
<source>unable to read %1</source>
<translation>Konnte %1 nicht lesen</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="675"/>
<location filename="../src/filesextractor.cpp" line="736"/>
<source>failed (%1)</source>
<translation>Fehlgeschlagen (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="678"/>
<location filename="../src/filesextractor.cpp" line="739"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Konnte %1 nicht nach %2 entpacken: %3</translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="189"/>
<source>Unable to copy file %1</source>
<translation>Konnte Datei %1 nicht kopieren</translation>
<translation type="vanished">Konnte Datei %1 nicht kopieren</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
@ -964,6 +975,11 @@ Drücke Weiter und folge den verschiedenen Schritten bis zum Ende.</translation>
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="179"/>
<source>Unable to copy file %1 to %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

View file

@ -4,42 +4,42 @@
<context>
<name>CDownloader</name>
<message>
<location filename="../src/downloader.cpp" line="156"/>
<location filename="../src/downloader.cpp" line="158"/>
<source>File is larger (%1B) than expected (%2B)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="186"/>
<location filename="../src/downloader.cpp" line="190"/>
<source>Error &apos;%1&apos; occurred when trying to check free disk space on %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="198"/>
<source>You only have %1 bytes left on the device, but %2 bytes are needed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="192"/>
<location filename="../src/downloader.cpp" line="204"/>
<source>Unable to write file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="227"/>
<location filename="../src/downloader.cpp" line="239"/>
<source>Timeout</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="264"/>
<location filename="../src/downloader.cpp" line="287"/>
<source>Redirection URL is not defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="329"/>
<source>File is not available, please retry later (status code: %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="336"/>
<location filename="../src/downloader.cpp" line="357"/>
<source>Incorrect status code: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="382"/>
<location filename="../src/downloader.cpp" line="411"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
@ -47,42 +47,42 @@
<context>
<name>CInstallDialog</name>
<message>
<location filename="../src/installdialog.cpp" line="80"/>
<location filename="../src/installdialog.cpp" line="81"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="115"/>
<location filename="../src/installdialog.cpp" line="116"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
@ -90,27 +90,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="287"/>
<source>About %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="289"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="291"/>
<source>Author: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="275"/>
<location filename="../src/mainwindow.cpp" line="292"/>
<source>Copyright: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="276"/>
<location filename="../src/mainwindow.cpp" line="293"/>
<source>Support: %1</source>
<translation type="unfinished"></translation>
</message>
@ -118,42 +118,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="94"/>
<location filename="../src/migratedialog.cpp" line="72"/>
<source>Files will be installed to (requires %1):</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="131"/>
<location filename="../src/migratedialog.cpp" line="109"/>
<source>Please choose directory to install Ryzom in</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>Not enough free disk space</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>Unable to write in directory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>Directory not empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>This directory is not empty, please choose another one.</source>
<translation type="unfinished"></translation>
</message>
@ -161,128 +161,128 @@
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="275"/>
<location filename="../src/operationdialog.cpp" line="276"/>
<source>Updating profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Confirmation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="453"/>
<location filename="../src/operationdialog.cpp" line="454"/>
<source>%p% (%v/%m KiB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="513"/>
<location filename="../src/operationdialog.cpp" line="514"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="534"/>
<location filename="../src/operationdialog.cpp" line="535"/>
<source>Downloading data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="545"/>
<location filename="../src/operationdialog.cpp" line="546"/>
<source>Extracting data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="569"/>
<location filename="../src/operationdialog.cpp" line="570"/>
<source>Downloading client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="580"/>
<location filename="../src/operationdialog.cpp" line="581"/>
<source>Extracting client required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="602"/>
<location filename="../src/operationdialog.cpp" line="603"/>
<source>Copying data required by server %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="631"/>
<location filename="../src/operationdialog.cpp" line="632"/>
<source>Copying old profile to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="661"/>
<location filename="../src/operationdialog.cpp" line="662"/>
<source>Extracting client to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="726"/>
<location filename="../src/operationdialog.cpp" line="727"/>
<source>Copying installer to new location...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="847"/>
<location filename="../src/operationdialog.cpp" line="855"/>
<source>Cleaning obsolete files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="862"/>
<location filename="../src/operationdialog.cpp" line="870"/>
<source>Creating default profile...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="921"/>
<location filename="../src/operationdialog.cpp" line="929"/>
<source>Creating shortcuts for profile %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1007"/>
<location filename="../src/operationdialog.cpp" line="1015"/>
<source>Deleting client...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1067"/>
<location filename="../src/operationdialog.cpp" line="1075"/>
<source>Adding profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1087"/>
<location filename="../src/operationdialog.cpp" line="1095"/>
<source>Deleting profiles...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1140"/>
<location filename="../src/operationdialog.cpp" line="1148"/>
<source>Deleting installer...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1192"/>
<location filename="../src/operationdialog.cpp" line="1200"/>
<source>Deleting downloaded files...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>Uninstall old client</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1037"/>
<location filename="../src/operationdialog.cpp" line="1045"/>
<source>Unable to delete files for client %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1116"/>
<location filename="../src/operationdialog.cpp" line="1124"/>
<source>Unable to delete files for profile %1</source>
<translation type="unfinished"></translation>
</message>
@ -306,17 +306,17 @@ Are you sure to delete this profile?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="277"/>
<location filename="../src/profilesdialog.cpp" line="278"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<location filename="../src/profilesdialog.cpp" line="284"/>
<source>Please choose Ryzom client executable to launch</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="275"/>
<location filename="../src/profilesdialog.cpp" line="276"/>
<source>Executables (*.exe)</source>
<translation type="unfinished"></translation>
</message>
@ -574,77 +574,77 @@ Just press Continue button and follow the different steps until everything is do
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="72"/>
<location filename="../ui/profilesdialog.ui" line="75"/>
<source>Profile:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
<location filename="../ui/profilesdialog.ui" line="89"/>
<source>Name:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="96"/>
<location filename="../ui/profilesdialog.ui" line="99"/>
<source>Server:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="107"/>
<location filename="../ui/profilesdialog.ui" line="110"/>
<source>Atys</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="112"/>
<location filename="../ui/profilesdialog.ui" line="115"/>
<source>Yubo</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="120"/>
<location filename="../ui/profilesdialog.ui" line="123"/>
<source>Executable:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="136"/>
<location filename="../ui/profilesdialog.ui" line="139"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="143"/>
<location filename="../ui/profilesdialog.ui" line="146"/>
<source>Browse...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="152"/>
<location filename="../ui/profilesdialog.ui" line="155"/>
<source>Arguments:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="162"/>
<location filename="../ui/profilesdialog.ui" line="165"/>
<source>Comments:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="179"/>
<location filename="../ui/profilesdialog.ui" line="182"/>
<source>Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="195"/>
<location filename="../ui/profilesdialog.ui" line="198"/>
<source>Open</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="204"/>
<location filename="../ui/profilesdialog.ui" line="207"/>
<source>Create shortcuts:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="213"/>
<location filename="../ui/profilesdialog.ui" line="216"/>
<source>Desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="220"/>
<location filename="../ui/profilesdialog.ui" line="223"/>
<source>Start Menu</source>
<translation type="unfinished"></translation>
</message>
@ -652,117 +652,112 @@ Just press Continue button and follow the different steps until everything is do
<context>
<name>QApplication</name>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Unable to find ryzom_installer.ini</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="119"/>
<location filename="../src/main.cpp" line="123"/>
<source>Installation and launcher tool for Ryzom</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="122"/>
<location filename="../src/main.cpp" line="126"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="125"/>
<location filename="../src/main.cpp" line="129"/>
<source>Silent mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="128"/>
<location filename="../src/main.cpp" line="132"/>
<source>Version</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/main.cpp" line="131"/>
<location filename="../src/main.cpp" line="135"/>
<source>Install itself</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<location filename="../src/filesextractor.cpp" line="324"/>
<location filename="../src/filesextractor.cpp" line="629"/>
<source>Unable to open %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<location filename="../src/filesextractor.cpp" line="471"/>
<source>Unable to open output file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<location filename="../src/filesextractor.cpp" line="494"/>
<source>Unable to write output file %1 (%2 bytes written but expecting %3 bytes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<location filename="../src/filesextractor.cpp" line="538"/>
<location filename="../src/filesextractor.cpp" line="546"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="499"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to allocate memory</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="507"/>
<location filename="../src/filesextractor.cpp" line="550"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<location filename="../src/filesextractor.cpp" line="558"/>
<source>Error %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="542"/>
<location filename="../src/filesextractor.cpp" line="587"/>
<source>Unable to create directory %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="548"/>
<location filename="../src/filesextractor.cpp" line="595"/>
<source>Unable to set permissions of %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="663"/>
<location filename="../src/filesextractor.cpp" line="718"/>
<source>disk full</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="667"/>
<location filename="../src/filesextractor.cpp" line="724"/>
<source>unable to write %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="671"/>
<location filename="../src/filesextractor.cpp" line="730"/>
<source>unable to read %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="675"/>
<location filename="../src/filesextractor.cpp" line="736"/>
<source>failed (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="678"/>
<location filename="../src/filesextractor.cpp" line="739"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="189"/>
<source>Unable to copy file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
<source>Profile ID %1 is using invalid characters (only lowercase letters, numbers and underscore are allowed)</source>
@ -773,6 +768,11 @@ Just press Continue button and follow the different steps until everything is do
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="179"/>
<source>Unable to copy file %1 to %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

View file

@ -4,42 +4,46 @@
<context>
<name>CDownloader</name>
<message>
<location filename="../src/downloader.cpp" line="156"/>
<location filename="../src/downloader.cpp" line="158"/>
<source>File is larger (%1B) than expected (%2B)</source>
<translation>Le fichier est plus volumineux (%1o) que prévu (%2o)</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="186"/>
<location filename="../src/downloader.cpp" line="190"/>
<source>Error &apos;%1&apos; occurred when trying to check free disk space on %2.</source>
<translation>Erreur &apos;%1&apos; détectée lors de la vérification de l&apos;espace disque sur %2.</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="198"/>
<source>You only have %1 bytes left on the device, but %2 bytes are needed.</source>
<translation>Il vous reste %1 octets de libre sur le disque, mais %2 octets sont nécessaires.</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="192"/>
<location filename="../src/downloader.cpp" line="204"/>
<source>Unable to write file</source>
<translation>Impossible de créer le fichier</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="227"/>
<location filename="../src/downloader.cpp" line="239"/>
<source>Timeout</source>
<translation>Délai expiré</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="264"/>
<location filename="../src/downloader.cpp" line="287"/>
<source>Redirection URL is not defined</source>
<translation>L&apos;URL de redirection n&apos;est pas définie</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="329"/>
<source>File is not available, please retry later (status code: %1)</source>
<translation>Le fichier est indisponible, veuillez réessayer ultérieurement (code de statut : %1) </translation>
<translation type="vanished">Le fichier est indisponible, veuillez réessayer ultérieurement (code de statut : %1) </translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="336"/>
<location filename="../src/downloader.cpp" line="357"/>
<source>Incorrect status code: %1</source>
<translation>Code de statut incorrect : %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="382"/>
<location filename="../src/downloader.cpp" line="411"/>
<source>HTTP error: %1</source>
<translation>Errreur HTTP : %1</translation>
</message>
@ -59,7 +63,7 @@
<translation type="vanished">Internet (%1 à télécharger)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="80"/>
<location filename="../src/installdialog.cpp" line="81"/>
<source>Files will be installed to (requires %1):</source>
<translation>Les fichiers seront installés dans (%1 nécessaires) :</translation>
</message>
@ -76,7 +80,7 @@
<translation type="vanished">Impossible de trouver Ryzom dans le répertoire sélectionné. Veuillez en choisir un autre ou annuler.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="115"/>
<location filename="../src/installdialog.cpp" line="116"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Veuillez choisir le répertoire Ryzom sera installé</translation>
</message>
@ -89,32 +93,32 @@
<translation type="vanished">Non défini</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Vous ne disposez pas assez d&apos;espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>Unable to write in directory</source>
<translation>Impossible d&apos;écrire dans le répertoire</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
@ -126,27 +130,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="287"/>
<source>About %1</source>
<translation>À propos de %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="289"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Programme pour installer, télécharger et gérer les profils de Ryzom.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="291"/>
<source>Author: %1</source>
<translation>Auteur : %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="275"/>
<location filename="../src/mainwindow.cpp" line="292"/>
<source>Copyright: %1</source>
<translation>Copyright : %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="276"/>
<location filename="../src/mainwindow.cpp" line="293"/>
<source>Support: %1</source>
<translation>Assistance : %1</translation>
</message>
@ -154,42 +158,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="94"/>
<location filename="../src/migratedialog.cpp" line="72"/>
<source>Files will be installed to (requires %1):</source>
<translation>Les fichiers seront installés dans (%1 nécessaires) :</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="131"/>
<location filename="../src/migratedialog.cpp" line="109"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Veuillez choisir le répertoire installer Ryzom</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>Not enough free disk space</source>
<translation>Espace disque insuffisant</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Vous ne disposez pas assez d&apos;espace libre sur ce disque, veuillez en libérer ou choisir un répertoire sur un autre disque.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>Unable to write in directory</source>
<translation>Impossible d&apos;écrire dans le répertoire</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans ce répertoire avec votre compte utilisateur courant, veuillez en choisir un autre.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>Directory not empty</source>
<translation>Répertoire non vide</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Ce répertoire n&apos;est pas vide, veuillez en choisir un autre.</translation>
</message>
@ -205,109 +209,109 @@
<translation type="vanished">Mettre à jour les profils</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="275"/>
<location filename="../src/operationdialog.cpp" line="276"/>
<source>Updating profiles...</source>
<translation>Mise à jour des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Confirmation</source>
<translation>Confirmation</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>Attention, ce serveur ne supporte pas la reprise de téléchargement ! Si vous arrêtez le téléchargement maintenant, vous ne pourrez pas le poursuivre ultérieurement.
Êtes-vous sûr d&apos;interrompre le téléchargement ?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="453"/>
<location filename="../src/operationdialog.cpp" line="454"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Kio)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="513"/>
<location filename="../src/operationdialog.cpp" line="514"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="534"/>
<location filename="../src/operationdialog.cpp" line="535"/>
<source>Downloading data required by server %1...</source>
<translation>Téléchargement des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="545"/>
<location filename="../src/operationdialog.cpp" line="546"/>
<source>Extracting data required by server %1...</source>
<translation>Extraction des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="569"/>
<location filename="../src/operationdialog.cpp" line="570"/>
<source>Downloading client required by server %1...</source>
<translation>Téléchargement du client nécessaire pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="580"/>
<location filename="../src/operationdialog.cpp" line="581"/>
<source>Extracting client required by server %1...</source>
<translation>Extraction du client nécessaire pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="602"/>
<location filename="../src/operationdialog.cpp" line="603"/>
<source>Copying data required by server %1...</source>
<translation>Copie des données nécessaires pour le serveur %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="631"/>
<location filename="../src/operationdialog.cpp" line="632"/>
<source>Copying old profile to new location...</source>
<translation>Copie de l&apos;ancien profil vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="661"/>
<location filename="../src/operationdialog.cpp" line="662"/>
<source>Extracting client to new location...</source>
<translation>Extraction du client vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="726"/>
<location filename="../src/operationdialog.cpp" line="727"/>
<source>Copying installer to new location...</source>
<translation>Copie de l&apos;installateur vers un nouvel emplacement...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="847"/>
<location filename="../src/operationdialog.cpp" line="855"/>
<source>Cleaning obsolete files...</source>
<translation>Nettoyage des fichiers obsolètes...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="862"/>
<location filename="../src/operationdialog.cpp" line="870"/>
<source>Creating default profile...</source>
<translation>Création du profil par défaut...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="921"/>
<location filename="../src/operationdialog.cpp" line="929"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Création des raccourcis pour le profil %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1007"/>
<location filename="../src/operationdialog.cpp" line="1015"/>
<source>Deleting client...</source>
<translation>Suppression du client...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1067"/>
<location filename="../src/operationdialog.cpp" line="1075"/>
<source>Adding profiles...</source>
<translation>Ajout des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1087"/>
<location filename="../src/operationdialog.cpp" line="1095"/>
<source>Deleting profiles...</source>
<translation>Suppression des profils...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1140"/>
<location filename="../src/operationdialog.cpp" line="1148"/>
<source>Deleting installer...</source>
<translation>Suppression de l&apos;installateur...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1192"/>
<location filename="../src/operationdialog.cpp" line="1200"/>
<source>Deleting downloaded files...</source>
<translation>Suppression des fichiers téléchargés...</translation>
</message>
@ -356,12 +360,12 @@ Are you sure to abort download?</source>
<translation type="vanished">Copier l&apos;installateur vers un nouvel emplacement</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>Uninstall old client</source>
<translation>Désinstaller l&apos;ancien client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>Une ancienne version de Ryzom a é détectée sur ce système, souhaitez-vous la désinstaller afin de libérer de l&apos;espace disque ?</translation>
</message>
@ -386,7 +390,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Supprimer les fichiers du client</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1037"/>
<location filename="../src/operationdialog.cpp" line="1045"/>
<source>Unable to delete files for client %1</source>
<translation>Impossible de supprimer les fichiers du client %1</translation>
</message>
@ -407,7 +411,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Suppression du profil %1 en cours...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1116"/>
<location filename="../src/operationdialog.cpp" line="1124"/>
<source>Unable to delete files for profile %1</source>
<translation>Impossible de supprimer les fichiers du profil %1</translation>
</message>
@ -440,17 +444,17 @@ Are you sure to delete this profile?</source>
Êtes-vous sûr de supprimer ce profil ?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="277"/>
<location filename="../src/profilesdialog.cpp" line="278"/>
<source>Executables (*)</source>
<translation>Exécutables (*)</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<location filename="../src/profilesdialog.cpp" line="284"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Veuillez choisir l&apos;exécutable du client de Ryzom à lancer</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="275"/>
<location filename="../src/profilesdialog.cpp" line="276"/>
<source>Executables (*.exe)</source>
<translation>Exécutables (*.exe)</translation>
</message>
@ -764,7 +768,7 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation>Supprimer</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="72"/>
<location filename="../ui/profilesdialog.ui" line="75"/>
<source>Profile:</source>
<translation>Profil :</translation>
</message>
@ -773,27 +777,27 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
<location filename="../ui/profilesdialog.ui" line="89"/>
<source>Name:</source>
<translation>Nom :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="96"/>
<location filename="../ui/profilesdialog.ui" line="99"/>
<source>Server:</source>
<translation>Serveur :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="107"/>
<location filename="../ui/profilesdialog.ui" line="110"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="112"/>
<location filename="../ui/profilesdialog.ui" line="115"/>
<source>Yubo</source>
<translation>Yubo</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="120"/>
<location filename="../ui/profilesdialog.ui" line="123"/>
<source>Executable:</source>
<translation>Exécutable :</translation>
</message>
@ -802,27 +806,27 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="136"/>
<location filename="../ui/profilesdialog.ui" line="139"/>
<source>Default</source>
<translation>Défaut</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="143"/>
<location filename="../ui/profilesdialog.ui" line="146"/>
<source>Browse...</source>
<translation>Parcourir...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="152"/>
<location filename="../ui/profilesdialog.ui" line="155"/>
<source>Arguments:</source>
<translation>Arguments :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="162"/>
<location filename="../ui/profilesdialog.ui" line="165"/>
<source>Comments:</source>
<translation>Commentaires :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="179"/>
<location filename="../ui/profilesdialog.ui" line="182"/>
<source>Directory:</source>
<translation>Répertoire :</translation>
</message>
@ -831,22 +835,22 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="195"/>
<location filename="../ui/profilesdialog.ui" line="198"/>
<source>Open</source>
<translation>Ouvrir</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="204"/>
<location filename="../ui/profilesdialog.ui" line="207"/>
<source>Create shortcuts:</source>
<translation>Créer les raccourcis :</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="213"/>
<location filename="../ui/profilesdialog.ui" line="216"/>
<source>Desktop</source>
<translation>Bureau</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="220"/>
<location filename="../ui/profilesdialog.ui" line="223"/>
<source>Start Menu</source>
<translation>Menu Démarrer</translation>
</message>
@ -854,116 +858,123 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<context>
<name>QApplication</name>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Unable to find ryzom_installer.ini</source>
<translation>Impossible de trouver ryzom_installer.ini</translation>
</message>
<message>
<location filename="../src/main.cpp" line="119"/>
<location filename="../src/main.cpp" line="123"/>
<source>Installation and launcher tool for Ryzom</source>
<translation>Outil d&apos;installation et lanceur pour Ryzom</translation>
</message>
<message>
<location filename="../src/main.cpp" line="122"/>
<location filename="../src/main.cpp" line="126"/>
<source>Uninstall</source>
<translation>Désinstaller</translation>
</message>
<message>
<location filename="../src/main.cpp" line="125"/>
<location filename="../src/main.cpp" line="129"/>
<source>Silent mode</source>
<translation>Mode silencieux</translation>
</message>
<message>
<location filename="../src/main.cpp" line="128"/>
<location filename="../src/main.cpp" line="132"/>
<source>Version</source>
<translation>Version</translation>
</message>
<message>
<location filename="../src/main.cpp" line="131"/>
<location filename="../src/main.cpp" line="135"/>
<source>Install itself</source>
<translation>S&apos;auto-installer</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<location filename="../src/filesextractor.cpp" line="324"/>
<location filename="../src/filesextractor.cpp" line="629"/>
<source>Unable to open %1</source>
<translation>Impossible d&apos;ouvrir %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Impossible d&apos;ouvrir le fichier de sortie</translation>
<translation type="vanished">Impossible d&apos;ouvrir le fichier de sortie</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Impossible d&apos;écrire le fichier de sortie</translation>
<translation type="vanished">Impossible d&apos;écrire le fichier de sortie</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<location filename="../src/filesextractor.cpp" line="471"/>
<source>Unable to open output file %1</source>
<translation>Impossible d&apos;ouvrir le fichier de sortie %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="494"/>
<source>Unable to write output file %1 (%2 bytes written but expecting %3 bytes)</source>
<translation>Impossible d&apos;écrire dans le fichier de sortie %1 (%2 octets écrits mais %3 octets attendus)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="538"/>
<location filename="../src/filesextractor.cpp" line="546"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>Le décodeur 7zip n&apos;est pas compatible avec cette archive</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="499"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to allocate memory</source>
<translation>Impossible d&apos;allouer la mémoire</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="507"/>
<location filename="../src/filesextractor.cpp" line="550"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation>Le fichier %1 est corrompu, impossible de le décompresser</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<location filename="../src/filesextractor.cpp" line="558"/>
<source>Error %1</source>
<translation>Erreur %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="542"/>
<location filename="../src/filesextractor.cpp" line="587"/>
<source>Unable to create directory %1</source>
<translation>Impossible de créer le répertoire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="548"/>
<location filename="../src/filesextractor.cpp" line="595"/>
<source>Unable to set permissions of %1</source>
<translation>Impossible de définir les permissions de %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="663"/>
<location filename="../src/filesextractor.cpp" line="718"/>
<source>disk full</source>
<translation>disque plein</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="667"/>
<location filename="../src/filesextractor.cpp" line="724"/>
<source>unable to write %1</source>
<translation>impossible d&apos;écrire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="671"/>
<location filename="../src/filesextractor.cpp" line="730"/>
<source>unable to read %1</source>
<translation>impossible de lire %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="675"/>
<location filename="../src/filesextractor.cpp" line="736"/>
<source>failed (%1)</source>
<translation>échec (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="678"/>
<location filename="../src/filesextractor.cpp" line="739"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Impossible d&apos;extraire %1 vers %2 : %3 </translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="189"/>
<source>Unable to copy file %1</source>
<translation>Impossible de copier le fichier %1</translation>
<translation type="vanished">Impossible de copier le fichier %1</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
@ -975,6 +986,11 @@ Vous n&apos;avez qu&apos;à cliquer sur Suivant et suivre les différentes étap
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation>Le nom du profil %1 utilise un caractère invalide %2 à la position %3</translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="179"/>
<source>Unable to copy file %1 to %2</source>
<translation>Impossible de copier le fichier %1 vers %2</translation>
</message>
</context>
<context>
<name>QObject</name>

View file

@ -4,42 +4,46 @@
<context>
<name>CDownloader</name>
<message>
<location filename="../src/downloader.cpp" line="156"/>
<location filename="../src/downloader.cpp" line="158"/>
<source>File is larger (%1B) than expected (%2B)</source>
<translation>Размер файла больше (%1Б) чем ожидалось (%2Б)</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="186"/>
<location filename="../src/downloader.cpp" line="190"/>
<source>Error &apos;%1&apos; occurred when trying to check free disk space on %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="198"/>
<source>You only have %1 bytes left on the device, but %2 bytes are needed.</source>
<translation>На диске осталось всего %1 байт, в то время как требуется %2 байт.</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="192"/>
<location filename="../src/downloader.cpp" line="204"/>
<source>Unable to write file</source>
<translation>Невозможно записать файл</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="227"/>
<location filename="../src/downloader.cpp" line="239"/>
<source>Timeout</source>
<translation>Тайм-аут</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="264"/>
<location filename="../src/downloader.cpp" line="287"/>
<source>Redirection URL is not defined</source>
<translation>URL перенаправления не определен</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="329"/>
<source>File is not available, please retry later (status code: %1)</source>
<translation>Файл недоступен, пожалуйста, попробуйте позднее (код состояния: %1)</translation>
<translation type="vanished">Файл недоступен, пожалуйста, попробуйте позднее (код состояния: %1)</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="336"/>
<location filename="../src/downloader.cpp" line="357"/>
<source>Incorrect status code: %1</source>
<translation>Некорректный код состояния: %1</translation>
</message>
<message>
<location filename="../src/downloader.cpp" line="382"/>
<location filename="../src/downloader.cpp" line="411"/>
<source>HTTP error: %1</source>
<translation type="unfinished"></translation>
</message>
@ -59,7 +63,7 @@
<translation type="vanished">Интернет (%1 для загрузки)</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="80"/>
<location filename="../src/installdialog.cpp" line="81"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
@ -76,7 +80,7 @@
<translation type="vanished">Невозможно найти Ryzom в выбранной директории. Пожалуйста, выберите другую директорию или отмену.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="115"/>
<location filename="../src/installdialog.cpp" line="116"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберите директорию для установки Ryzom</translation>
</message>
@ -89,32 +93,32 @@
<translation type="vanished">Не определено</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="138"/>
<location filename="../src/installdialog.cpp" line="148"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>Unable to write in directory</source>
<translation>Невозможно осуществить запись в директорию</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="157"/>
<location filename="../src/installdialog.cpp" line="167"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию.</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>Directory not empty</source>
<translation>Директория не является пустой</translation>
</message>
<message>
<location filename="../src/installdialog.cpp" line="166"/>
<location filename="../src/installdialog.cpp" line="176"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Эта директория не является пустой, пожалуйста, выберите другую.</translation>
</message>
@ -122,27 +126,27 @@
<context>
<name>CMainWindow</name>
<message>
<location filename="../src/mainwindow.cpp" line="270"/>
<location filename="../src/mainwindow.cpp" line="287"/>
<source>About %1</source>
<translation>О %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="272"/>
<location filename="../src/mainwindow.cpp" line="289"/>
<source>Program to install, download and manage Ryzom profiles.</source>
<translation>Программа для установки, загрузки и управления профилями Ryzom.</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="274"/>
<location filename="../src/mainwindow.cpp" line="291"/>
<source>Author: %1</source>
<translation>Автор: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="275"/>
<location filename="../src/mainwindow.cpp" line="292"/>
<source>Copyright: %1</source>
<translation>Копирайт: %1</translation>
</message>
<message>
<location filename="../src/mainwindow.cpp" line="276"/>
<location filename="../src/mainwindow.cpp" line="293"/>
<source>Support: %1</source>
<translation>Поддержка: %1</translation>
</message>
@ -150,42 +154,42 @@
<context>
<name>CMigrateDialog</name>
<message>
<location filename="../src/migratedialog.cpp" line="94"/>
<location filename="../src/migratedialog.cpp" line="72"/>
<source>Files will be installed to (requires %1):</source>
<translation>Файлы будут установлены в (требуется %1):</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="131"/>
<location filename="../src/migratedialog.cpp" line="109"/>
<source>Please choose directory to install Ryzom in</source>
<translation>Пожалуйста, выберете директорию для установки Ryzom</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>Not enough free disk space</source>
<translation>Недостаточно свободного места</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="153"/>
<location filename="../src/migratedialog.cpp" line="139"/>
<source>You don&apos;t have enough free space on this disk, please make more space or choose a directory on another disk.</source>
<translation>Недостаточно свободного места на выбранном диске, пожалуйста освободите место на диске или выберите директорию на другом диске.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>Unable to write in directory</source>
<translation>Невозможно осуществить запись в директорию</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="172"/>
<location filename="../src/migratedialog.cpp" line="158"/>
<source>You don&apos;t have the permission to write in this directory with your current user account, please choose another directory.</source>
<translation>У вашего текущего пользоввателя нет права записи в эту директорию, пожалуйста, выберите другую директорию.</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>Directory not empty</source>
<translation>Директория не является пустой</translation>
</message>
<message>
<location filename="../src/migratedialog.cpp" line="181"/>
<location filename="../src/migratedialog.cpp" line="167"/>
<source>This directory is not empty, please choose another one.</source>
<translation>Эта директория не является пустой, пожалуйста, выберите другую.</translation>
</message>
@ -193,108 +197,108 @@
<context>
<name>COperationDialog</name>
<message>
<location filename="../src/operationdialog.cpp" line="275"/>
<location filename="../src/operationdialog.cpp" line="276"/>
<source>Updating profiles...</source>
<translation>Обновление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Confirmation</source>
<translation>Подтверждение</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="428"/>
<location filename="../src/operationdialog.cpp" line="429"/>
<source>Warning, this server doesn&apos;t support resume! If you stop download now, you won&apos;t be able to resume it later.
Are you sure to abort download?</source>
<translation>Внимание, данный сервер не поддерживает возобновление загрузки! Если вы сейчас прервете загрузку, вы не сможете возобновить ее позднее. Вы уверены, что хотите прервать загрузку?</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="453"/>
<location filename="../src/operationdialog.cpp" line="454"/>
<source>%p% (%v/%m KiB)</source>
<translation>%p% (%v/%m Кб)</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="513"/>
<location filename="../src/operationdialog.cpp" line="514"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="534"/>
<location filename="../src/operationdialog.cpp" line="535"/>
<source>Downloading data required by server %1...</source>
<translation>Загрузка данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="545"/>
<location filename="../src/operationdialog.cpp" line="546"/>
<source>Extracting data required by server %1...</source>
<translation>Извлечение данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="569"/>
<location filename="../src/operationdialog.cpp" line="570"/>
<source>Downloading client required by server %1...</source>
<translation>Загрузка клиента, необходимого серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="580"/>
<location filename="../src/operationdialog.cpp" line="581"/>
<source>Extracting client required by server %1...</source>
<translation>Извлечение файлов клиента, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="602"/>
<location filename="../src/operationdialog.cpp" line="603"/>
<source>Copying data required by server %1...</source>
<translation>Копирование данных, необходимых серверу %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="631"/>
<location filename="../src/operationdialog.cpp" line="632"/>
<source>Copying old profile to new location...</source>
<translation>Копирование предыдущего профиля в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="661"/>
<location filename="../src/operationdialog.cpp" line="662"/>
<source>Extracting client to new location...</source>
<translation>Извлечение файлов клиента в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="726"/>
<location filename="../src/operationdialog.cpp" line="727"/>
<source>Copying installer to new location...</source>
<translation>Копирование инсталлятора в новое местоположение...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="847"/>
<location filename="../src/operationdialog.cpp" line="855"/>
<source>Cleaning obsolete files...</source>
<translation>Удаление устаревших файлов...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="862"/>
<location filename="../src/operationdialog.cpp" line="870"/>
<source>Creating default profile...</source>
<translation>Создание профиля по умолчанию...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="921"/>
<location filename="../src/operationdialog.cpp" line="929"/>
<source>Creating shortcuts for profile %1...</source>
<translation>Создание ярлыков для профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1007"/>
<location filename="../src/operationdialog.cpp" line="1015"/>
<source>Deleting client...</source>
<translation>Удаление клиента...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1067"/>
<location filename="../src/operationdialog.cpp" line="1075"/>
<source>Adding profiles...</source>
<translation>Добавление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1087"/>
<location filename="../src/operationdialog.cpp" line="1095"/>
<source>Deleting profiles...</source>
<translation>Удаление профилей...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1140"/>
<location filename="../src/operationdialog.cpp" line="1148"/>
<source>Deleting installer...</source>
<translation>Удаление инсталлятора...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1192"/>
<location filename="../src/operationdialog.cpp" line="1200"/>
<source>Deleting downloaded files...</source>
<translation>Удаление загруженных файлов...</translation>
</message>
@ -331,12 +335,12 @@ Are you sure to abort download?</source>
<translation type="vanished">Копирование %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>Uninstall old client</source>
<translation>Удалить предыдущую версию клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="812"/>
<location filename="../src/operationdialog.cpp" line="820"/>
<source>An old version of Ryzom has been detected on this system, would you like to uninstall it to save space disk?</source>
<translation>В системе обнаружена предыдущая версия Ryzom, вы хотите удалить ее чтобы освободить место на диске?</translation>
</message>
@ -357,7 +361,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удалить файлы клиента</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1037"/>
<location filename="../src/operationdialog.cpp" line="1045"/>
<source>Unable to delete files for client %1</source>
<translation>Невозможно удалить файлы клиента %1</translation>
</message>
@ -378,7 +382,7 @@ Are you sure to abort download?</source>
<translation type="vanished">Удаление профиля %1...</translation>
</message>
<message>
<location filename="../src/operationdialog.cpp" line="1116"/>
<location filename="../src/operationdialog.cpp" line="1124"/>
<source>Unable to delete files for profile %1</source>
<translation>Невозможно удалить файлы профиля %1</translation>
</message>
@ -410,17 +414,17 @@ Are you sure to delete this profile?</source>
<translation>Вы собираетесь удалить профиль, файлы профиля не будут удалены автоматически и их необходимо удалить вручную. Вы уверены, что хотите удалить этот профиль?</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="277"/>
<location filename="../src/profilesdialog.cpp" line="278"/>
<source>Executables (*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="283"/>
<location filename="../src/profilesdialog.cpp" line="284"/>
<source>Please choose Ryzom client executable to launch</source>
<translation>Пожалуйста, выберете исполняемый файл для запуска клиента Ryzom</translation>
</message>
<message>
<location filename="../src/profilesdialog.cpp" line="275"/>
<location filename="../src/profilesdialog.cpp" line="276"/>
<source>Executables (*.exe)</source>
<translation>Исполняемые файлы (*.exe)</translation>
</message>
@ -730,7 +734,7 @@ Just press Continue button and follow the different steps until everything is do
<translation>Удалить</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="72"/>
<location filename="../ui/profilesdialog.ui" line="75"/>
<source>Profile:</source>
<translation>Профиль:</translation>
</message>
@ -739,27 +743,27 @@ Just press Continue button and follow the different steps until everything is do
<translation type="vanished">0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="86"/>
<location filename="../ui/profilesdialog.ui" line="89"/>
<source>Name:</source>
<translation>Имя:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="96"/>
<location filename="../ui/profilesdialog.ui" line="99"/>
<source>Server:</source>
<translation>Сервер:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="107"/>
<location filename="../ui/profilesdialog.ui" line="110"/>
<source>Atys</source>
<translation>Atys</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="112"/>
<location filename="../ui/profilesdialog.ui" line="115"/>
<source>Yubo</source>
<translation></translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="120"/>
<location filename="../ui/profilesdialog.ui" line="123"/>
<source>Executable:</source>
<translation>Исполняемый файл:</translation>
</message>
@ -768,27 +772,27 @@ Just press Continue button and follow the different steps until everything is do
<translation type="vanished">ryzom_client_r.exe</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="136"/>
<location filename="../ui/profilesdialog.ui" line="139"/>
<source>Default</source>
<translation>По умолчанию</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="143"/>
<location filename="../ui/profilesdialog.ui" line="146"/>
<source>Browse...</source>
<translation>Открыть...</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="152"/>
<location filename="../ui/profilesdialog.ui" line="155"/>
<source>Arguments:</source>
<translation>Аргументы:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="162"/>
<location filename="../ui/profilesdialog.ui" line="165"/>
<source>Comments:</source>
<translation>Комментарии:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="179"/>
<location filename="../ui/profilesdialog.ui" line="182"/>
<source>Directory:</source>
<translation>Директория:</translation>
</message>
@ -797,22 +801,22 @@ Just press Continue button and follow the different steps until everything is do
<translation type="vanished">~/.ryzom/0</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="195"/>
<location filename="../ui/profilesdialog.ui" line="198"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="204"/>
<location filename="../ui/profilesdialog.ui" line="207"/>
<source>Create shortcuts:</source>
<translation>Создать ярлыки:</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="213"/>
<location filename="../ui/profilesdialog.ui" line="216"/>
<source>Desktop</source>
<translation>Рабочий стол</translation>
</message>
<message>
<location filename="../ui/profilesdialog.ui" line="220"/>
<location filename="../ui/profilesdialog.ui" line="223"/>
<source>Start Menu</source>
<translation>меню Пуск</translation>
</message>
@ -820,116 +824,123 @@ Just press Continue button and follow the different steps until everything is do
<context>
<name>QApplication</name>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<location filename="../src/main.cpp" line="151"/>
<location filename="../src/main.cpp" line="163"/>
<source>Unable to find ryzom_installer.ini</source>
<translation>Невозможно найти ryzom_installer.ini</translation>
</message>
<message>
<location filename="../src/main.cpp" line="119"/>
<location filename="../src/main.cpp" line="123"/>
<source>Installation and launcher tool for Ryzom</source>
<translation>Программа установки и запуска Ryzom</translation>
</message>
<message>
<location filename="../src/main.cpp" line="122"/>
<location filename="../src/main.cpp" line="126"/>
<source>Uninstall</source>
<translation>Удалить</translation>
</message>
<message>
<location filename="../src/main.cpp" line="125"/>
<location filename="../src/main.cpp" line="129"/>
<source>Silent mode</source>
<translation>Фоновый режим (silent mode)</translation>
</message>
<message>
<location filename="../src/main.cpp" line="128"/>
<location filename="../src/main.cpp" line="132"/>
<source>Version</source>
<translation>Версия</translation>
</message>
<message>
<location filename="../src/main.cpp" line="131"/>
<location filename="../src/main.cpp" line="135"/>
<source>Install itself</source>
<translation>Установится</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="322"/>
<location filename="../src/filesextractor.cpp" line="580"/>
<location filename="../src/filesextractor.cpp" line="324"/>
<location filename="../src/filesextractor.cpp" line="629"/>
<source>Unable to open %1</source>
<translation>Невозможно открыть %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="437"/>
<source>Unable to open output file</source>
<translation>Невозможно открыть выходной файл</translation>
<translation type="vanished">Невозможно открыть выходной файл</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="446"/>
<source>Unable to write output file</source>
<translation>Невозможно записать выходной файл</translation>
<translation type="vanished">Невозможно записать выходной файл</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="495"/>
<location filename="../src/filesextractor.cpp" line="503"/>
<location filename="../src/filesextractor.cpp" line="471"/>
<source>Unable to open output file %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="494"/>
<source>Unable to write output file %1 (%2 bytes written but expecting %3 bytes)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="538"/>
<location filename="../src/filesextractor.cpp" line="546"/>
<source>7zip decoder doesn&apos;t support this archive</source>
<translation>Архиватор 7zip не поддерживает данный тип архива</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="499"/>
<location filename="../src/filesextractor.cpp" line="542"/>
<source>Unable to allocate memory</source>
<translation>Невозможно выделить память</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="507"/>
<location filename="../src/filesextractor.cpp" line="550"/>
<source>File %1 is corrupted, unable to uncompress it</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="515"/>
<location filename="../src/filesextractor.cpp" line="558"/>
<source>Error %1</source>
<translation>Ошибка %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="542"/>
<location filename="../src/filesextractor.cpp" line="587"/>
<source>Unable to create directory %1</source>
<translation>Невозможно создать директорию %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="548"/>
<location filename="../src/filesextractor.cpp" line="595"/>
<source>Unable to set permissions of %1</source>
<translation>Невозможно назначить права объекта %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="663"/>
<location filename="../src/filesextractor.cpp" line="718"/>
<source>disk full</source>
<translation>диск переполнен</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="667"/>
<location filename="../src/filesextractor.cpp" line="724"/>
<source>unable to write %1</source>
<translation>невозможно записать %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="671"/>
<location filename="../src/filesextractor.cpp" line="730"/>
<source>unable to read %1</source>
<translation>невозможно прочитать %1</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="675"/>
<location filename="../src/filesextractor.cpp" line="736"/>
<source>failed (%1)</source>
<translation>неуспешно (%1)</translation>
</message>
<message>
<location filename="../src/filesextractor.cpp" line="678"/>
<location filename="../src/filesextractor.cpp" line="739"/>
<source>Unable to unpack %1 to %2: %3</source>
<translation>Невозможно разархивировать %1 в %2: %3</translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="189"/>
<source>Unable to copy file %1</source>
<translation>Невозможно скопировать файл %1</translation>
<translation type="vanished">Невозможно скопировать файл %1</translation>
</message>
<message>
<location filename="../src/profile.cpp" line="58"/>
@ -941,6 +952,11 @@ Just press Continue button and follow the different steps until everything is do
<source>Profile name %1 is using invalid character %2 at position %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/filescopier.cpp" line="179"/>
<source>Unable to copy file %1 to %2</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

View file

@ -154,13 +154,13 @@ void CGraphPlugin::refreshPrimitives()
// ok, we find a good node
try
{
IPrimitive *rootNode = missionTreeRoot;
while (rootNode->getParent())
rootNode = rootNode->getParent();
string fileName = _PluginAccess->getRootFileName(rootNode);
CMissionCompiler mc;
mc.compileMission(missionTreeRoot, NLMISC::CFile::getFilename(fileName));
TMissionDataPtr md = mc.getMission(0);
@ -189,7 +189,7 @@ void CGraphPlugin::refreshPrimitives()
AfxMessageBox(_T("BEWARE: the image couldn't be loaded."));
}
while (missionTreeRoot->getParent()!=NULL)
while (missionTreeRoot->getParent()!=NULL)
{
missionTreeRoot=missionTreeRoot->getParent();
}
@ -201,10 +201,10 @@ void CGraphPlugin::refreshPrimitives()
if (e.Primitive != NULL)
{
string primName;
vectSel.push_back(e.Primitive);
e.Primitive->getPropertyByName("name", primName);
err = toString("%s : %s", primName.c_str(), e.Why.c_str());
}
AfxMessageBox(utf8ToTStr(err));
@ -216,7 +216,7 @@ void CGraphPlugin::refreshPrimitives()
}
else
{
refreshMachine();
refreshMachine();
}
if(vectSel.size()>0)
@ -244,8 +244,8 @@ void CGraphPlugin::refreshMachine()
if ((predFolder(missionTreeRoot))||
((missionTreeRoot=getPrimitiveParent((*first),predFolder))!=NULL))
{
string dot = generateDotScript(missionTreeRoot);
string tmpPath = string(::getenv("TEMP"));
@ -270,17 +270,17 @@ void CGraphPlugin::refreshMachine()
if(!createBitmap(tmpPath))
AfxMessageBox(_T("BEWARE: the image couldn't be loaded."));
}
while (missionTreeRoot->getParent()!=NULL)
while (missionTreeRoot->getParent()!=NULL)
{
missionTreeRoot=missionTreeRoot->getParent();
}
_rootFileName=_PluginAccess->getRootFileName(missionTreeRoot);
}
else
else
{
list<IPrimitive*>::const_iterator first(selection.begin()), last(selection.end()),curIte;
IPrimitive* missionTreeRoot=(*first);
@ -288,8 +288,8 @@ void CGraphPlugin::refreshMachine()
if ((predManager(missionTreeRoot))||
((missionTreeRoot=getPrimitiveParent((*first),predManager))!=NULL))
{
string dot = generateDotScript(missionTreeRoot);
string tmpPath = string(::getenv("TEMP"));
@ -315,7 +315,7 @@ void CGraphPlugin::refreshMachine()
AfxMessageBox(_T("BEWARE: the image couldn't be loaded."));
}
while (missionTreeRoot->getParent()!=NULL)
while (missionTreeRoot->getParent()!=NULL)
{
missionTreeRoot=missionTreeRoot->getParent();
}
@ -327,10 +327,10 @@ void CGraphPlugin::refreshMachine()
}
}
}
//////////////////////////////////////////////////////////////////////////
@ -342,7 +342,7 @@ string CGraphPlugin::spaceTo_(string strInput)
explode(strInput,string(" "),strTmp);
if (strTmp.size()>1)
{
for(uint i=0;i<strTmp.size();i++)
{
vector<string> strTmpTmp;
@ -394,10 +394,10 @@ string CGraphPlugin::createNode(IPrimitive* managerNode,string strPredicate,uin
ret += NL ;
ret += "}" ;
ret += NL;
}
numClusters+=resSet.size();
return ret;
}
@ -433,13 +433,13 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
ret += parseStateMachine(resSet[i],spaceTo_(strName),string(""),string("_")+spaceTo_(strName));
ret += "}" ;
ret += NL;
}
for (uint i=0; i<resSet.size(); ++i)
{
string strName;
resSet[i]->getPropertyByName("name",strName);
TPrimitiveClassPredicate predJump("npc_event_handler_action");
TPrimitiveSet resJump;
offsprings.buildSet(resSet[i],predJump,resJump);
@ -460,7 +460,7 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
if(primTail)
primTail->getPropertyByName("name", labelTail);
}
vector<string> *jumpDest;
resJump[j]->getPropertyByName("action",strAction);
if (strAction.compare(string("begin_state"))==0)
@ -471,7 +471,7 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
ret +=spaceTo_(jumpDest->at(0));
ret +="[label=";
ret +=spaceTo_(labelTail);
ret +="]";
ret +="]";
ret += ";" ;
ret += NL;
}
@ -479,7 +479,7 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
{
vector<string>* jumpDest;
string strTmpTmpName;
resJump[j]->getPropertyByName("parameters",jumpDest);
resJump[j]->getPropertyByName("name",strTmpTmpName);
@ -496,13 +496,13 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
ret +="_";
ret += spaceTo_(strName) ;
ret +="->";
vector<string> resJump;
explode(jumpDest->at(k)," ",resJump);
ret +=resJump[1];
ret+= ";";
ret+=NL;
}
}*/
if (strAction.compare(string("punctual_state"))==0)
@ -513,7 +513,7 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
ret +=spaceTo_(jumpDest->at(0));
ret +="[label=";
ret +=spaceTo_(labelTail);
ret +="]";
ret +="]";
ret += ";" ;
ret += NL;
ret +=spaceTo_(jumpDest->at(0));
@ -521,12 +521,12 @@ string CGraphPlugin::createParsedNode(IPrimitive* managerNode,string strPredica
ret += strName ;
ret +="[label=";
ret +=spaceTo_(labelTail);
ret +="]";
ret +="]";
ret += ";" ;
ret += NL;
}
}
}
numClusters+=resSet.size();
return ret;
@ -573,17 +573,17 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
uint numChild=currentNode->getNumChildren();
for(uint i=0;i<numChild;i++)
{
IPrimitive* child;
currentNode->getChild(child,i);
child->getPropertyByName("class",strClassName);
child->getPropertyByName("name",strName);
child->getPropertyByName("action",strAction);
if (strClassName.compare(string("npc_group"))==0)
{
child->getPropertyByName("name",strName);
ret+=spaceTo_(strName);
ret+=tag;
ret += " [URL=\""+buildPrimPath(child)+"\"];"+NL;
@ -670,7 +670,7 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
ret+=tag;
first=true;
}
}
ret+="}";
ret+='"';
@ -704,7 +704,7 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
&& (strClassName.compare("random_select_state")==0))
{
vector<string>* jumpDest;
child->getPropertyByName("parameters",jumpDest);
child->getPropertyByName("parameters",jumpDest);
for(uint k=0;k<jumpDest->size();k++)
{
ret+=spaceTo_(strName);
@ -712,10 +712,10 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
ret+="->";
ret +=spaceTo_(jumpDest->at(k));
ret+= ";";
ret+=NL;
ret+=NL;
}
}
}
ret+=NL;
}
@ -745,7 +745,7 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
vector<string>* jumpDest;
bool first=true;
child->getPropertyByName("parameters",jumpDest);
ret += spaceTo_(strName) ;
ret +="_";
ret += emiterNode;
@ -769,7 +769,7 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
ret +=resJump[1];
ret+= ";";
ret+=NL;
}
ret+=emiterNode;
ret += "->";
@ -782,11 +782,11 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
else
{
ret+=parseStateMachine(child,emiterNode,tailLabel,tag);
}
}
}
currentNode->getPropertyByName("class",strClassName);
currentNode->getPropertyByName("name",strName);
currentNode->getPropertyByName("action",strAction);
@ -816,7 +816,7 @@ string CGraphPlugin::parseStateMachine(NLLIGO::IPrimitive* currentNode,string em
ret+=NL;
}
return ret;
}
bool CGraphPlugin::createBitmap (const string &tmpPath)
@ -831,10 +831,10 @@ bool CGraphPlugin::createBitmap (const string &tmpPath)
}
WORD retour;
if(retour=bitmap.load(pngLocation))
{
if(retour=bitmap.load(pngLocation))
{
HBITMAP &_Hbmp=GraphDlg->_Hbmp;
HBITMAP &_Hdib=GraphDlg->_Hdib;
@ -842,7 +842,7 @@ bool CGraphPlugin::createBitmap (const string &tmpPath)
BITMAPINFO &_DibBitmapInfo=GraphDlg->_DibBitmapInfo;;
uint8* &_DibBits=GraphDlg->_DibBits;
_DibBitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFO);
_DibBitmapInfo.bmiHeader.biWidth = bitmap.getWidth();
_DibBitmapInfo.bmiHeader.biHeight = bitmap.getHeight();
@ -857,8 +857,8 @@ bool CGraphPlugin::createBitmap (const string &tmpPath)
// Create the bitmap
HWND desktop = ::GetDesktopWindow();
HDC dc = ::GetDC (desktop);
HDC dc = ::GetDC (desktop);
nlverify(_Hdib = CreateDIBSection(dc, &_DibBitmapInfo, DIB_RGB_COLORS,
(void**)&_DibBits, NULL, 0));
@ -920,7 +920,6 @@ void CGraphPlugin::unsetDlgGraph()
_PluginActive=false;
}
void CGraphPlugin::doSelection(const string& primPath)
{
IPrimitive *rootNode;
@ -930,7 +929,7 @@ void CGraphPlugin::doSelection(const string& primPath)
if(_PluginAccess->getCurrentSelection().size()>0)
{
try
{
rootNode=(IPrimitive*)_PluginAccess->getRootNode(_rootFileName);

View file

@ -89,8 +89,10 @@ MissionCompilerMainWindow::MissionCompilerMainWindow(QWidget *parent) :
settings->endGroup();
NLLIGO::Register();
// TODO try/catch exception. Crashes if path invalid.
try{
try
{
m_ligoConfig.readPrimitiveClass(NLMISC::CPath::lookup("world_editor_classes.xml").c_str(), false);
}
catch(const NLMISC::Exception &e)