From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Sat, 7 Jul 2012 11:40:07 +0000 (+0200)
Subject: tex2lyx/text.cpp: fix typos
X-Git-Tag: 2.1.0beta1~1671
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4e69b9bac5e970572b9cf9169e3db9060c47e3b6;p=lyx.git

tex2lyx/text.cpp: fix typos
---

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 62d5e8df9e..b3604b77f5 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -119,7 +119,7 @@ char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
 
 /**
  * supported CJK encodings
- * SJIS anf Bg5 cannot be supported as this is not
+ * SJIS and Bg5 cannot be supported as they are not
  * supported by iconv
  * JIS does not work with LyX's encoding conversion
  */
@@ -1431,7 +1431,7 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 		// store the encoding to be able to reset it
 		string const encoding_old = p.getEncoding();
 		string const encoding = p.getArg('{', '}');
-		// SJIS and Bg5 cammopt be handled by iconv
+		// SJIS and Bg5 cannot be handled by iconv
 		// JIS does not work with LyX's encoding conversion
 		if (encoding != "Bg5" && encoding != "JIS" && encoding != "SJIS")
 			p.setEncoding(encoding);