Fix various spelling mistakes reported by lintian

Forwarded: no

Gbp-Pq: Name 28_spelling.patch

14 files changed, 73 insertions, 165 deletions

diff --git a/CodeLite/ctags_manager.cpp b/CodeLite/ctags_manager.cpp
index 3f2f4ad9..b8cbe614 100644
--- a/CodeLite/ctags_manager.cpp
+++ b/CodeLite/ctags_manager.cpp
@@ -572,7 +572,7 @@ bool TagsManager::WordCompletionCandidates(const wxFileName& fileName, int linen
             GetKeywordsTagsForLanguage(word, kCxx, keywords);

         }

 

-        // Allways collect the local and the function argument tags

+        // Always collect the local and the function argument tags

         GetLocalTags(word, scope, locals, PartialMatch | IgnoreCaseSensitive | ReplaceTokens);

         GetLocalTags(word, funcSig, locals, PartialMatch | IgnoreCaseSensitive);

 

diff --git a/CodeLite/language.cpp b/CodeLite/language.cpp
index 2fda3a5e..db3b8c49 100644
--- a/CodeLite/language.cpp
+++ b/CodeLite/language.cpp
@@ -361,7 +361,7 @@ bool Language::ProcessExpression(const wxString& stmt, const wxString& text, con
     scopeName = GetScopeName(visibleScope, &additionalScopes);

     CL_DEBUG(wxT("Obtaining the scope name...done"));

 

-    // Allways use the global namespace as an addition scope

+    // Always use the global namespace as an addition scope

     // but make sure we add it last

     additionalScopes.push_back(wxT("<global>"));

 

diff --git a/LiteEditor/SyntaxHighlightBaseDlg.wxcp b/LiteEditor/SyntaxHighlightBaseDlg.wxcp
index 18fd0881..7a0035f0 100644
--- a/LiteEditor/SyntaxHighlightBaseDlg.wxcp
+++ b/LiteEditor/SyntaxHighlightBaseDlg.wxcp
@@ -4826,7 +4826,7 @@
                           }, {
                            "type": "multi-string",
                            "m_label": "Label:",
-                           "m_value": "Use Custom Selection Forground Colour:"
+                           "m_value": "Use Custom Selection Foreground Colour:"
                           }, {
                            "type": "string",
                            "m_label": "Wrap:",
@@ -6088,4 +6088,4 @@
       }]
     }]
   }]
-}
\ No newline at end of file
+}
diff --git a/LiteEditor/new_build_tab.cpp b/LiteEditor/new_build_tab.cpp
index 511b1e34..1a24bbd0 100644
--- a/LiteEditor/new_build_tab.cpp
+++ b/LiteEditor/new_build_tab.cpp
@@ -293,7 +293,7 @@ void NewBuildTab::OnBuildStarted(clCommandEvent& e)
 
 void NewBuildTab::OnBuildAddLine(clCommandEvent& e)
 {
-    e.Skip(); // Allways call skip..
+    e.Skip(); // Always call skip..
     m_output << e.GetString();
     DoProcessOutput(false, false);
 }
diff --git a/LiteEditor/syntaxhighlightbasedlg.cpp b/LiteEditor/syntaxhighlightbasedlg.cpp
index bb02106f..931bb596 100644
--- a/LiteEditor/syntaxhighlightbasedlg.cpp
+++ b/LiteEditor/syntaxhighlightbasedlg.cpp
@@ -371,7 +371,7 @@ SyntaxHighlightBaseDlg::SyntaxHighlightBaseDlg(wxWindow* parent, wxWindowID id,
     
     fgSizer3->Add(m_colourPickerSelTextBgColour, 0, wxALL|wxEXPAND, WXC_FROM_DIP(5));
     
-    m_staticText94 = new wxStaticText(m_panelTextSelection, wxID_ANY, _("Use Custom Selection Forground Colour:"), wxDefaultPosition, wxDLG_UNIT(m_panelTextSelection, wxSize(-1,-1)), 0);
+    m_staticText94 = new wxStaticText(m_panelTextSelection, wxID_ANY, _("Use Custom Selection Foreground Colour:"), wxDefaultPosition, wxDLG_UNIT(m_panelTextSelection, wxSize(-1,-1)), 0);
     
     fgSizer3->Add(m_staticText94, 0, wxALL|wxALIGN_RIGHT, WXC_FROM_DIP(5));
     
diff --git a/LiteEditor/tags_options_base_dlg.cpp b/LiteEditor/tags_options_base_dlg.cpp
index 6215c83e..1b7f0b8d 100644
--- a/LiteEditor/tags_options_base_dlg.cpp
+++ b/LiteEditor/tags_options_base_dlg.cpp
@@ -124,7 +124,7 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
     
     m_checkBoxDeepUsingNamespaceResolving = new wxCheckBox(m_paneDisplayAndBehavior, wxID_ANY, _("Scan all included files to locate 'using namespace' statements"), wxDefaultPosition, wxDLG_UNIT(m_paneDisplayAndBehavior, wxSize(-1, -1)), 0);
     m_checkBoxDeepUsingNamespaceResolving->SetValue(false);
-    m_checkBoxDeepUsingNamespaceResolving->SetToolTip(_("Allways search for 'using namespace' statements in all included files"));
+    m_checkBoxDeepUsingNamespaceResolving->SetToolTip(_("Always search for 'using namespace' statements in all included files"));
     
     flexGridSizer59->Add(m_checkBoxDeepUsingNamespaceResolving, 0, wxALL, WXC_FROM_DIP(5));
     
@@ -202,8 +202,8 @@ TagsOptionsBaseDlg::TagsOptionsBaseDlg(wxWindow* parent, wxWindowID id, const wx
     
     fgSizer4->Add(0, 0, 1, wxEXPAND, WXC_FROM_DIP(5));
     
-    m_staticTextMinWordLen = new wxStaticText(m_paneTriggering, wxID_ANY, _("Minimun chars to type:"), wxDefaultPosition, wxDLG_UNIT(m_paneTriggering, wxSize(-1, -1)), 0);
-    m_staticTextMinWordLen->SetToolTip(_("Minimun chars to type:"));
+    m_staticTextMinWordLen = new wxStaticText(m_paneTriggering, wxID_ANY, _("Minimum chars to type:"), wxDefaultPosition, wxDLG_UNIT(m_paneTriggering, wxSize(-1, -1)), 0);
+    m_staticTextMinWordLen->SetToolTip(_("Minimum chars to type:"));
     
     fgSizer4->Add(m_staticTextMinWordLen, 0, wxALL|wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5));
     
diff --git a/MemCheck/memcheckoutputview.cpp b/MemCheck/memcheckoutputview.cpp
index 70fcb04d..81aee96c 100644
--- a/MemCheck/memcheckoutputview.cpp
+++ b/MemCheck/memcheckoutputview.cpp
@@ -178,7 +178,7 @@ void MemCheckOutputView::ShowPageView(size_t page)
     m_mgr->GetTheApp()->Yield();
     for(; i <= iStop; ++i, ++it) {
         if(it == errorList.end()) {
-            CL_WARNING(PLUGIN_PREFIX("Some items skiped. Total errors count mismatches the iterator."));
+            CL_WARNING(PLUGIN_PREFIX("Some items skipped. Total errors count mismatches the iterator."));
             break;
         }
         AddTree(wxDataViewItem(0), *it); // CL_DEBUG1(PLUGIN_PREFIX("adding %lu", i));
diff --git a/Plugin/CompilerLocatorMSVC.cpp b/Plugin/CompilerLocatorMSVC.cpp
index 90c2c0d5..5d6e01c7 100644
--- a/Plugin/CompilerLocatorMSVC.cpp
+++ b/Plugin/CompilerLocatorMSVC.cpp
@@ -197,8 +197,8 @@ void CompilerLocatorMSVC::AddCompilerOptions(CompilerPtr compiler)
     compiler->AddCompilerOption("/Gm", "Enables minimal rebuild.");
     compiler->AddCompilerOption("/Gy", "Enables function-level linking.");
     compiler->AddCompilerOption("/EHa", "Enable C++ Exceptions with SEH exceptions");
-    compiler->AddCompilerOption("/EHs", "Enable C++ Exceptions with Extern C funtions.");
-    compiler->AddCompilerOption("/EHsc", "Enable C++ Exceptions with SEH and Extern C funtions.");
+    compiler->AddCompilerOption("/EHs", "Enable C++ Exceptions with Extern C functions.");
+    compiler->AddCompilerOption("/EHsc", "Enable C++ Exceptions with SEH and Extern C functions.");
 
     compiler->AddCompilerOption("/Z7", "Produces an .obj file containing full symbolic debugging information for use with the debugger.");
     compiler->AddCompilerOption("/Zi", "Produces a program database (PDB) that contains type information and symbolic debugging information for use with the debugger.");
@@ -233,8 +233,8 @@ void CompilerLocatorMSVC::AddLinkerOptions(CompilerPtr compiler)
     compiler->AddLinkerOption("/MACHINE:X64", "Specifies the target platform.");
     compiler->AddLinkerOption("/MACHINE:X86", "Specifies the target platform.");
     compiler->AddLinkerOption("/NOENTRY", "Creates a resource-only DLL.");
-    compiler->AddLinkerOption("/NXCOMPAT", "Specify Compatability with Data Execution Prevention.");
-    compiler->AddLinkerOption("/NXCOMPAT:NO", "Specify Compatability with Data Execution Prevention.");
+    compiler->AddLinkerOption("/NXCOMPAT", "Specify Compatibility with Data Execution Prevention.");
+    compiler->AddLinkerOption("/NXCOMPAT:NO", "Specify Compatibility with Data Execution Prevention.");
 
     compiler->AddLinkerOption("/OPT:REF", "Controls LINK optimizations.");
     compiler->AddLinkerOption("/OPT:NOREF", "Controls LINK optimizations.");
diff --git a/SnipWiz/AboutHtml.h b/SnipWiz/AboutHtml.h
index 66358a9a..c9c091aa 100644
--- a/SnipWiz/AboutHtml.h
+++ b/SnipWiz/AboutHtml.h
@@ -23,135 +23,43 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-const char snipwizhtml_txt[] ={

-	0x3C,0x48,0x54,0x4D,0x4C,0x3E,0x3C,0x42,0x4F,0x44,0x59,0x20,0x42,0x47,

-	0x43,0x4F,0x4C,0x4F,0x52,0x3D,0x22,0x23,0x46,0x46,0x46,0x46,0x45,0x36,

-	0x22,0x20,0x54,0x45,0x58,0x54,0x3D,0x22,0x23,0x30,0x30,0x30,0x30,0x30,

-	0x30,0x22,0x20,0x4C,0x49,0x4E,0x4B,0x3D,0x22,0x23,0x30,0x30,0x30,0x30,

-	0x46,0x46,0x22,0x20,0x56,0x4C,0x49,0x4E,0x4B,0x3D,0x22,0x23,0x34,0x30,

-	0x30,0x30,0x34,0x30,0x22,0x20,0x41,0x4C,0x49,0x4E,0x4B,0x3D,0x22,0x23,

-	0x46,0x46,0x30,0x30,0x30,0x30,0x22,0x20,0x54,0x4F,0x50,0x4D,0x41,0x52,

-	0x47,0x49,0x4E,0x3D,0x22,0x35,0x22,0x20,0x4C,0x45,0x46,0x54,0x4D,0x41,

-	0x52,0x47,0x49,0x4E,0x3D,0x22,0x35,0x22,0x3E,0x0A,0x3C,0x46,0x4F,0x4E,

-	0x54,0x20,0x43,0x4F,0x4C,0x4F,0x52,0x3D,0x22,0x22,0x20,0x53,0x49,0x5A,

-	0x45,0x3D,0x22,0x32,0x22,0x20,0x46,0x41,0x43,0x45,0x3D,0x22,0x41,0x72,

-	0x69,0x61,0x6C,0x2C,0x20,0x4C,0x75,0x63,0x69,0x64,0x61,0x20,0x53,0x61,

-	0x6E,0x73,0x22,0x3E,0x0A,0x3C,0x42,0x3E,0x53,0x6E,0x69,0x70,0x57,0x69,

-	0x7A,0x3C,0x2F,0x42,0x3E,0x20,0x69,0x73,0x20,0x61,0x20,0x6C,0x69,0x74,

-	0x74,0x6C,0x65,0x20,0x74,0x6F,0x6F,0x6C,0x20,0x74,0x6F,0x20,0x6D,0x61,

-	0x6B,0x65,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,0x6D,0x65,0x72,0x73,

-	0x27,0x20,0x6C,0x69,0x76,0x65,0x73,0x20,0x61,0x20,0x62,0x69,0x74,0x20,

-	0x65,0x61,0x73,0x69,0x65,0x72,0x2E,0x20,0x49,0x74,0x20,0x63,0x6F,0x6E,

-	0x73,0x69,0x73,0x74,0x73,0x20,0x6F,0x66,0x20,0x74,0x77,0x6F,0x20,0x70,

-	0x61,0x72,0x74,0x73,0x2C,0x20,0x74,0x68,0x65,0x20,0x27,0x3C,0x42,0x3E,

-	0x3C,0x49,0x3E,0x53,0x6E,0x69,0x70,0x70,0x65,0x74,0x20,0x57,0x69,0x7A,

-	0x61,0x72,0x64,0x3C,0x2F,0x49,0x3E,0x3C,0x2F,0x42,0x3E,0x27,0x20,0x61,

-	0x6E,0x64,0x20,0x74,0x68,0x65,0x20,0x27,0x3C,0x42,0x3E,0x3C,0x49,0x3E,

-	0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65,0x20,0x43,0x6C,0x61,0x73,0x73,

-	0x20,0x57,0x69,0x7A,0x61,0x72,0x64,0x3C,0x2F,0x49,0x3E,0x3C,0x2F,0x42,

-	0x3E,0x27,0x2E,0x3C,0x50,0x3E,0x0A,0x0A,0x3C,0x42,0x3E,0x53,0x6E,0x69,

-	0x70,0x70,0x65,0x74,0x20,0x57,0x69,0x7A,0x61,0x72,0x64,0x3A,0x3C,0x2F,

-	0x42,0x3E,0x3C,0x42,0x52,0x3E,0x0A,0x54,0x68,0x69,0x73,0x20,0x68,0x6F,

-	0x6C,0x64,0x73,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,0x73,0x20,0x6F,

-	0x66,0x20,0x63,0x6F,0x64,0x65,0x20,0x74,0x68,0x61,0x74,0x20,0x79,0x6F,

-	0x75,0x20,0x6D,0x69,0x67,0x68,0x74,0x20,0x63,0x6F,0x6D,0x6D,0x6F,0x6E,

-	0x6C,0x79,0x20,0x75,0x73,0x65,0x2E,0x20,0x41,0x20,0x73,0x6E,0x69,0x70,

-	0x70,0x65,0x74,0x20,0x63,0x61,0x6E,0x20,0x62,0x65,0x20,0x69,0x6E,0x73,

-	0x65,0x72,0x74,0x65,0x64,0x20,0x69,0x6E,0x74,0x6F,0x20,0x61,0x20,0x64,

-	0x6F,0x63,0x75,0x6D,0x65,0x6E,0x74,0x20,0x66,0x72,0x6F,0x6D,0x20,0x74,

-	0x68,0x65,0x20,0x63,0x6F,0x6E,0x74,0x65,0x78,0x74,0x20,0x6D,0x65,0x6E,

-	0x75,0x2C,0x20,0x3C,0x50,0x3E,0x0A,0x20,0x0A,0x54,0x68,0x65,0x72,0x65,

-	0x20,0x61,0x72,0x65,0x20,0x74,0x77,0x6F,0x20,0x70,0x6C,0x61,0x63,0x65,

-	0x68,0x6F,0x6C,0x64,0x65,0x72,0x73,0x20,0x77,0x68,0x69,0x63,0x68,0x20,

-	0x63,0x61,0x6E,0x20,0x62,0x65,0x20,0x75,0x73,0x65,0x64,0x20,0x61,0x73,

-	0x20,0x70,0x61,0x72,0x61,0x6D,0x65,0x74,0x65,0x72,0x73,0x20,0x69,0x6E,

-	0x20,0x61,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,0x2E,0x3C,0x42,0x52,

-	0x3E,0x0A,0x3C,0x44,0x44,0x3E,0x3C,0x42,0x3E,0x24,0x3C,0x2F,0x42,0x3E,

-	0x20,0x77,0x69,0x6C,0x6C,0x20,0x62,0x65,0x20,0x72,0x65,0x70,0x6C,0x61,

-	0x63,0x65,0x64,0x20,0x62,0x79,0x20,0x74,0x68,0x65,0x20,0x73,0x65,0x6C,

-	0x65,0x63,0x74,0x69,0x6F,0x6E,0x2C,0x20,0x69,0x66,0x20,0x61,0x6E,0x79,

-	0x2E,0x0A,0x3C,0x44,0x44,0x3E,0x3C,0x42,0x3E,0x40,0x3C,0x2F,0x42,0x3E,

-	0x20,0x77,0x69,0x6C,0x6C,0x20,0x73,0x65,0x74,0x20,0x74,0x68,0x65,0x20,

-	0x70,0x6F,0x73,0x69,0x74,0x69,0x6F,0x6E,0x20,0x77,0x68,0x65,0x72,0x65,

-	0x20,0x74,0x68,0x65,0x20,0x63,0x61,0x72,0x65,0x74,0x20,0x73,0x68,0x6F,

-	0x75,0x6C,0x64,0x20,0x62,0x65,0x20,0x61,0x66,0x74,0x65,0x72,0x20,0x74,

-	0x68,0x65,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,0x20,0x68,0x61,0x73,

-	0x20,0x62,0x65,0x65,0x6E,0x20,0x69,0x6E,0x73,0x65,0x72,0x74,0x65,0x64,

-	0x2E,0x3C,0x50,0x3E,0x0A,0x0A,0x3C,0x44,0x44,0x3E,0x3C,0x55,0x3E,0x45,

-	0x78,0x61,0x6D,0x70,0x6C,0x65,0x3A,0x3C,0x2F,0x55,0x3E,0x0A,0x3C,0x44,

-	0x44,0x3E,0x3C,0x43,0x4F,0x44,0x45,0x3E,0x66,0x6F,0x72,0x28,0x24,0x20,

-	0x3D,0x20,0x30,0x3B,0x20,0x24,0x20,0x26,0x6C,0x74,0x3B,0x20,0x40,0x3B,

-	0x20,0x24,0x2B,0x2B,0x29,0x3C,0x2F,0x43,0x4F,0x44,0x45,0x3E,0x0A,0x3C,

-	0x44,0x44,0x3E,0x4C,0x65,0x74,0x27,0x73,0x20,0x73,0x61,0x79,0x20,0x79,

-	0x6F,0x75,0x20,0x68,0x61,0x64,0x20,0x73,0x65,0x6C,0x65,0x63,0x74,0x65,

-	0x64,0x20,0x74,0x68,0x65,0x20,0x77,0x6F,0x72,0x64,0x20,0x27,0x3C,0x43,

-	0x4F,0x44,0x45,0x3E,0x63,0x6F,0x75,0x6E,0x74,0x65,0x72,0x3C,0x2F,0x43,

-	0x4F,0x44,0x45,0x3E,0x27,0x20,0x54,0x68,0x69,0x73,0x20,0x77,0x69,0x6C,

-	0x6C,0x20,0x65,0x78,0x70,0x61,0x6E,0x64,0x20,0x74,0x6F,0x0A,0x3C,0x44,

-	0x44,0x3E,0x3C,0x43,0x4F,0x44,0x45,0x3E,0x66,0x6F,0x72,0x28,0x63,0x6F,

-	0x75,0x6E,0x74,0x65,0x72,0x20,0x3D,0x20,0x30,0x3B,0x20,0x63,0x6F,0x75,

-	0x6E,0x74,0x65,0x72,0x20,0x26,0x6C,0x74,0x3B,0x20,0x7C,0x3B,0x20,0x63,

-	0x6F,0x75,0x6E,0x74,0x65,0x72,0x2B,0x2B,0x29,0x3C,0x2F,0x43,0x4F,0x44,

-	0x45,0x3E,0x2E,0x3C,0x42,0x52,0x3E,0x0A,0x3C,0x44,0x44,0x3E,0x77,0x68,

-	0x65,0x72,0x65,0x20,0x74,0x68,0x65,0x20,0x27,0x7C,0x27,0x20,0x73,0x79,

-	0x6D,0x62,0x6F,0x6C,0x20,0x72,0x65,0x70,0x72,0x65,0x73,0x65,0x6E,0x74,

-	0x73,0x20,0x74,0x68,0x65,0x20,0x63,0x61,0x72,0x65,0x74,0x20,0x70,0x6F,

-	0x73,0x69,0x74,0x69,0x6F,0x6E,0x2C,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,

-	0x20,0x72,0x69,0x67,0x68,0x74,0x20,0x70,0x6C,0x61,0x63,0x65,0x20,0x66,

-	0x6F,0x72,0x20,0x79,0x6F,0x75,0x20,0x74,0x6F,0x20,0x61,0x64,0x64,0x20,

-	0x74,0x68,0x65,0x20,0x6D,0x61,0x78,0x69,0x6D,0x75,0x6D,0x2D,0x63,0x6F,

-	0x75,0x6E,0x74,0x20,0x66,0x69,0x67,0x75,0x72,0x65,0x2E,0x3C,0x50,0x3E,

-	0x0A,0x0A,0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x70,0x72,0x65,0x73,0x73,

-	0x20,0x74,0x68,0x65,0x20,0x27,0x3C,0x49,0x3E,0x43,0x74,0x72,0x6C,0x3C,

-	0x2F,0x49,0x3E,0x27,0x20,0x6B,0x65,0x79,0x20,0x77,0x68,0x69,0x6C,0x65,

-	0x20,0x63,0x6C,0x69,0x63,0x6B,0x69,0x6E,0x67,0x20,0x6F,0x6E,0x20,0x74,

-	0x68,0x65,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,0x20,0x6D,0x65,0x6E,

-	0x75,0x2C,0x20,0x74,0x68,0x65,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,

-	0x20,0x69,0x73,0x20,0x6E,0x6F,0x74,0x20,0x69,0x6E,0x73,0x65,0x72,0x74,

-	0x65,0x64,0x20,0x61,0x74,0x20,0x74,0x68,0x65,0x20,0x63,0x75,0x72,0x72,

-	0x65,0x6E,0x74,0x20,0x63,0x61,0x72,0x65,0x74,0x20,0x70,0x6F,0x73,0x69,

-	0x74,0x69,0x6F,0x6E,0x2C,0x20,0x62,0x75,0x74,0x20,0x69,0x73,0x20,0x63,

-	0x6F,0x70,0x69,0x65,0x64,0x20,0x74,0x6F,0x20,0x74,0x68,0x65,0x20,0x63,

-	0x6C,0x69,0x70,0x62,0x6F,0x61,0x72,0x64,0x20,0x61,0x6E,0x64,0x20,0x74,

-	0x6F,0x20,0x61,0x6E,0x20,0x69,0x6E,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,

-	0x62,0x75,0x66,0x66,0x65,0x72,0x3B,0x20,0x73,0x6F,0x20,0x79,0x6F,0x75,

-	0x20,0x63,0x61,0x6E,0x20,0x64,0x6F,0x20,0x74,0x68,0x65,0x20,0x69,0x6E,

-	0x73,0x65,0x72,0x74,0x69,0x6F,0x6E,0x20,0x65,0x6C,0x73,0x65,0x77,0x68,

-	0x65,0x72,0x65,0x2C,0x20,0x70,0x65,0x72,0x68,0x61,0x70,0x73,0x20,0x72,

-	0x65,0x70,0x65,0x61,0x74,0x6C,0x79,0x2E,0x20,0x49,0x66,0x20,0x79,0x6F,

-	0x75,0x20,0x68,0x61,0x76,0x65,0x20,0x61,0x20,0x6D,0x75,0x6C,0x74,0x69,

-	0x2D,0x6C,0x69,0x6E,0x65,0x20,0x73,0x6E,0x69,0x70,0x70,0x65,0x74,0x2C,

-	0x20,0x79,0x6F,0x75,0x20,0x73,0x68,0x6F,0x75,0x6C,0x64,0x20,0x70,0x61,

-	0x73,0x74,0x65,0x20,0x66,0x72,0x6F,0x6D,0x20,0x74,0x68,0x65,0x20,0x69,

-	0x6E,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x62,0x75,0x66,0x66,0x65,0x72,

-	0x20,0x28,0x76,0x69,0x61,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x6E,0x74,

-	0x65,0x78,0x74,0x20,0x6D,0x65,0x6E,0x75,0x29,0x2C,0x20,0x73,0x69,0x6E,

-	0x63,0x65,0x20,0x74,0x68,0x69,0x73,0x20,0x77,0x69,0x6C,0x6C,0x20,0x72,

-	0x65,0x74,0x61,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x72,0x72,

-	0x65,0x63,0x74,0x20,0x69,0x6E,0x64,0x65,0x6E,0x74,0x61,0x74,0x69,0x6F,

-	0x6E,0x2E,0x3C,0x50,0x3E,0x20,0x0A,0x0A,0x3C,0x42,0x3E,0x54,0x65,0x6D,

-	0x70,0x6C,0x61,0x74,0x65,0x20,0x43,0x6C,0x61,0x73,0x73,0x20,0x57,0x69,

-	0x7A,0x61,0x72,0x64,0x3A,0x3C,0x2F,0x42,0x3E,0x3C,0x42,0x52,0x3E,0x0A,

-	0x48,0x65,0x72,0x65,0x20,0x79,0x6F,0x75,0x20,0x63,0x61,0x6E,0x20,0x63,

-	0x72,0x65,0x61,0x74,0x65,0x20,0x74,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65,

-	0x73,0x20,0x6F,0x66,0x20,0x63,0x6C,0x61,0x73,0x73,0x65,0x73,0x20,0x74,

-	0x68,0x61,0x74,0x20,0x79,0x6F,0x75,0x20,0x6F,0x66,0x74,0x65,0x6E,0x20,

-	0x75,0x73,0x65,0x2E,0x20,0x57,0x68,0x65,0x6E,0x20,0x79,0x6F,0x75,0x20,

-	0x69,0x6E,0x73,0x65,0x72,0x74,0x20,0x6F,0x6E,0x65,0x20,0x69,0x6E,0x74,

-	0x6F,0x20,0x79,0x6F,0x75,0x72,0x20,0x63,0x6F,0x64,0x65,0x2C,0x20,0x61,

-	0x6C,0x6C,0x20,0x6F,0x63,0x63,0x75,0x72,0x72,0x65,0x6E,0x63,0x65,0x73,

-	0x20,0x6F,0x66,0x20,0x74,0x68,0x65,0x20,0x6B,0x65,0x79,0x77,0x6F,0x72,

-	0x64,0x20,0x3C,0x43,0x4F,0x44,0x45,0x3E,0x25,0x43,0x4C,0x41,0x53,0x53,

-	0x25,0x3C,0x2F,0x43,0x4F,0x44,0x45,0x3E,0x20,0x61,0x72,0x65,0x20,0x72,

-	0x65,0x70,0x6C,0x61,0x63,0x65,0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x61,

-	0x20,0x63,0x6C,0x61,0x73,0x73,0x20,0x6E,0x61,0x6D,0x65,0x20,0x74,0x68,

-	0x61,0x74,0x20,0x79,0x6F,0x75,0x20,0x65,0x6E,0x74,0x65,0x72,0x3B,0x20,

-	0x74,0x68,0x65,0x6E,0x20,0x61,0x70,0x70,0x72,0x6F,0x70,0x72,0x69,0x61,

-	0x74,0x65,0x6C,0x79,0x2D,0x6E,0x61,0x6D,0x65,0x64,0x20,0x63,0x70,0x70,

-	0x20,0x61,0x6E,0x64,0x20,0x68,0x65,0x61,0x64,0x65,0x72,0x20,0x66,0x69,

-	0x6C,0x65,0x73,0x20,0x61,0x72,0x65,0x20,0x63,0x72,0x65,0x61,0x74,0x65,

-	0x64,0x2C,0x20,0x63,0x6F,0x6E,0x74,0x61,0x69,0x6E,0x69,0x6E,0x67,0x20,

-	0x74,0x68,0x65,0x20,0x63,0x6F,0x64,0x65,0x2E,0x3C,0x42,0x52,0x3E,0x3C,

-	0x2F,0x46,0x4F,0x4E,0x54,0x3E,0x0A,0x3C,0x2F,0x42,0x4F,0x44,0x59,0x3E,

-	0x3C,0x2F,0x48,0x54,0x4D,0x4C,0x3E,0x00

-};

+static const char snipwizhtml_txt[] =
+    "<HTML><BODY BGCOLOR=\"#FFFFE6\" TEXT=\"#000000\" LINK=\"#0000FF\" "
+    "VLINK=\"#400040\" ALINK=\"#FF0000\" TOPMARGIN=\"5\" LEFTMARGIN=\"5\">\n"
+    "<FONT COLOR=\"\" SIZE=\"2\" FACE=\"Arial, Lucida Sans\">\n"
+    "<B>SnipWiz</B> is a little tool to make programmers' lives a bit "
+    "easier. It consists of two parts, the '<B><I>Snippet Wizard</I></B>' "
+    "and the '<B><I>Template Class Wizard</I></B>'.<P>\n"
+    "\n"
+    "<B>Snippet Wizard:</B><BR>\n"
+    "This holds snippets of code that you might commonly use. A snippet can "
+    "be inserted into a document from the context menu, <P>\n"
+    " \n"
+    "There are two placeholders which can be used as parameters in a "
+    "snippet.<BR>\n"
+    "<DD><B>$</B> will be replaced by the selection, if any.\n"
+    "<DD><B>@</B> will set the position where the caret should be after the "
+    "snippet has been inserted.<P>\n"
+    "\n"
+    "<DD><U>Example:</U>\n"
+    "<DD><CODE>for($ = 0; $ &lt; @; $++)</CODE>\n"
+    "<DD>Let's say you had selected the word '<CODE>counter</CODE>' This "
+    "will expand to\n"
+    "<DD><CODE>for(counter = 0; counter &lt; |; counter++)</CODE>.<BR>\n"
+    "<DD>where the '|' symbol represents the caret position, in the right "
+    "place for you to add the maximum-count figure.<P>\n"
+    "\n"
+    "If you press the '<I>Ctrl</I>' key while clicking on the snippet menu, "
+    "the snippet is not inserted at the current caret position, but is "
+    "copied to the clipboard and to an internal buffer; so you can do the "
+    "insertion elsewhere, perhaps repeatedly. If you have a multi-line "
+    "snippet, you should paste from the internal buffer (via the context "
+    "menu), since this will retain the correct indentation.<P> \n"
+    "\n"
+    "<B>Template Class Wizard:</B><BR>\n"
+    "Here you can create templates of classes that you often use. When you "
+    "insert one into your code, all occurrences of the keyword "
+    "<CODE>%CLASS%</CODE> are replaced with a class name that you enter; "
+    "then appropriately-named cpp and header files are created, containing "
+    "the code.<BR></FONT>\n"
+    "</BODY></HTML>";
diff --git a/formbuilder/tags_options_base_dlg.wxcp b/formbuilder/tags_options_base_dlg.wxcp
index 08f50764..90567ab0 100644
--- a/formbuilder/tags_options_base_dlg.wxcp
+++ b/formbuilder/tags_options_base_dlg.wxcp
@@ -1299,7 +1299,7 @@
 																				}, {
 																					"type":	"multi-string",
 																					"m_label":	"Tooltip:",
-																					"m_value":	"Allways search for 'using namespace' statements in all included files"
+																					"m_value":	"Always search for 'using namespace' statements in all included files"
 																				}, {
 																					"type":	"colour",
 																					"m_label":	"Bg Colour:",
@@ -2046,7 +2046,7 @@
 																				}, {
 																					"type":	"multi-string",
 																					"m_label":	"Tooltip:",
-																					"m_value":	"Minimun chars to type:"
+																					"m_value":	"Minimum chars to type:"
 																				}, {
 																					"type":	"colour",
 																					"m_label":	"Bg Colour:",
@@ -2086,7 +2086,7 @@
 																				}, {
 																					"type":	"multi-string",
 																					"m_label":	"Label:",
-																					"m_value":	"Minimun chars to type:"
+																					"m_value":	"Minimum chars to type:"
 																				}, {
 																					"type":	"string",
 																					"m_label":	"Wrap:",
@@ -6303,4 +6303,4 @@
 						}]
 				}]
 		}]
-}
\ No newline at end of file
+}
diff --git a/git/git.cpp b/git/git.cpp
index e398a82d..42913042 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -860,7 +860,7 @@ void GitPlugin::OnListModified(wxCommandEvent& e)
 

     if(choices.GetCount() == 0) return;

 

-    wxString choice = wxGetSingleChoice(_("Jump to modifed file"), _("Modifed files"), choices, m_topWindow);

+    wxString choice = wxGetSingleChoice(_("Jump to modified file"), _("Modified files"), choices, m_topWindow);

     if(!choice.IsEmpty()) {

         wxTreeItemId id = modifiedIDs[choice];

         if(id.IsOk()) {

@@ -1338,7 +1338,7 @@ void GitPlugin::FinishGitListAction(const gitAction& ga)
         m_trackedFiles.swap(gitFileSet);

 

     } else if(ga.action == gitListModified) {

-        m_mgr->SetStatusMessage(_("Colouring modifed git files..."), 0);

+        m_mgr->SetStatusMessage(_("Colouring modified git files..."), 0);

         // Reset modified files

         ColourFileTree(m_mgr->GetTree(TreeFileView), m_modifiedFiles, OverlayTool::Bmp_OK);

         // First get an up to date map of the filepaths/treeitemids

diff --git a/translations/codelite.pot b/translations/codelite.pot
index d7c9bfb3..8c790507 100644
--- a/translations/codelite.pot
+++ b/translations/codelite.pot
@@ -4180,11 +4180,11 @@ msgid "Reset repository"
 msgstr ""
 
 #: git/git.cpp:863
-msgid "Jump to modifed file"
+msgid "Jump to modified file"
 msgstr ""
 
 #: git/git.cpp:863
-msgid "Modifed files"
+msgid "Modified files"
 msgstr ""
 
 #: git/git.cpp:1336
@@ -4192,7 +4192,7 @@ msgid "Colouring tracked git files..."
 msgstr ""
 
 #: git/git.cpp:1341
-msgid "Colouring modifed git files..."
+msgid "Colouring modified git files..."
 msgstr ""
 
 #: git/git.cpp:1424
@@ -13793,7 +13793,7 @@ msgid "Selected Text Background Colour:"
 msgstr ""
 
 #: LiteEditor/syntaxhighlightbasedlg.cpp:374
-msgid "Use Custom Selection Forground Colour:"
+msgid "Use Custom Selection Foreground Colour:"
 msgstr ""
 
 #: LiteEditor/syntaxhighlightbasedlg.cpp:380
@@ -15098,7 +15098,7 @@ msgid "Scan all included files to locate 'using namespace' statements"
 msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:127
-msgid "Allways search for 'using namespace' statements in all included files"
+msgid "Always search for 'using namespace' statements in all included files"
 msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:132
@@ -15205,7 +15205,7 @@ msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:205
 #: LiteEditor/tags_options_base_dlg.cpp:206
-msgid "Minimun chars to type:"
+msgid "Minimum chars to type:"
 msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:211
diff --git a/translations/cs/LC_MESSAGES/cs.po b/translations/cs/LC_MESSAGES/cs.po
index cb45f8a4..39596189 100644
--- a/translations/cs/LC_MESSAGES/cs.po
+++ b/translations/cs/LC_MESSAGES/cs.po
@@ -7606,7 +7606,7 @@ msgid "Scan all included files to locate 'using namespace' statements"
 msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:136
-msgid "Allways search for 'using namespace' statements in all included files"
+msgid "Always search for 'using namespace' statements in all included files"
 msgstr ""
 
 #: LiteEditor/tags_options_base_dlg.cpp:164
diff --git a/translations/zh_CN/LC_MESSAGES/codelite.po b/translations/zh_CN/LC_MESSAGES/codelite.po
index 2bdcdc5c..ca3e48e0 100644
--- a/translations/zh_CN/LC_MESSAGES/codelite.po
+++ b/translations/zh_CN/LC_MESSAGES/codelite.po
@@ -10562,7 +10562,7 @@ msgid "Selected Text Background Colour:"
 msgstr "选择文本背景色："
 
 #: LiteEditor/syntaxhighlightbasedlg.cpp:374
-msgid "Use Custom Selection Forground Colour:"
+msgid "Use Custom Selection Foreground Colour:"
 msgstr "使用自定义选择设置前景颜色："
 
 #: LiteEditor/syntaxhighlightbasedlg.cpp:380
@@ -10899,7 +10899,7 @@ msgid "Scan all included files to locate 'using namespace' statements"
 msgstr "在全部包含的文件中查找“using namespace”声明"
 
 #: LiteEditor/tags_options_base_dlg.cpp:123
-msgid "Allways search for 'using namespace' statements in all included files"
+msgid "Always search for 'using namespace' statements in all included files"
 msgstr "总在全部包含的文件中查找“正在使用命名空间”声明"
 
 #: LiteEditor/tags_options_base_dlg.cpp:128
@@ -11010,7 +11010,7 @@ msgstr "当使用时，CodeLite 将在输入 N 字符后显示代码补全框"
 
 #: LiteEditor/tags_options_base_dlg.cpp:201
 #: LiteEditor/tags_options_base_dlg.cpp:202
-msgid "Minimun chars to type:"
+msgid "Minimum chars to type:"
 msgstr "至少键入的字符数："
 
 #: LiteEditor/tags_options_base_dlg.cpp:207
@@ -17908,11 +17908,11 @@ msgid "Are you sure that you want to discard all local changes?"
 msgstr "你确定要放弃所有本地变更？"
 
 #: git/git.cpp:841
-msgid "Jump to modifed file"
+msgid "Jump to modified file"
 msgstr "跳转到已修改文件"
 
 #: git/git.cpp:841
-msgid "Modifed files"
+msgid "Modified files"
 msgstr "已修改的文件"
 
 #: git/git.cpp:1255
@@ -17920,7 +17920,7 @@ msgid "Colouring tracked git files..."
 msgstr "着色跟踪的 git 文件..."
 
 #: git/git.cpp:1260
-msgid "Colouring modifed git files..."
+msgid "Colouring modified git files..."
 msgstr "着色已修改的 git 文件..."
 
 #: git/git.cpp:1343