Description: correct spelling errors as detected by lintian
 Correct spelling error as reported by lintian(1) in some binraries;
 meant to silence lintian(1). Along the correcting process, some
 spelling errors were also detected by hand.
Origin: vendor, Debian
Forwarded: https://github.com/texmacs/texmacs/pull/82
Comment: spelling-error-in-binary
Author: Jerome Benoit <calculus@rezozer.net>
Last-Update: 2024-08-08

--- a/src/Plugins/Pdf/PDFWriter/AbstractContentContext.cpp
+++ b/src/Plugins/Pdf/PDFWriter/AbstractContentContext.cpp
@@ -1101,7 +1101,7 @@
 
 	if(currentFont->EncodeStringForShowing(inText,fontObjectID,encodedCharactersList,writeAsCID) != PDFHummus::eSuccess)
 	{
-		TRACE_LOG("AbstractcontextContext::WriteTextCommandWithDirectGlyphSelection, Unexepcted failure, Cannot encode characters");
+		TRACE_LOG("AbstractcontextContext::WriteTextCommandWithDirectGlyphSelection, Unexpected failure, Cannot encode characters");
 		return PDFHummus::eFailure;
 	}
 	
@@ -1186,7 +1186,7 @@
 
 	if(currentFont->EncodeStringsForShowing(stringsList,fontObjectID,encodedCharachtersListsList,writeAsCID)!= PDFHummus::eSuccess)
 	{
-		TRACE_LOG("AbstractContentContext::TJ, Unexepcted failure, cannot include characters for writing final representation");
+		TRACE_LOG("AbstractContentContext::TJ, Unexpected failure, cannot include characters for writing final representation");
 		return PDFHummus::eFailure;
 	}
 	
@@ -1487,4 +1487,4 @@
     Do(GetResourcesDictionary()->AddFormXObjectMapping(result.first));
     Q();
 
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/PDFParser.cpp
+++ b/src/Plugins/Pdf/PDFWriter/PDFParser.cpp
@@ -729,7 +729,7 @@
 
 		if((ObjectIDType)idObject->GetValue() != inObjectID)
 		{
-			TRACE_LOG2("PDFParser::ParseExistingInDirectObject, failed to read object declaration, exepected ID = %ld, found %ld",
+			TRACE_LOG2("PDFParser::ParseExistingInDirectObject, failed to read object declaration, expected ID = %ld, found %ld",
 				inObjectID,idObject->GetValue());
 			break;
 		}
@@ -745,7 +745,7 @@
 
 		if((unsigned long)versionObject->GetValue() != mXrefTable[inObjectID].mRivision)
 		{
-			TRACE_LOG2("PDFParser::ParseExistingInDirectObject, failed to read object declaration, exepected version = %ld, found %ld",
+			TRACE_LOG2("PDFParser::ParseExistingInDirectObject, failed to read object declaration, expected version = %ld, found %ld",
 				mXrefTable[inObjectID].mRivision,versionObject->GetValue());
 			break;
 		}
@@ -1889,7 +1889,7 @@
 		}
 		else
 		{
-			TRACE_LOG("PDFParser::CreateInputStreamReader, filter parameter is of unkown type. only array and name are supported.");
+			TRACE_LOG("PDFParser::CreateInputStreamReader, filter parameter is of unknown type. only array and name are supported.");
 			status = PDFHummus::eFailure;
 			break;
 		}
--- a/src/Plugins/Pdf/PDFWriter/AbstractWrittenFont.cpp
+++ b/src/Plugins/Pdf/PDFWriter/AbstractWrittenFont.cpp
@@ -58,7 +58,7 @@
 	// so here the story goes:
 
 	// if all strings glyphs exist in CID representation, use it. CID gets preference, being the one that should be
-	// used at all times, once the first usage of it occured. if all included...no glyphs added, good.
+	// used at all times, once the first usage of it occurred. if all included...no glyphs added, good.
 	if(mCIDRepresentation && CanEncodeWithIncludedChars(mCIDRepresentation,inGlyphsList,outEncodedCharacters))
 	{
 		outFontObjectID = mCIDRepresentation->mWrittenObjectID;
--- a/src/Plugins/Pdf/PDFWriter/PDFDocumentHandler.cpp
+++ b/src/Plugins/Pdf/PDFWriter/PDFDocumentHandler.cpp
@@ -1011,7 +1011,7 @@
 		status = mParser->StartPDFParsing(inPDFStream, inOptions);
 		if(status != PDFHummus::eSuccess)
 		{
-			TRACE_LOG("PDFDocumentHandler::StartCopyingContext, failure occured while parsing PDF file.");
+			TRACE_LOG("PDFDocumentHandler::StartCopyingContext, failure occurred while parsing PDF file.");
 			break;
 		}
 
--- a/src/Plugins/Pdf/PDFWriter/PDFParserTokenizer.h
+++ b/src/Plugins/Pdf/PDFWriter/PDFParserTokenizer.h
@@ -45,7 +45,7 @@
 
 	// Get the next avialable PDF token. return result returns whether
 	// token retreive was successful and the token. Token retrieval may be unsuccesful if
-	// the end of file was reached and no token was recorded, or if read failure occured.
+	// the end of file was reached and no token was recorded, or if read failure occurred.
 	// tokens may be:
 	// 1. Comments
 	// 2. Strings (hex or literal)
--- a/src/Plugins/Pdf/PDFWriter/CIDFontWriter.cpp
+++ b/src/Plugins/Pdf/PDFWriter/CIDFontWriter.cpp
@@ -103,7 +103,7 @@
 		mObjectsContext->WriteNewIndirectObjectReference(descendantFontID);
 		mObjectsContext->EndArray(eTokenSeparatorEndLine);
 
-		CalculateCharacterEncodingArray(); // put the charachter in the order of encoding, for the ToUnicode map
+		CalculateCharacterEncodingArray(); // put the character in the order of encoding, for the ToUnicode map
 
 		// ToUnicode
 		if (mCharactersVector.size() > 1) {
@@ -156,7 +156,7 @@
 
 void CIDFontWriter::CalculateCharacterEncodingArray()
 {
-	// first we need to sort the fonts charachters by character code
+	// first we need to sort the fonts characters by character code
 	UIntToGlyphEncodingInfoMap::iterator it = mFontOccurrence->mGlyphIDToEncodedChar.begin();
 
 	for(; it != mFontOccurrence->mGlyphIDToEncodedChar.end();++it)
--- a/src/Plugins/Pdf/PDFWriter/FreeTypeFaceWrapper.cpp
+++ b/src/Plugins/Pdf/PDFWriter/FreeTypeFaceWrapper.cpp
@@ -438,7 +438,7 @@
 {
 	if(mFace)
 	{
-		// loop charachters in font, till you find a non Adobe Standard Latin. hmm. seems like this method marks all as symbol...
+		// loop characters in font, till you find a non Adobe Standard Latin. hmm. seems like this method marks all as symbol...
 		// need to think about this...
 		bool hasOnlyAdobeStandard = true;
 		FT_ULong characterCode;
@@ -460,7 +460,7 @@
 bool FreeTypeFaceWrapper::IsCharachterCodeAdobeStandard(FT_ULong inCharacterCode)
 {
 	// Comparing character code to unicode value of codes in Adobe Standard Latin
-	if(inCharacterCode < 0x20) // ignore control charachters
+	if(inCharacterCode < 0x20) // ignore control characters
 		return true;
 
 	if(betweenIncluding<FT_ULong>(inCharacterCode,0x20,0x7E))
@@ -603,7 +603,7 @@
 				glyphIndex =  FT_Get_Char_Index(mFace,charCode);
 				if(0 == glyphIndex)
 				{
-					TRACE_LOG1("FreeTypeFaceWrapper::GetGlyphsForUnicodeText, failed to find glyph for charachter 0x%04x",*it);
+					TRACE_LOG1("FreeTypeFaceWrapper::GetGlyphsForUnicodeText, failed to find glyph for character 0x%04x",*it);
 					status = PDFHummus::eFailure;
 				}
 			}
--- a/src/Plugins/Pdf/PDFWriter/IWrittenFont.h
+++ b/src/Plugins/Pdf/PDFWriter/IWrittenFont.h
@@ -44,7 +44,7 @@
 
 	/*
 		recieve a list of glyphs (and reference text, which can be ignored),
-		and return an encoded list of charactrs to represent them. Also return if each charachter is single byte or multi (dbl) byte.
+		and return an encoded list of charactrs to represent them. Also return if each character is single byte or multi (dbl) byte.
 		this chap simply states whether this is non CID or CID. last but not least - return the object ID for the font, so that 
 		the using content can refer to it
 	*/
--- a/src/Plugins/Pdf/PDFWriter/InputPFBDecodeStream.cpp
+++ b/src/Plugins/Pdf/PDFWriter/InputPFBDecodeStream.cpp
@@ -280,7 +280,7 @@
 		}
 
 		// now read token until it's done. there are some special cases detemining when a token is done
-		// based on the first charachter of the token [literal string, hex string , comment]
+		// based on the first character of the token [literal string, hex string , comment]
 		
 		if(GetNextByteForToken(buffer) != PDFHummus::eSuccess)
 		{
@@ -311,7 +311,7 @@
 
 			case '(':
 			{
-				// for a string, the token goes on until the balanced-closing right paranthesis
+				// for a string, the token goes on until the balanced-closing right parenthesis
 				int balanceLevel = 1;
 				bool backSlashEncountered = false;
 				while(balanceLevel > 0 && IsSegmentNotEnded())
@@ -607,4 +607,4 @@
 EStatusCode InputPFBDecodeStream::GetInternalState()
 {
 	return mInternalState;
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/PDFName.h
+++ b/src/Plugins/Pdf/PDFWriter/PDFName.h
@@ -34,7 +34,7 @@
 		eType = ePDFObjectName
 	};
 
-	// value must be the already interpreted name - no initial slash, and all special charachters (with # definition) interpreted
+	// value must be the already interpreted name - no initial slash, and all special characters (with # definition) interpreted
 	PDFName(const std::string& inValue);
 	virtual ~PDFName(void);
 
--- a/src/Plugins/Pdf/PDFWriter/PDFTextString.h
+++ b/src/Plugins/Pdf/PDFWriter/PDFTextString.h
@@ -24,7 +24,7 @@
 	encodes a double byte Unicode text to a PDF text string, 
 	either using PDFDocEncoded or UTF-16BE encoded string with a leading byte order marker. 
 	if possible, the string is encoded using PDFDocEncoded. otherwise UTF16BE is used.
-	when encoding, it is made sure that all charachters that require escaping, get escaped.
+	when encoding, it is made sure that all characters that require escaping, get escaped.
 */
 
 #include "OutputStringBufferStream.h"
--- a/src/Plugins/Pdf/PDFWriter/PrimitiveObjectsWriter.cpp
+++ b/src/Plugins/Pdf/PDFWriter/PrimitiveObjectsWriter.cpp
@@ -113,7 +113,7 @@
 void PrimitiveObjectsWriter::WriteLiteralString(const std::string& inString,ETokenSeparator inSeparate)
 {
 	mStreamForWriting->Write(scLeftParanthesis,1);
-	// doing some string conversion, so that charachters are written as safe ones.
+	// doing some string conversion, so that characters are written as safe ones.
 	IOBasicTypes::Byte buffer[5];
 	std::string::const_iterator it = inString.begin();
 	for(;it != inString.end();++it)
--- a/src/Plugins/Pdf/PDFWriter/WrittenFontCFF.cpp
+++ b/src/Plugins/Pdf/PDFWriter/WrittenFontCFF.cpp
@@ -96,7 +96,7 @@
 
 	if(it == mANSIRepresentation->mGlyphIDToEncodedChar.end())
 	{
-		// as a default position, i'm grabbing the ansi bits. this should display nice charachters, when possible
+		// as a default position, i'm grabbing the ansi bits. this should display nice characters, when possible
 		unsigned char encoding;
 		if(inCharacters.size() > 0)
 			encoding = (unsigned char)(inCharacters.back() & 0xff);
--- a/src/Plugins/Pdf/PDFWriter/AbstractContentContext.h
+++ b/src/Plugins/Pdf/PDFWriter/AbstractContentContext.h
@@ -317,7 +317,7 @@
 	// Low level setting of font. for the high level version, see below
 	void TfLow(const std::string& inFontName,double inFontSize); 
 
-	// first version of Tj writes the string in literal string paranthesis, 
+	// first version of Tj writes the string in literal string parenthesis,
 	// second version of Tj writes the string in hex string angle brackets
 	void TjLow(const std::string& inText);
 	void TjHexLow(const std::string& inText); 
--- a/src/Plugins/Pdf/PDFWriter/PDFLiteralString.h
+++ b/src/Plugins/Pdf/PDFWriter/PDFLiteralString.h
@@ -35,7 +35,7 @@
 		eType = ePDFObjectLiteralString
 	};
 
-	// Value is the interpreted string (no enclosing paranthesis and escaped sequances as the result values)
+	// Value is the interpreted string (no enclosing parenthesis and escaped sequances as the result values)
 	PDFLiteralString(const std::string& inValue);
 	virtual ~PDFLiteralString(void);
 
--- a/src/Plugins/Pdf/PDFWriter/PDFObjectParser.cpp
+++ b/src/Plugins/Pdf/PDFWriter/PDFObjectParser.cpp
@@ -285,12 +285,12 @@
 	Byte buffer;
 	std::string::const_iterator it = inToken.begin();
 	size_t i=1;
-	++it; // skip first paranthesis
+	++it; // skip first parenthesis
 	
 	// verify that last character is ')'
 	if(inToken.at(inToken.size()-1) != scRightParanthesis)
 	{
-		TRACE_LOG1("PDFObjectParser::ParseLiteralString, exception in parsing literal string, no closing paranthesis, Expression: %s",inToken.substr(0, MAX_TRACE_SIZE - 200).c_str());
+		TRACE_LOG1("PDFObjectParser::ParseLiteralString, exception in parsing literal string, no closing parenthesis, Expression: %s",inToken.substr(0, MAX_TRACE_SIZE - 200).c_str());
 		return NULL;
 	}
 
@@ -706,4 +706,4 @@
 void PDFObjectParser::SetParserExtender(IPDFParserExtender* inParserExtender)
 {
 	mParserExtender = inParserExtender;
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/PDFParserTokenizer.cpp
+++ b/src/Plugins/Pdf/PDFWriter/PDFParserTokenizer.cpp
@@ -120,7 +120,7 @@
 
 			case '(':
 			{
-				// for a literal string, the token goes on until the balanced-closing right paranthesis
+				// for a literal string, the token goes on until the balanced-closing right parenthesis
 				int balanceLevel = 1;
 				bool backSlashEncountered = false;
 				while(balanceLevel > 0 && mStream->NotEnded())
@@ -395,4 +395,4 @@
 LongFilePositionType PDFParserTokenizer::GetRecentTokenPosition()
 {
 	return mRecentTokenPosition;
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/Type1Input.cpp
+++ b/src/Plugins/Pdf/PDFWriter/Type1Input.cpp
@@ -904,7 +904,7 @@
 	Byte buffer;
 	std::string::const_iterator it = inPSString.begin();
 	size_t i=1;
-	++it; // skip first paranthesis
+	++it; // skip first parenthesis
 	
 	for(; i < inPSString.size()-1;++it,++i)
 	{
@@ -970,4 +970,4 @@
 		return 0;
 	else
 		return it->second;
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/PDFObject.h
+++ b/src/Plugins/Pdf/PDFWriter/PDFObject.h
@@ -44,7 +44,7 @@
         ePDFObjectDictionary,
         ePDFObjectIndirectObjectReference,
         ePDFObjectStream,
-        ePDFObjectSymbol // symbol is parallel to unkown. mostly be a keyword, or simply a mistake in the file
+        ePDFObjectSymbol // symbol is parallel to unknown. mostly be a keyword, or simply a mistake in the file
     };    
     
 	PDFObject(EPDFObjectType inType); 
--- a/src/Plugins/Pdf/PDFWriter/ANSIFontWriter.cpp
+++ b/src/Plugins/Pdf/PDFWriter/ANSIFontWriter.cpp
@@ -90,7 +90,7 @@
 
 		/*
 			as for widths.
-			i have to create a list/array of the characters ordered from lowest encoded value to highest, and fill it up with the charachters mapped
+			i have to create a list/array of the characters ordered from lowest encoded value to highest, and fill it up with the characters mapped
 			to glyphs. this will allow me to later write the highest and lowest char codes, as well as loop the list and 
 			write the widths.
 		*/
@@ -144,7 +144,7 @@
 
 void ANSIFontWriter::CalculateCharacterEncodingArray()
 {
-	// first we need to sort the fonts charachters by character code
+	// first we need to sort the fonts characters by character code
 	UIntToGlyphEncodingInfoMap::iterator it = mFontOccurrence->mGlyphIDToEncodedChar.begin();
 
 	for(; it != mFontOccurrence->mGlyphIDToEncodedChar.end();++it)
@@ -193,7 +193,7 @@
 
 void ANSIFontWriter::CalculateDifferences()
 {
-	// go over the encoded charachters. find differences from WinAnsiEncoding.
+	// go over the encoded characters. find differences from WinAnsiEncoding.
 	// whenever glyph name is different, add to differences array
 	WinAnsiEncoding winAnsiEncoding;
 
@@ -391,4 +391,4 @@
 		}
 	}
 	inWriter->Write(scEntryEnding,2);
-}
\ No newline at end of file
+}
--- a/src/Plugins/Pdf/PDFWriter/CFFFileInput.cpp
+++ b/src/Plugins/Pdf/PDFWriter/CFFFileInput.cpp
@@ -1152,11 +1152,11 @@
 EStatusCode CFFFileInput::Type2Endchar(const CharStringOperandList& inOperandList)
 {
 	// i'm using EndChar here to check the depracated usage, which creates
-	// dependency on another charachter. as for finalizing the intepretation, i don't
+	// dependency on another character. as for finalizing the intepretation, i don't
 	// need to do anything here, and just make sure to pop the whole dependency stack
 	// in the interpretation calling method.
 
-	if(inOperandList.size() >= 4) // meaning it's got the depracated seac usage. 2 topmost charachters on the stack are charachter codes of off StandardEncoding
+	if(inOperandList.size() >= 4) // meaning it's got the depracated seac usage. 2 topmost characters on the stack are character codes of off StandardEncoding
 	{
 		CharStringOperandList::const_reverse_iterator it = inOperandList.rbegin();
 		Byte characterCode1,characterCode2;
--- a/src/Plugins/Pdf/PDFWriter/CharStringType2Flattener.h
+++ b/src/Plugins/Pdf/PDFWriter/CharStringType2Flattener.h
@@ -33,7 +33,7 @@
 	~CharStringType2Flattener(void);
 
 	// will write a font program to another stream, flattening the references to subrs and gsubrs, so that
-	// the charstring becomes independent (with possible references to other charachters through seac-like endchar)
+	// the charstring becomes independent (with possible references to other characters through seac-like endchar)
 	PDFHummus::EStatusCode WriteFlattenedGlyphProgram(unsigned short inFontIndex, unsigned short inGlyphIndex, CFFFileInput* inCFFFileInput, IByteWriter* inWriter);
 
 	// IType2InterpreterImplementation implementation
--- a/src/Plugins/Pdf/PDFWriter/DocumentContext.cpp
+++ b/src/Plugins/Pdf/PDFWriter/DocumentContext.cpp
@@ -1917,7 +1917,7 @@
 		BoolAndString encodedResult = encoding.Encode(inURL);
 		if(!encodedResult.first)
 		{
-			TRACE_LOG1("DocumentContext::WriteAnnotationAndLinkForURL, unable to encode string to Ascii7. make sure that all charachters are valid URLs [should be ascii 7 compatible]. URL - %s",inURL.c_str());
+			TRACE_LOG1("DocumentContext::WriteAnnotationAndLinkForURL, unable to encode string to Ascii7. make sure that all characters are valid URLs [should be ascii 7 compatible]. URL - %s",inURL.c_str());
 			break;
 		}
 
--- a/TeXmacs/packages/customize/spacing/old-spacing.ts
+++ b/TeXmacs/packages/customize/spacing/old-spacing.ts
@@ -7,7 +7,7 @@
     <src-package-dtd|old-spacing|1.0|old-spacing|1.0>
 
     <\src-purpose>
-      Mimick spacing of TeXmacs version 1.99.6 and below.
+      Mimic spacing of TeXmacs version 1.99.6 and below.
     </src-purpose>
 
     <src-copyright|2018|Joris van der Hoeven>
@@ -35,4 +35,4 @@
   <\collection>
     <associate|preamble|true>
   </collection>
-</initial>
\ No newline at end of file
+</initial>
--- a/TeXmacs/progs/generic/document-style.scm
+++ b/TeXmacs/progs/generic/document-style.scm
@@ -311,7 +311,7 @@
 
   ("centered-program"   "Use a centered rendering style for algorithms")
   ("framed-program"     "Display algorithms inside frames and center")
-  ("cite-author-year"   "Mimick 'natbib' package from LaTeX")
+  ("cite-author-year"   "Mimic 'natbib' package from LaTeX")
   ("cite-sort"          "Package for sorting lists of citations")
   ("two-columns"        "Markup and adjustments for two column documents")
   ("compact-list"       "Less indentation and vertical spacing for lists")
--- a/TeXmacs/progs/doc/apidoc.scm
+++ b/TeXmacs/progs/doc/apidoc.scm
@@ -135,7 +135,7 @@
           ((== type "module")
            (if (== what "") (replace "Help - Browse all modules")
                (replace "Help - Documentation for module %1" what)))
-          (else (replace "Help - Unknow request")))))
+          (else (replace "Help - Unknown request")))))
 
 (tmfs-permission-handler (apidoc name type) #t)
 
--- a/TeXmacs/progs/client/client-widgets.scm
+++ b/TeXmacs/progs/client/client-widgets.scm
@@ -74,7 +74,7 @@
 	(aligned
 	  (item (toggle (set-password? answer) use-password?)
 	    (hlist
-	      // (text "Allow authentification through password"))))
+	      // (text "Allow authentication through password"))))
 	===
 	(refreshable "password-info"
 	  (when use-password?
@@ -88,7 +88,7 @@
 	  (aligned
 	    (item (toggle (set-key? answer) use-key?)
 	      (hlist
-		// (text "Allow authentification through cryptographic key")))))
+		// (text "Allow authentication through cryptographic key")))))
 	===
 	(refreshable "key-info"
 	  (when use-key?
@@ -101,7 +101,7 @@
 	     (for-each (cut ahash-set! t <> <>) (form-fields) (form-values))
 	     (cond ((not (or use-password? use-key?))
 		    (open-error
-		     "Please enable at least one authentification method"))
+		     "Please enable at least one authentication method"))
 		   ((and use-password? (!= (ahash-ref t "password")
 					   (ahash-ref t "repeat")))
 		    (open-error "Passwords do not match"))
--- a/TeXmacs/langs/natural/dic/english-ukrainian.scm
+++ b/TeXmacs/langs/natural/dic/english-ukrainian.scm
@@ -93,8 +93,8 @@
 ("all data attached to this identity will be lost" "всі дані, повʼязані з цією особою, будуть втрачені")
 ("allow" "дозволити")
 ("allow all link types to be followed." "Дозволити слідування всім типам посилань.")
-("allow authentification through cryptographic key" "дозволити автентифікацію за допомогою криптографічного ключа")
-("allow authentification through password" "дозволити автентифікацію за допомогою пароля")
+("allow authentication through cryptographic key" "дозволити автентифікацію за допомогою криптографічного ключа")
+("allow authentication through password" "дозволити автентифікацію за допомогою пароля")
 ("allow/disallow the position @what for innermost float." "Дозволити/заборонити позицію @what для найвнутрішнішого плаваючого обʼєкта.")
 ("allowed extension" "дозволене розширення")
 ("allowed page height extension" "дозволене розширення висоти сторінки")
--- a/TeXmacs/progs/version/version-git.scm
+++ b/TeXmacs/progs/version/version-git.scm
@@ -362,7 +362,7 @@
      ($when s
        ($tmfs-title "Git Status")
        ($description-long
-         ($describe-item "Changes to be commited"
+         ($describe-item "Changes to be committed"
            ($for (x s)
              ($with (status file) x
                ($staged-file status file))))
--- a/TeXmacs/progs/convert/html/htmltm-test.scm
+++ b/TeXmacs/progs/convert/html/htmltm-test.scm
@@ -116,7 +116,7 @@
    "htmltm, preformatted text" "pre"
    shtml->stm code
    (test "empty" '(pre) '(""))
-   (test "emtpy, newlines" '(pre "\n\n") '(""))
+   (test "empty, newlines" '(pre "\n\n") '(""))
    (test "one line" '(pre "hello") '("hello"))
    (test "one line, whitespace" '(pre " hello ") '(" hello "))
    (test "one line, newlines" '(pre "\n hello \n") '(" hello "))
@@ -174,7 +174,7 @@
    shtml->stm make-description
    (test "empty list" '(dl) '(""))
    (test "empty dt" '(dl (dt)) '((item* "")))
-   (test "emtpy dd" '(dl (dd)) '(""))
+   (test "empty dd" '(dl (dd)) '(""))
    (test "empty dt, dd" '(dl (dt) (dd)) '((item* "")))
    (test "empty dd, dt" '(dl (dd) (dt)) '("" (item* "")))
    (test "empty dt, dt, dd, dd"
@@ -528,9 +528,9 @@
          '(img (@ (src "foo") (width "50%")))
          (image "foo" "1/2par" ""))))
 
-(define (regtest-htmltm-alignement)
+(define (regtest-htmltm-alignment)
   (regression-test-group
-   "htmltm, alignement" "alignement"
+   "htmltm, alignment" "alignment"
    shtml->stm :none
    ))
 
@@ -844,7 +844,7 @@
               ;(regtest-htmltm-table)
               (regtest-htmltm-links)
               (regtest-htmltm-objects)
-              (regtest-htmltm-alignement)
+              (regtest-htmltm-alignment)
               (regtest-htmltm-style)
               (regtest-htmltm-font)
               (regtest-htmltm-rules)
--- a/TeXmacs/progs/convert/coq/vernacout.scm
+++ b/TeXmacs/progs/convert/coq/vernacout.scm
@@ -137,7 +137,7 @@
 	((== (car x) '!linefeed)  (vernacout-linefeed))
 	((== (car x) '!indent)    (vernacout-indent (cadr x)))
 	((== (car x) '!unindent)  (vernacout-unindent (cadr x)))
-	(else (display* "TeXmacs] bad formated stree:\n" x "\n"))))
+	(else (display* "TeXmacs] bad formatted stree:\n" x "\n"))))
 
 (tm-define (serialize-vernac x)
   (vernacout-initialize)
--- a/src/Plugins/Pdf/PDFWriter/FreeTypeOpenTypeWrapper.cpp
+++ b/src/Plugins/Pdf/PDFWriter/FreeTypeOpenTypeWrapper.cpp
@@ -253,7 +253,7 @@
 unsigned int FreeTypeOpenTypeWrapper::GetGlyphForUnicodeChar(unsigned long inChar)
 {
     (void) inChar;
-    // emtpy implementation (always false at "GetPrivateEncoding")
+    // empty implementation (always false at "GetPrivateEncoding")
     return 0;
 }
 
--- a/TeXmacs/progs/convert/images/tmimage.scm
+++ b/TeXmacs/progs/convert/images/tmimage.scm
@@ -311,7 +311,7 @@
              tm-fragment)
           tm-fragment))
 ;because of bug #63404 we can't simply always use document-at for formating 
-      (tm-fragment-formated
+      (tm-fragment-formatted
         (if needbaseline
           ;; if needbaseline insert fragment in table having a background
 
@@ -342,7 +342,7 @@
 
 ;; step 2 generate output according to desired output format
 
-    (extents (print-snippet myurl (stree->tree tm-fragment-formated) #t)); scale))
+    (extents (print-snippet myurl (stree->tree tm-fragment-formatted) #t)); scale))
 ;; compute relative position of baseline from returned box dimensions  see tmhtml.scm
     (height (- (fourth extents) (second extents)))
     (relbaseline (if needbaseline (number->string (exact->inexact (/ (- (sixth extents)) height))) "0.0"))
--- a/plugins/r/r/TeXmacs/R/TeXmacs.R
+++ b/plugins/r/r/TeXmacs/R/TeXmacs.R
@@ -371,7 +371,7 @@
 # the following will allow you to edit a function inside TeXmacs.
 t.edit = structure( function(x) { # Edit an R object inside TeXmacs, with nice formating.
 	### Before TeXmacs had syntax highlighting for R, this function was a way to edit 
-	### an R object formated nicely. 
+	### an R object formatted nicely.
 	### The object is inserted into the input field of TeXmacs, so that it is easy to edit.
     cat( DATA_BEGIN,"input#",sep="")    
     cat( DATA_BEGIN,"texmacs: ",sep="")    
--- a/plugins/r/r/TeXmacs/man/t.edit.Rd
+++ b/plugins/r/r/TeXmacs/man/t.edit.Rd
@@ -2,7 +2,7 @@
 \alias{t.edit}
 \title{Edit an R object inside TeXmacs, with nice formating.}
 \description{Before TeXmacs had syntax highlighting for R, this function was a way to edit 
-an R object formated nicely. 
+an R object formatted nicely.
 The object is inserted into the input field of TeXmacs, so that it is easy to edit.}
 \usage{\method{t}{edit}(x)}
 \arguments{
--- a/plugins/scilab/bin/tmstree.sci
+++ b/plugins/scilab/bin/tmstree.sci
@@ -19,7 +19,7 @@
   // a: is a Scilab variable
   //
   // Description
-  // Taking a variable, the tmstree function will provide a formated
+  // Taking a variable, the tmstree function will provide a formatted
   // representation of it as a TeXmacs Scheme tree.
   // The following types are handled by this function:
   //  <itemizedlist>
--- a/TeXmacs/progs/kernel/texmacs/tm-modes.scm
+++ b/TeXmacs/progs/kernel/texmacs/tm-modes.scm
@@ -239,7 +239,7 @@
   (in-japanese% (== (get-env "language") "japanese") in-oriental%)
   (in-korean% (== (get-env "language") "korean") in-oriental%)
   (in-polish% (== (get-env "language") "polish") in-text%)
-  (in-portugese% (== (get-env "language") "portugese") in-text%)
+  (in-portuguese% (== (get-env "language") "portuguese") in-text%)
   (in-romanian% (== (get-env "language") "romanian") in-text%)
   (in-russian% (== (get-env "language") "russian") in-cyrillic%)
   (in-slovak% (== (get-env "language") "slovak") in-text%)
--- a/TeXmacs/progs/kernel/library/list.scm
+++ b/TeXmacs/progs/kernel/library/list.scm
@@ -38,7 +38,7 @@
   `(set! ,sym (rcons ,sym ,x)))
 
 (define-public (list-concatenate ls)
-  "Append the elements of @ls toghether."
+  "Append the elements of @ls together."
   ;; WARNING: not portable for long lists
   (apply append ls))
 
--- a/TeXmacs/progs/kernel/library/base.scm
+++ b/TeXmacs/progs/kernel/library/base.scm
@@ -129,7 +129,7 @@
     tm-char-whitespace?)))
 
 (provide-public (string-concatenate ss)	; srfi-13
-  "Append the elements of @ss toghether."
+  "Append the elements of @ss together."
   ;; WARNING: not portable for long lists
   (apply string-append ss))
 
--- a/plugins/eukleides/progs/eukleides-figures-menu.scm
+++ b/plugins/eukleides/progs/eukleides-figures-menu.scm
@@ -37,7 +37,7 @@
 (menu-bind eukleides-figures-menu
 
 ;  (->"Figures"
-	  (->"Detailled examples"
+	  (->"Detailed examples"
 		(group "Triangles")
 
 		("Triangle" 
--- a/TeXmacs/langs/natural/dic/english-croatian.scm
+++ b/TeXmacs/langs/natural/dic/english-croatian.scm
@@ -87,8 +87,8 @@
 ("all data attached to this identity will be lost" "svi podaci vezani uz ovaj identitet bit e izgubljeni")
 ("all saved passphrases will be lost forever" "sve spremljene zaporke bit e nepovratno izgubljene")
 ("allow" "dopusti")
-("allow authentification through cryptographic key" "dopusti autentifikaciju pomou kriptografskog kljua")
-("allow authentification through password" "dopusti autentifikaciju pomou zaporke")
+("allow authentication through cryptographic key" "dopusti autentifikaciju pomou kriptografskog kljua")
+("allow authentication through password" "dopusti autentifikaciju pomou zaporke")
 ("allow for macro definitions in preamble" "dopusti definicije makroa u preambuli")
 ("allow multiple spaces" "dopusti viestruke razmake")
 ("allow spurious spaces" "dopusti lane razmake")
--- a/TeXmacs/progs/convert/coq/scmcoqml.scm
+++ b/TeXmacs/progs/convert/coq/scmcoqml.scm
@@ -95,7 +95,7 @@
 ;; This implementation is partial. 
 ;; Only intended for outputing values toward Coq.
 (define (stree->coqml-stree t)
-  (with (node proc childs)
+  (with (node proc children)
     (cond ((bool? t)         (list #f      bool->xml-stree         #f))
           ((pair? t)         (list #f      pair->xml-stree         #f))
           ((union? t)        (list #f      union->xml-stree        #f))
@@ -108,10 +108,10 @@
           ((unit? t)         (list 'unit   #f                      #f))
           ((list? t)         (list 'list   stree->coqml-stree      #t))
           (else '(#f #f #f)))
-    (cond ((and (not node) proc)        (proc t))
-          ((and node (not proc))        `(,node))
-          ((and node proc (not childs)) `(,node ,(proc t)))
-          ((and node proc childs)       `(,node ,@(map proc t)))
+    (cond ((and (not node) proc)          (proc t))
+          ((and node (not proc))          `(,node))
+          ((and node proc (not children)) `(,node ,(proc t)))
+          ((and node proc children)       `(,node ,@(map proc t)))
           (else
             `(error ,(string-append "stree->coqml: cannot translate "
                                     (object->string t)))))))
--- a/src/Data/Convert/Texmacs/upgradetm.cpp
+++ b/src/Data/Convert/Texmacs/upgradetm.cpp
@@ -3562,7 +3562,7 @@
 }
 
 array<tree>
-get_childs_by_name (tree t, string s) {
+get_children_by_name (tree t, string s) {
   array<tree> r = array<tree>();
   if (!is_atomic (t))
     for (int i = 0 ; i < N(t) ; i++) {
@@ -3575,11 +3575,11 @@
 upgrade_cyrillic (tree t) {
   bool cyrillic = false;
   array<tree> initial, collection, associate;
-  initial = get_childs_by_name (t, "initial");
+  initial = get_children_by_name (t, "initial");
   for (int i = 0 ; i < N(initial) ; i++){
-    collection = get_childs_by_name (initial[i], "collection");
+    collection = get_children_by_name (initial[i], "collection");
     for (int j = 0 ; j < N(collection) ; j++){
-      associate = get_childs_by_name (collection[j], "associate");
+      associate = get_children_by_name (collection[j], "associate");
       for (int k = 0 ; k < N(associate) ; k++) {
         if (is_func(associate[k], ASSOCIATE, 2) && associate[k][0] == "font")
           cyrillic = (associate[k][1] == "cyrillic");