Merge branch 'master' into dev

Source commit: d4af96a95d75b15e2fa61ba2f3c43b6a384e73f9

source/components/ThemePageControl.cpp

@@ -165,7 +165,7 @@ __fastcall TThemePageControl::TThemePageControl(TComponent * Owner) :
 //----------------------------------------------------------------------------------------------------------
 int __fastcall TThemePageControl::GetTabsHeight()
 {
-  // Calculated height includes tab/contents separator line on Windows 7/8,
+  // The Calculated height includes tab/contents separator line on Windows 7/8,
   // but not on Windows XP
 
   TRect Rect = GetClientRect();
@@ -379,7 +379,7 @@ void TThemePageControl::DrawDropDown(HDC DC, int Radius, int X, int Y, COLORREF
   DeleteObject(Pen);
 }
 //----------------------------------------------------------------------------------------------------------
-// draw tab item context: possible icon and text
+// Draw tab item context: possible icon and text
 void __fastcall TThemePageControl::DrawTabItem(HDC DC, int Item, TRect Rect, int State, bool Shadowed)
 {
   TRect OrigRect = Rect;
@@ -435,7 +435,7 @@ void __fastcall TThemePageControl::DrawTabItem(HDC DC, int Item, TRect Rect, int
       {
         ButtonItemInfo.HoverKind = hkMouseHover;
 
-        // Untimatelly, merge both branches to use PaintFrame (just with a different theme) (and drop GetSelectedBodyColor)
+        // Ultimately, merge both branches to use PaintFrame (just with a different theme) (and drop GetSelectedBodyColor)
         if (Selected && (ActiveTabTheme != NULL))
         {
           std::unique_ptr<TCanvas> CanvasMem(new TCanvas());

source/components/UnixDriveView.cpp

@@ -90,7 +90,7 @@ void __fastcall TCustomUnixDriveView::SetTerminal(TTerminal * value)
   {
     FTerminal = value;
     Items->Clear();
-    // If terminal is not active initially, we will never load fixed paths, when it become active.
+    // If terminal is not active initially, we will never load fixed paths, when it becomes active.
     // But actually terminal is not active here, only when we are replacing an abandoned terminal
     // with a dummy one (which will never become active)
     if ((FTerminal != NULL) && FTerminal->Active)
@@ -216,7 +216,7 @@ void __fastcall TCustomUnixDriveView::UpdatePath(TTreeNode * Node, bool Force,
       }
 
       // sort only after adding all items.
-      // should be faster then keeping the list sorted since beginning
+      // should be faster than keeping the list sorted since beginning
       ChildrenDirs->Sorted = true;
 
       for (int i = 0; i < Data->FileList->Count; i++)
@@ -265,7 +265,7 @@ void __fastcall TCustomUnixDriveView::UpdatePath(TTreeNode * Node, bool Force,
     __finally
     {
       delete ChildrenDirs;
-      // Relese only files only now, once they are no longer references in the tree
+      // Release files only now, once they are no longer referenced in the tree
       delete OldFileList; // if not NULL
     }
   }

source/core/FtpFileSystem.cpp

@@ -3039,7 +3039,7 @@ bool __fastcall TFTPFileSystem::KeepWaitingForReply(unsigned int & ReplyToAwait,
 
   // Though make sure that disconnect makes it through always. As for example when connection is closed already,
   // when sending commands, we may get REPLY_DISCONNECTED as a command response and no other response after,
-  // what would cause a hang.
+  // which would cause a hang.
   return
      (FReply == 0) &&
      ((ReplyToAwait == 0) ||
@@ -3071,7 +3071,7 @@ void __fastcall TFTPFileSystem::DoWaitForReply(unsigned int & ReplyToAwait, bool
   catch(...)
   {
     // even if non-fatal error happens, we must process pending message,
-    // so that we "eat" the reply message, so that it gets not mistakenly
+    // so that we "eat" the reply message, and it doesn't get mistakenly
     // associated with future connect
     if (FTerminal->Active)
     {
@@ -4423,7 +4423,7 @@ bool __fastcall TFTPFileSystem::HandleListData(const wchar_t * Path,
         }
         catch(...)
         {
-          // ignore permissions errors with FTP
+          // ignore permission errors with FTP
         }
 
         File->HumanRights = Entry->HumanPerm;
@@ -4529,7 +4529,7 @@ bool __fastcall TFTPFileSystem::HandleReply(int Command, unsigned int Reply)
     }
 
     // reply with Command 0 is not associated with current operation
-    // so do not treat is as a reply
+    // so do not treat it as a reply
     // (it is typically used asynchronously to notify about disconnects)
     if (Command != 0)
     {