Merge pull request #2569 from michaellukashov/minor-fix-typos

minor: Fix various typos

CODESTYLE.md

@@ -117,7 +117,7 @@ Use snake_case for all variables, however:
    Static variables - prefix by 's\_'   
    Global nonstatic variables - prefix by 'g\_'   
 Use UPPER_CASE_WITH_UNDERSCORES for macroses, values of enum-s.   
-Additionally values of enums must be prefixes with a abbreviation of corresponding enum's name.   
+Additionally values of enums must be prefixes with an abbreviation of corresponding enum's name.   
 Templates:   
    For template arguments that represent type name - use CamelCaseT (camel case with T suffix).   
    For template arguments that typed constant value - use UPPER_CASE_WITH_UNDERSCORES_T.   

FARStdlib/include/fstd_String.h

@@ -10,7 +10,7 @@ class String
 	int len, maxchar;
 
 private:
-	void BeginSet(size_t start_sise = DEF_STR_ALLOC);
+	void BeginSet(size_t start_size = DEF_STR_ALLOC);
 
 public:
 	virtual ~String();

FARStdlib/include/fstdlib.h

@@ -34,10 +34,10 @@
 
 /** @defgroup FSTDLib Library Compilation/Porting
 
-	FARStdLibrary already ported to next compillers:
-	  - Borland C compiller version 5.xx
-	  - Visual C compiller version 6.xx
-	  - Symantec  compiller version 7.2
+	FARStdLibrary already ported to next compilers:
+	  - Borland C compiler version 5.xx
+	  - Visual C compiler version 6.xx
+	  - Symantec  compiler version 7.2
 	  - GCC
 */
 
@@ -294,7 +294,7 @@ struct FP_Dialog
 	{
 		FP_Info->SendDlgMessage(Handle, DM_SETCHECK, num, v ? BSTATE_CHECKED : BSTATE_UNCHECKED);
 	}
-	void CheckTogle(int num) const { Checked(num, !Checked(num)); }
+	void CheckToggle(int num) const { Checked(num, !Checked(num)); }
 
 	bool GetItem(int num, FarDialogItem *p) const
 	{

FARStdlib/include/funi.h

@@ -209,7 +209,7 @@ inline LPCSTR FP_GetMsg(LPCSTR Msg)
 	@{
 
 	[fstd_RegXX.cpp]
-	Wrappers for regestry Win API.
+	Wrappers for registry Win API.
 */
 #if !defined(__FP_NOT_FUNCTIONS__)
 extern int WINAPI FP_GetRegKey(LPCSTR Key, LPCSTR ValueName, DWORD Default);

NetRocks/src/Protocol/SHELL/Helpers/remote.sh

@@ -1,5 +1,5 @@
 # This script is compactized when sent:
-# All comments and empty lines are discared.
+# All comments and empty lines are discarded.
 # Tokens started by SHELLVAR_ and SHELLFCN_ are renamed to shorter names.
 
 SAVED_PS1=$PS1;SAVED_PS2=$PS2;SAVED_PS2=$PS3;SAVED_PS4=$PS4;SAVED_PC=$PROMPT_COMMAND;export PS1=;export PS2=;export PS3=;export PS4=;export PROMPT_COMMAND=;
@@ -228,7 +228,7 @@ SHELLFCN_CMD_WRITE() {
   [ -n "$SHELLVAR_DD" ] && SHELLFCN_WRITE=SHELLFCN_WRITE_BY_DD
   if ! [ -n "$SHELLVAR_DD" ] && [ $SHELLVAR_OFFSET -ne 0 ] && ! truncate --size="$SHELLVAR_OFFSET" "$SHELLVAR_ARG" >>$SHELLVAR_LOG 2>&1 ; then
    SHELLFCN_SEND_ERROR_AND_RESYNC "$?"
-   # avoid futher writings
+   # avoid further writings
    SHELLVAR_ARG=/dev/null
   else
     echo '+OK'
@@ -250,7 +250,7 @@ SHELLFCN_CMD_WRITE() {
     NSEQ=`expr $NSEQ + 1`
    else
     SHELLFCN_SEND_ERROR_AND_RESYNC "SEQ=$SEQ NSEQ=$NSEQ $?"
-    # avoid futher writings
+    # avoid further writings
     SHELLVAR_ARG=/dev/null
    fi
   done
@@ -473,8 +473,8 @@ while true; do
   cont ) echo 'Odd cont' >>$SHELLVAR_LOG; SHELLVAR_NOPROMPT=Y;;
   noop ) ;;
   exit ) echo '73!'; exit 0; break;;
-# Another special case - if its part of inital sequence supposed to be sent to shell
-# - lets mimic shell's responce so negotiation sequence will continue.
+# Another special case - if its part of initial sequence supposed to be sent to shell
+# - lets mimic shell's response so negotiation sequence will continue.
 # sleep 3 ensures 'fishy' prompt will be printed at the right time moment
   echo ) echo; echo 'far2l is ready for fishing'; sleep 3;;
   * ) echo "Bad CMD='$SHELLVAR_CMD'" >>$SHELLVAR_LOG; echo "??? '$SHELLVAR_CMD'";;

NetRocks/src/Protocol/SHELL/WayToShell.cpp

@@ -56,7 +56,7 @@ WayToShell::WayToShell(int fd_ipc_recv, const WayToShellConfig &cfg, const Strin
 	}
 }
 
-// That long echo after exit makes things work smooter, dunno why.
+// That long echo after exit makes things work smoother, dunno why.
 // And it really needs to be rather long
 static const char s_exit_cmd[] = "\nexit\necho =================================\n";
 

NetRocks/src/Protocol/SHELL/WayToShellConfig.cpp

@@ -1,4 +1,4 @@
-/// NB: This file linked both into NetRocks plugin binary and into SHELL protocol broker executeable
+/// NB: This file linked both into NetRocks plugin binary and into SHELL protocol broker executable
 #include "WayToShellConfig.h"
 #include <KeyFileHelper.h>
 #include <utils.h>

NetRocks/src/Protocol/SSH/SSHConnection.cpp

@@ -464,7 +464,7 @@ void SSHExecutedCommand::IOLoop()
 		if (ssh_channel_is_eof(_channel)) {
 			int status = ssh_channel_get_exit_status(_channel);
 			if (status == 0) {
-				_succeess = true;
+				_success = true;
 			}
 			FDScope fd_status(open((_fifo + ".status").c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0600));
 			if (fd_status.Valid()) {
@@ -550,7 +550,7 @@ SSHExecutedCommand::~SSHExecutedCommand()
 	}
 	CheckedCloseFDPair(_kickass);
 
-	if (_succeess) {
+	if (_success) {
 		std::vector<std::string> parts;
 		StrExplode(parts, _command_line, " ");
 		if (parts.size() > 1) {

NetRocks/src/Protocol/SSH/SSHConnection.h

@@ -57,7 +57,7 @@ class SSHExecutedCommand : protected Threaded
 	SSHChannel _channel;
 	int _kickass[2] {-1, -1};
 	bool _pty = false;
-	bool _succeess = false;
+	bool _success = false;
 
 	void OnReadFDIn(const char *buf, size_t len);
 	virtual void SendSignal(int sig);

WinPort/FarTTY.h

@@ -138,7 +138,7 @@ All integer values are in little-endian format.
   Predefined ID values used by far2l based on Win32 IDs, but with some modifications, currently
   only following predefined values are used by far2l in reality:
    1  - CF_TEXT - text encoded as UTF8
-   13 - CF_UNICODETEXT - text encoded as UTF32 (depcrecated in recent releases in favor of CF_TEXT)
+   13 - CF_UNICODETEXT - text encoded as UTF32 (deprecated in recent releases in favor of CF_TEXT)
    Also far2l dynamically registers some own data formats to copy-paste vertical text blocks etc.
     At same moment of time clipboard may contain several different formats, thus allowing data to be
     represented in different forms. Also CF_TEXT/CF_UNICODETEXT transparently transcoded if needed.
@@ -239,7 +239,7 @@ All integer values are in little-endian format.
 */
 #define FARTTY_FEAT_TERMINAL_SIZE             0x00000002
 
-/** Server reports this on responce of FARTTY_INTERRACT_CLIP_OPEN if it supports clipboard data ID.
+/** Server reports this on response of FARTTY_INTERRACT_CLIP_OPEN if it supports clipboard data ID.
  Clipboard data ID allows client-side caching of clipboard data to avoid known data transfers.
 */
 #define FARTTY_FEATCLIP_DATA_ID               0x00000001

WinPort/src/Backend/TTY/TTYInputSequenceParserExts.cpp

@@ -115,7 +115,7 @@ size_t TTYInputSequenceParser::TryParseAsKittyEscapeSequence(const char *s, size
 {
 	// kovidgoyal's kitty keyboard protocol (progressive enhancement flags 15) support
 	// CSI [ XXX : XXX : XXX ; XXX : XXX [u~ABCDEFHPQRS]
-	// some parts sometimes ommitted, see docs
+	// some parts sometimes omitted, see docs
 	// https://sw.kovidgoyal.net/kitty/keyboard-protocol/
 
 	// todo: enhanced key flag now set for essential keys only, should be set for more ones
@@ -177,7 +177,7 @@ size_t TTYInputSequenceParser::TryParseAsKittyEscapeSequence(const char *s, size
 			(s[i] == 'E') || (s[i] == 'F') ||
 			(s[i] == 'H') || (s[i] == 'P') ||
 			(s[i] == 'Q') ||
-			(s[i] == 'R') || // "R" is still vaild here in old kitty versions
+			(s[i] == 'R') || // "R" is still valid here in old kitty versions
 			(s[i] == 'S')
 		);
 

far2l/src/cfg/ConfigOptEdit.cpp

@@ -250,7 +250,7 @@ class ConfigOptProps
 		if (IsNotDefault()==1) {
 			em.Add(L"");
 			em.Add(L"Note: some parameters after update/reset");
-			em.Add(L"      not applied immediatly in FAR2L");
+			em.Add(L"      not applied immediately in FAR2L");
 			em.Add(L"      and need relaunch feature");
 			em.Add(L"      or may be need save config & restart FAR2L");
 		}
@@ -380,7 +380,7 @@ class ConfigOptProps
 			/*  33 */ {DI_RADIOBUTTON,	59, 10, 65,            10, {}, (is_editable ? 0 : DIF_DISABLE), L"hex"},
 			/*  34 */ {DI_TEXT,		3, 11, 20,            11, {}, DIF_SEPARATOR, L""},
 			/*  35 */ {DI_TEXT,		5, 12, DLG_WIDTH - 6, 12, {}, DIF_SHOWAMPERSAND, L"Note: some parameters after update/reset"},
-			/*  36 */ {DI_TEXT,		5, 13, DLG_WIDTH - 6, 13, {}, DIF_SHOWAMPERSAND, L"      not applied immediatly in FAR2L"},
+			/*  36 */ {DI_TEXT,		5, 13, DLG_WIDTH - 6, 13, {}, DIF_SHOWAMPERSAND, L"      not applied immediately in FAR2L"},
 			/*  37 */ {DI_TEXT,		5, 14, DLG_WIDTH - 6, 14, {}, DIF_SHOWAMPERSAND, L"      and need relaunch feature"},
 			/*  38 */ {DI_TEXT,		5, 15, DLG_WIDTH - 6, 15, {}, DIF_SHOWAMPERSAND, L"      or may be need save config & restart FAR2L"},
 			/*  39 */ {DI_TEXT,		3, 16, 20, 16, {}, DIF_SEPARATOR, L""},

far2l/src/console/scrbuf.cpp

@@ -302,7 +302,7 @@ void ScreenBuf::ApplyColor(int X1, int Y1, int X2, int Y2, DWORD64 Color)
 }
 
 /*
-	Непосредственное изменение цветовых атрибутов с заданым цетом исключением
+	Непосредственное изменение цветовых атрибутов с заданным цветом исключением
 */
 void ScreenBuf::ApplyColor(int X1, int Y1, int X2, int Y2, DWORD64 Color, DWORD64 ExceptColor)
 {
@@ -565,7 +565,7 @@ void ScreenBuf::RestoreElevationChar()
 	}
 }
 
-// проскроллировать буффер на одну строку вверх.
+// проскроллировать буфер на одну строку вверх.
 void ScreenBuf::Scroll(int Num)
 {
 	CriticalSectionLock Lock(CS);

far2l/src/copy.cpp

@@ -881,7 +881,7 @@ ShellCopy::ShellCopy(Panel *SrcPanel,		// исходная панель (акт
 		DLG_HEIGHT-= 3;
 	}
 
-	// корректирем позицию " to"
+	// корректируем позицию " to"
 	CopyDlg[ID_SC_TARGETTITLE].X1 = CopyDlg[ID_SC_TARGETTITLE].X2 =
 			CopyDlg[ID_SC_SOURCEFILENAME].X1 + (int)CopyDlg[ID_SC_SOURCEFILENAME].strData.GetLength();
 
@@ -928,7 +928,7 @@ ShellCopy::ShellCopy(Panel *SrcPanel,		// исходная панель (акт
 			ComboList.Items[CM_APPEND].Text = Msg::CopyAppend;
 			ComboList.Items[CM_ONLYNEWER].Text = Msg::CopyOnlyNewerFiles;
 			ComboList.Items[CM_ASKRO].Text = Msg::CopyAskRO;
-			// if uncehcked in Options->Confirmations then disable variants & set only Overwrite
+			// if unchecked in Options->Confirmations then disable variants & set only Overwrite
 			if ( (Move && !Opt.Confirm.Move) || (!Move && !Opt.Confirm.Copy) ) {
 				ComboList.Items[CM_OVERWRITE].Flags= LIF_SELECTED;
 				CopyDlg[ID_SC_COMBO].Flags|= DIF_DISABLE;
@@ -2165,8 +2165,8 @@ COPY_CODES ShellCopy::ShellCopyOneFileNoRetry(const wchar_t *Src, const FAR_FIND
 		if ((SrcData.dwFileAttributes & (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))
 				== FILE_ATTRIBUTE_DIRECTORY) {
 			/*
-				Enqueue attributes before creating directory, so even if will fail (like directory exists)
-				but ignored then still will still try apply them on whole copy process finish successfully
+				Enqueue attributes before creating directory, so even if it will fail (like directory exists)
+				but ignored then will still try to apply them on whole copy process finish successfully
 			*/
 			EnqueueDirectoryAttributes(SrcData, strDestPath);
 		}
@@ -2750,7 +2750,7 @@ DWORD ShellFileTransfer::PieceCopy()
 
 	if (BytesWritten > BytesRead) {
 		/*
-			likely we written bit more due to no_buffering requires aligned io
+			likely we have written bit more due to no_buffering requires aligned io
 			move backward and correct file size
 		*/
 		if (!_DestFile.SetPointer((INT64)BytesRead - (INT64)WriteSize, nullptr, FILE_CURRENT))

far2l/src/delete.cpp

@@ -597,7 +597,7 @@ static DeletionResult ShellRemoveFile(const wchar_t *Name, bool Wipe, int Opt_De
 						Msg::DeleteHardLink2, Msg::DeleteHardLink3, Msg::DeleteFileWipe, Msg::DeleteFileAll,
 						Msg::DeleteFileSkip, Msg::DeleteFileSkipAll, Msg::DeleteCancel);
 			}
-			// !!! [All] & [Skip all] now equivalent for wipe symlink & file with several hardlink - may be do separete?
+			// !!! [All] & [Skip all] now equivalent for wipe symlink & file with several hardlink - may be do separate?
 
 			switch (MsgCode) {
 				case -1:

far2l/src/edit.cpp

@@ -2048,8 +2048,8 @@ int Edit::RealPosToCell(int PrevLength, int PrevPos, int Pos, int *CorrectPos)
 
 			// Обрабатываем табы
 			if (Str[Index] == L'\t' && TabExpandMode != EXPAND_ALLTABS) {
-				// Если есть необходимость делать корректировку табов и эта коректировка
-				// ещё не проводилась, то увеличиваем длину обрабатываемой строки на еденицу
+				// Если есть необходимость делать корректировку табов и эта корректировка
+				// ещё не проводилась, то увеличиваем длину обрабатываемой строки на единицу
 				if (bCorrectPos) {
 					++Pos;
 					*CorrectPos = 1;

far2l/src/editor.cpp

@@ -4712,7 +4712,7 @@ wchar_t *Editor::VBlock2Text(wchar_t *ptrInitData)
 	if (ptrInitData)
 		DataSize = wcslen(ptrInitData);
 
-	// RealPos всегда <= TabPos, поэтому берём максимальный размер буффера
+	// RealPos всегда <= TabPos, поэтому берём максимальный размер буфера
 	size_t TotalChars = DataSize + (VBlockSizeX + wcslen(NATIVE_EOLW)) * VBlockSizeY + 1;
 
 	wchar_t *CopyData = (wchar_t *)malloc(TotalChars * sizeof(wchar_t));

far2l/src/fileedit.cpp

@@ -792,7 +792,7 @@ int FileEditor::ReProcessKey(FarKey Key, int CalledFromControl)
 
 				// проверка на "а может это говно удалили уже?"
 				// возможно здесь она и не нужна!
-				// хотя, раз уж были изменени, то
+				// хотя, раз уж были изменения, то
 				if (m_editor->IsFileChanged() &&												// в текущем сеансе были изменения?
 						apiGetFileAttributes(strFullFileName) == INVALID_FILE_ATTRIBUTES)		// а файл еще существует?
 				{
@@ -2340,7 +2340,7 @@ DWORD FileEditor::EditorGetFileAttributes(const wchar_t *Name)
 }
 
 /*
-	Return TRUE - панель обовили
+	Return TRUE - панель обновили
 */
 BOOL FileEditor::UpdateFileList()
 {

far2l/src/hist/history.cpp

@@ -879,11 +879,11 @@ int History::ProcessMenu(FARString &strStr, const wchar_t *Title, VMenu &History
 					}
 					if (TypeHistory == HISTORYTYPE_VIEW && CurrentRecord) {
 						strStr = CurrentRecord->strName;
-						return 9; // for files: Go To Directory & postion to file
+						return 9; // for files: Go To Directory & position to file
 					}
 					if (TypeHistory == HISTORYTYPE_FOLDER && CurrentRecord) {
 						strStr = CurrentRecord->strName;
-						return 1; // for directory is equialent to ENTER
+						return 1; // for directory is equivalent to ENTER
 					}
 					break;
 				}

far2l/src/locale/codepage.cpp

@@ -514,7 +514,7 @@ static void ProcessSelected(bool select)
 				if (!normalCodePages)
 					AddSeparator(Msg::GetCodePageOther);
 
-				// Добавляем кодовою страницу в нормальные
+				// Добавляем кодовую страницу в нормальные
 				CodePages->AddItem(&newItem,
 						GetCodePageInsertPosition(codePage, CodePages->GetItemCount() - normalCodePages,
 								normalCodePages));

far2l/src/panels/filelist.cpp

@@ -2162,7 +2162,7 @@ int FileList::ProcessKey(FarKey Key)
 					&& (Key & ~KEY_ALTSHIFT_BASE) != KEY_ENTER && (Key & ~KEY_ALTSHIFT_BASE) != KEY_ESC
 					&& !IS_KEY_EXTENDED(Key)) {
 				//_SVS(SysLog(L">FastFind: Key=%ls",_FARKEY_ToName(Key)));
-				// Скорректирем уже здесь нужные клавиши, т.к. WaitInFastFind
+				// Скорректируем уже здесь нужные клавиши, т.к. WaitInFastFind
 				// в это время еще равно нулю.
 				static const char Code[] = ")!@#$%^&*(";
 
@@ -2807,7 +2807,7 @@ int FileList::ProcessMouse(MOUSE_EVENT_RECORD *MouseEvent)
 
 			/*
 				$ 21.02.2001 SKV
-				Если пришел DOUBLE_CLICK без предшевствующего ему
+				Если пришел DOUBLE_CLICK без предшествующего ему
 				простого клика, то курсор не перерисовывается.
 				Перересуем его.
 				По идее при нормальном DOUBLE_CLICK, будет

far2l/src/panels/treelist.cpp

@@ -331,7 +331,7 @@ void TreeList::DisplayTree(int Fast)
 	}
 
 	UpdateViewPanel();
-	SetTitle();		// не забудим прорисовать заголовок
+	SetTitle();		// не забудeм прорисовать заголовок
 
 	if (LckScreen)
 		delete LckScreen;
@@ -1798,7 +1798,7 @@ int TreeCmp(const wchar_t *Str1, const wchar_t *Str2, int Numeric, int CaseSensi
 
 /*
 	$ 16.10.2000 tran
-	функция, определяющаяя необходимость кеширования
+	функция, определяющая необходимость кеширования
 	файла
 */
 int TreeList::MustBeCached(const wchar_t *Root)

far2l/src/panels/treelist.hpp

@@ -177,6 +177,6 @@ class TreeList : public Panel
 	static void ReadCache(const wchar_t *TreeRoot);
 	static void FlushCache();
 
-	static int MustBeCached(const wchar_t *Root);	// $ 16.10.2000 tran - функция, определяющаяя необходимость кеширования файла
+	static int MustBeCached(const wchar_t *Root);	// $ 16.10.2000 tran - функция, определяющая необходимость кеширования файла
 	static void PR_MsgReadTree();
 };

far2l/src/vmenu.cpp

@@ -1925,7 +1925,7 @@ void VMenu::ShowMenu(bool IsParent, bool ForceFrameRedraw)
 				SetColor(Col);
 				Text(CheckMark);
 				// табуляции меняем только при показе!!!
-				// для сохранение оригинальной строки!!!
+				// для сохранения оригинальной строки!!!
 				ReplaceTabsBySpaces(strMenuLine, 1);
 				if (strMItemPtrPrefixLen) {
 					SetColor(VMenu::Colors[Item[I]->Flags & LIF_SELECTED ? VMenuColorSelGrayed : VMenuColorGrayed]);

far2l/src/vmenu.hpp

@@ -295,7 +295,7 @@ class VMenu : public Modal
 	bool IsFilterEditKey(FarKey Key);
 	bool ShouldSendKeyToFilter(FarKey Key);
 	bool AddToFilter(const wchar_t *str);
-	// коректировка текущей позиции и флагов SELECTED
+	// корректировка текущей позиции и флагов SELECTED
 	void UpdateSelectPos();
 	void EnableFilter(bool Enable);
 

farftp/src/ConnectCmds.cpp

@@ -546,7 +546,7 @@ void Connection::doproxy(int argc, char *argv[])
 		return;
 	}
 
-	// Allready in proxy mode
+	// Already in proxy mode
 	if (proxy > 0)
 		ExecCmdTab(c, argc - 1, argv + 1);
 	else {

utils/include/ThreadedWorkQueue.h

@@ -11,7 +11,7 @@
 
 struct IThreadedWorkItem
 {
-	/// Invoked within main thread after WorkProc completed or discared
+	/// Invoked within main thread after WorkProc completed or discarded
 	/// from Finalize(), Queue() or ThreadedWorkQueue's d-tor
 	virtual ~IThreadedWorkItem() {}
 

utils/include/WideMB.h

@@ -31,7 +31,7 @@ std::wstring StrMB2Wide(const std::string &src);
 */
 
 // converts wchar_t(s) to multibyte _appending_ result to dst, doesnt care about escaping
-// replaces untranslateble wchar_t-s by CHAR_REPLACEMENT
+// replaces untranslatable wchar_t-s by CHAR_REPLACEMENT
 void Wide2MB_UnescapedAppend(const wchar_t wc, std::string &dst);
 void Wide2MB_UnescapedAppend(const wchar_t *src_begin, size_t src_len, std::string &dst);