Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/filecomp/filecomp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ CFilecompThread::Body()
wnd = dlg->Create();
if (!wnd)
{
TRACE_E("Nepodarilo se vytvorit CompareFilesDialog");
TRACE_E("Failed to create CompareFilesDialog");
goto LBODYFINAL;
}
SetForegroundWindow(wnd);
Expand Down Expand Up @@ -726,7 +726,7 @@ CFilecompThread::Body()
win);
if (!wnd)
{
TRACE_E("Nepodarilo se vytvorit MainWindow, GetLastError() = " << GetLastError());
TRACE_E("Failed to create MainWindow, GetLastError() = " << GetLastError());
break;
}
dialogBox = FALSE;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/ftp/dialogs2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -778,13 +778,13 @@ void CSetWaitCursorWindow::AttachToWindow(HWND hWnd)
DefWndProc = (WNDPROC)GetWindowLongPtr(hWnd, GWLP_WNDPROC);
if (DefWndProc == NULL)
{
TRACE_E("Spatny handle okna. hWnd = " << hWnd);
TRACE_E("Invalid window handle. hWnd = " << hWnd);
DefWndProc = DefWindowProc;
return;
}
if (!SetProp(hWnd, (LPCTSTR)AtomObject2, (HANDLE)this))
{
TRACE_E("Chyba pri pripojovani objektu na okno.");
TRACE_E("Error attaching object to window.");
DefWndProc = DefWindowProc;
return;
}
Expand All @@ -793,7 +793,7 @@ void CSetWaitCursorWindow::AttachToWindow(HWND hWnd)

if (DefWndProc == CSetWaitCursorWindow::CWindowProc) // that would be recursion
{
TRACE_E("Tak tohle by se vubec nemelo stat.");
TRACE_E("This should never happen.");
DefWndProc = DefWindowProc;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/ftp/fs1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ BOOL InitFS()
WorkerMayBeClosedEvent = HANDLES(CreateEvent(NULL, TRUE, FALSE, NULL)); // manual, nonsignaled
if (WorkerMayBeClosedEvent == NULL)
{
TRACE_E("Nepodarilo se vytvorit event WorkerMayBeClosedEvent.");
TRACE_E("Failed to create event WorkerMayBeClosedEvent.");
return FALSE;
}
HANDLES(InitializeCriticalSection(&WorkerMayBeClosedStateCS));
Expand Down Expand Up @@ -115,7 +115,7 @@ BOOL InitFS()
SAVEBITS_CLASSNAME,
NULL))
{
TRACE_E("Nepodarilo se registrovat tridu SAVEBITS_CLASSNAME.");
TRACE_E("Failed to register class SAVEBITS_CLASSNAME.");
return FALSE;
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/pictview/pictview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1911,7 +1911,7 @@ BOOL CPluginInterfaceForViewer::ViewFile(LPCTSTR name, int left, int top, int wi
HANDLE contEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
if (contEvent == NULL)
{
TRACE_E("Nepodarilo se vytvorit Continue event.");
TRACE_E("Failed to create Continue event.");
return FALSE;
}

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/pictview/render1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2870,11 +2870,11 @@ BOOL CRendererWindow::RenameFileInternal(LPCTSTR oldPath, LPCTSTR oldName, TCHAR
else
{
if (in == INVALID_HANDLE_VALUE)
TRACE_E("Nepodarilo se otevrit soubor " << path);
TRACE_E("Failed to open file " << path);
else
CloseHandle(in);
if (out == INVALID_HANDLE_VALUE)
TRACE_E("Nepodarilo se otevrit soubor " << tgtPath);
TRACE_E("Failed to open file " << tgtPath);
else
CloseHandle(out);
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/zip/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ int CZipCommon::CheckForExtraBytes()
{
if (Extract && expectedEndOfCentrDir > CentrDirOffs)
{
TRACE_W("spatna velikost centralniho adresare, kompenzuji chybu");
TRACE_W("bad central directory size, compensating for the error");
CentrDirSize = expectedEndOfCentrDir - CentrDirOffs;
return 0;
}
Expand Down Expand Up @@ -1355,10 +1355,10 @@ void CZipCommon::ProcessHeader(CFileHeader* fileHeader, CFileInfo* fileInfo)
fileInfo->StartDisk = NEXT(DWORD);
}
else
TRACE_E("zip64 extra-field je prilis maly, poskozeny zip?");
TRACE_E("Zip64 extra field is too small, corrupted ZIP?");
}
else
TRACE_E("nenasli jsme zip64 extra-field, poskozeny zip?");
TRACE_E("Zip64 extra field not found, corrupted ZIP?");
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/plugins/zip/dialogs2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,13 @@ BOOL CAdvancedSEDialog::OnInit(WPARAM wParam, LPARAM lParam)
CurrentSfxLang = (CSfxLang*)SendDlgItemMessage(Dlg, IDC_LANGUAGE, CB_GETITEMDATA, i, 0);
if ((LRESULT)CurrentSfxLang == CB_ERR)
{
TRACE_E("nepodarilo se ziskat aktualni jazyk z comboboxu");
TRACE_E("Failed to get current language from combo box");
CurrentSfxLang = NULL;
}
}
else
{
TRACE_E("nepodarilo se ziskat aktualni jazyk z comboboxu");
TRACE_E("Failed to get current language from combo box");
CurrentSfxLang = NULL;
}

Expand Down Expand Up @@ -487,10 +487,10 @@ BOOL CAdvancedSEDialog::OnTexts(WORD wNotifyCode, WORD wID, HWND hwndCtl)
dlg.Proceed();
}
else
TRACE_E("nepodarilo se ziskat aktualni jazyk z comboboxu");
TRACE_E("Failed to get current language from combo box");
}
else
TRACE_E("nepodarilo se ziskat aktualni jazyk z comboboxu");
TRACE_E("Failed to get current language from combo box");

return TRUE;
}
Expand Down Expand Up @@ -922,7 +922,7 @@ BOOL CAdvancedSEDialog::CreateFavoritesMenu()
FavoritiesMenu = CreatePopupMenu();
if (!FavoritiesMenu)
{
TRACE_E("Nedostali jsme FavoritiesMenu ve funkci InitMenu.");
TRACE_E("Failed to create FavoritiesMenu in InitMenu.");
return FALSE;
}
if (Favorities.Count == 0)
Expand Down Expand Up @@ -1048,7 +1048,7 @@ BOOL CAdvancedSEDialog::OnImport()
lstrcpy(settings.SfxFile, DefLanguage->FileName);
else
{
TRACE_E("CAdvancedSEDialog::OnImport(), neni naloadena DefLanguage");
TRACE_E("CAdvancedSEDialog::OnImport(), DefLanguage is not loaded");
settings.SfxFile[0] = 0;
}

Expand Down Expand Up @@ -1350,7 +1350,7 @@ BOOL CAdvancedSEDialog::OnResetValues()
if (!DefLanguage)
{
//MessageBox(Dlg, LoadStr(IDS_NODEFSFX), LoadStr(IDS_ERROR), MB_OK | MB_ICONEXCLAMATION);
TRACE_E("Neni naloudena DefLanguage pro sfx advanced dialog a je volano reset values.");
TRACE_E("DefLanguage is not loaded for the SFX advanced dialog, and reset values was called.");
}
else
{
Expand Down Expand Up @@ -1577,7 +1577,7 @@ BOOL CAdvancedSEDialog::OnFavoriteOption(WORD itemID)
mi.fMask = MIIM_DATA;
if (!GetMenuItemInfo(FavoritiesMenu, itemID, FALSE, &mi))
{
TRACE_E("Nejde ziskat item data vubrane polozky z menu favorities.");
TRACE_E("Failed to get item data for the selected Favorities menu item.");
return TRUE;
}
CFavoriteSfx* fav = (CFavoriteSfx*)mi.dwItemData;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/zip/extract.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ void Refill(CDecompressionObject* decompress)

if (CZIPUNPACK(decompress)->BytesLeft == 0)
{
TRACE_E("Pozadavek na doplneni vstupniho bufferu za hranici zkomprimovanych dat");
TRACE_E("Request to refill the input buffer beyond the compressed data boundary");
decompress->Input->Error = IDS_EOF;
return;
}
Expand Down Expand Up @@ -1317,7 +1317,7 @@ int CZipUnpack::ExtractSingleFile(char* targetDir, int targetDirLen,
{
if (aesExtraField.VendorID != AES_NONVENDOR_ID ||
((AES_VERSION_1 != aesExtraField.Version) && (AES_VERSION_2 != aesExtraField.Version)))
TRACE_E("POZOR: soubor '" << FileNameDisp << "' je zakryptovan neznamou verzi AES, mozne komplikace");
TRACE_E("WARNING: file '" << FileNameDisp << "' is encrypted with an unknown AES version, possible complications");

char pwd[MAX_PASSWORD];
unsigned char salt[SAL_AES_MAX_SALT_LENGTH];
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/zip/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ void CPluginInterface::SaveConfiguration(HWND parent, HKEY regKey, CSalamanderRe
{
siz = PackSfxSettings(&LastUsedSfxSet.Settings, buffer, allocated);
if (siz == -1)
TRACE_E("chyba v PackSfxSettings.");
TRACE_E("Error in PackSfxSettings.");
else
{
if (registry->SetValue(regKey, CONFIG_SFXLAST, REG_BINARY, buffer, siz))
Expand All @@ -467,7 +467,7 @@ void CPluginInterface::SaveConfiguration(HWND parent, HKEY regKey, CSalamanderRe
siz = PackSfxSettings(&fav->Settings, buffer, allocated);
if (siz == -1)
{
TRACE_E("chyba v PackSfxSettings.");
TRACE_E("Error in PackSfxSettings.");
break;
}
sprintf(key, CONFIG_SFXFAVDATA, i + 1);
Expand Down
34 changes: 17 additions & 17 deletions src/translator/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ BOOL CreateKey(HKEY hKey, const char* name, HKEY& createdKey)
else
{
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri ukladani klice", MB_OK | MB_ICONEXCLAMATION);
"Error saving key", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -107,7 +107,7 @@ BOOL SetValue(HKEY hKey, const char* name, DWORD type,
else
{
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri ukladani klice", MB_OK | MB_ICONEXCLAMATION);
"Error saving key", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -127,7 +127,7 @@ BOOL SetValueW(HKEY hKey, const char* name, DWORD type,
else
{
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri ukladani klice", MB_OK | MB_ICONEXCLAMATION);
"Error saving key", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -143,7 +143,7 @@ BOOL OpenKey(HKEY hKey, const char* name, HKEY& openedKey)
{
if (res != ERROR_FILE_NOT_FOUND)
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -159,15 +159,15 @@ BOOL GetValue(HKEY hKey, const char* name, DWORD type, void* buffer, DWORD buffe
return TRUE;
else
{
MessageBox(FrameWindow.HWindow, "Neocekavany typ hodnoty",
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
MessageBox(FrameWindow.HWindow, "Unexpected value type",
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
else
{
if (res != ERROR_FILE_NOT_FOUND)
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -185,15 +185,15 @@ BOOL GetValueW(HKEY hKey, const char* name, DWORD type, void* buffer, DWORD buff
return TRUE;
else
{
MessageBox(FrameWindow.HWindow, "Neocekavany typ hodnoty",
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
MessageBox(FrameWindow.HWindow, "Unexpected value type",
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
else
{
if (res != ERROR_FILE_NOT_FOUND)
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -209,15 +209,15 @@ BOOL GetSize(HKEY hKey, const char* name, DWORD type, DWORD& bufferSize)
return TRUE;
else
{
MessageBox(FrameWindow.HWindow, "Neocekavany typ hodnoty",
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
MessageBox(FrameWindow.HWindow, "Unexpected value type",
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
else
{
if (res != ERROR_FILE_NOT_FOUND)
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand All @@ -235,15 +235,15 @@ BOOL GetSizeW(HKEY hKey, const char* name, DWORD type, DWORD& bufferSize)
return TRUE;
else
{
MessageBox(FrameWindow.HWindow, "Neocekavany typ hodnoty",
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
MessageBox(FrameWindow.HWindow, "Unexpected value type",
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
else
{
if (res != ERROR_FILE_NOT_FOUND)
MessageBox(FrameWindow.HWindow, GetErrorText(res),
"Chyba pri nacitani konfigurace", MB_OK | MB_ICONEXCLAMATION);
"Error loading configuration", MB_OK | MB_ICONEXCLAMATION);
return FALSE;
}
}
Expand Down Expand Up @@ -271,7 +271,7 @@ BOOL ClearKey(HKEY key)
while (RegEnumValue(key, 0, name, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
if (RegDeleteValue(key, name) != ERROR_SUCCESS)
{
TRACE_E("Nepodarilo se smazat hodnoty klice z registry.");
TRACE_E("Failed to delete key values from the registry.");
break;
}
else
Expand Down
12 changes: 6 additions & 6 deletions src/zip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ int CSalamanderGeneral::DialogError(HWND parent, DWORD flags, const char* fileNa
{
if (fileName == NULL || error == NULL)
{
TRACE_E("Invalid parametr (fileName == NULL || error == NULL) in CSalamanderGeneral::DialogError!");
TRACE_E("Invalid parameter (fileName == NULL || error == NULL) in CSalamanderGeneral::DialogError!");
if (fileName == NULL)
fileName = "";
if (error == NULL)
Expand Down Expand Up @@ -665,7 +665,7 @@ int CSalamanderGeneral::DialogOverwrite(HWND parent, DWORD flags, const char* fi
{
if (fileName1 == NULL || fileData1 == NULL || fileName2 == NULL || fileData2 == NULL)
{
TRACE_E("Invalid parametr (fileName1 == NULL || fileData1 == NULL || fileName2 == NULL || fileData2 == NULL) in CSalamanderGeneral::DialogOverwrite!");
TRACE_E("Invalid parameter (fileName1 == NULL || fileData1 == NULL || fileName2 == NULL || fileData2 == NULL) in CSalamanderGeneral::DialogOverwrite!");
if (fileName1 == NULL)
fileName1 = "";
if (fileData1 == NULL)
Expand Down Expand Up @@ -741,7 +741,7 @@ int CSalamanderGeneral::DialogQuestion(HWND parent, DWORD flags, const char* fil
{
if (fileName == NULL || question == NULL)
{
TRACE_E("Invalid parametr (fileName == NULL || question == NULL) in CSalamanderGeneral::DialogQuestion!");
TRACE_E("Invalid parameter (fileName == NULL || question == NULL) in CSalamanderGeneral::DialogQuestion!");
if (fileName == NULL)
fileName = "";
if (question == NULL)
Expand Down Expand Up @@ -3226,7 +3226,7 @@ void CSalamanderGeneral::RemoveOneFileFromCache(const char* uniqueFileName)
CALL_STACK_MESSAGE2("CSalamanderGeneral::RemoveOneFileFromCache(%s)", uniqueFileName);
if (uniqueFileName == NULL)
{
TRACE_E("Invalid parametr (NULL) in CSalamanderGeneral::RemoveOneFileFromCache!");
TRACE_E("Invalid parameter (NULL) in CSalamanderGeneral::RemoveOneFileFromCache!");
return;
}
DiskCache.FlushOneFile(uniqueFileName);
Expand All @@ -3237,7 +3237,7 @@ void CSalamanderGeneral::RemoveFilesFromCache(const char* fileNamesRoot)
CALL_STACK_MESSAGE2("CSalamanderGeneral::RemoveFilesFromCache(%s)", fileNamesRoot);
if (fileNamesRoot == NULL)
{
TRACE_E("Invalid parametr (NULL) in CSalamanderGeneral::RemoveFilesFromCache!");
TRACE_E("Invalid parameter (NULL) in CSalamanderGeneral::RemoveFilesFromCache!");
return;
}
DiskCache.FlushCache(fileNamesRoot);
Expand All @@ -3260,7 +3260,7 @@ BOOL CSalamanderGeneral::GetConversionTable(HWND parent, char* table, const char
CALL_STACK_MESSAGE2("CSalamanderGeneral::GetConversionTable(, , %s)", conversion);
if (table == NULL)
{
TRACE_E("Invalid parametr (table==NULL) in CSalamanderGeneral::GetConversionTable!");
TRACE_E("Invalid parameter (table==NULL) in CSalamanderGeneral::GetConversionTable!");
return FALSE;
}
parent = (parent == NULL ? MainWindow->HWindow : parent);
Expand Down
Loading