From e584c474296ae6403ed71b3ede263347d42eea04 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sat, 14 May 2016 13:14:22 +0200 Subject: [PATCH] Fix several typos --- PowerEditor/installer/nativeLang/french.xml | 2 +- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp | 4 ++-- PowerEditor/src/langs.model.xml | 2 +- PowerEditor/src/stylers.model.xml | 4 ++-- README.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 81c42828..752f2263 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -851,7 +851,7 @@ - + diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index aed32627..d3f72a49 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -5775,7 +5775,7 @@ Quote quotes[nbQuote] = {"Anonymous #44", "The first 5 days after the weekend are always the hardest."}, {"Anonymous #45", "Rhinos are just fat unicorns."}, {"Anonymous #46", "Sometimes when I'm writing Javascript I want to throw up my hands and say \"this is bullshit!\"\nbut I can never remember what \"this\" refers to."}, - {"Anonymous #47", "Kids are like fart.\nYou can only stand yours."}, + {"Anonymous #47", "Kids are like farts.\nYou can only stand yours."}, {"Anonymous #48", "If you were born in Israel, you'd probably be Jewish.\nIf you were born in Saudi Arabia, you'd probably be Muslim.\nIf you were born in India, you'd probably be Hindu.\nBut because you were born in North America, you're Christian.\nYour faith is not inspired by some divine, constant truth.\nIt's simply geography."}, {"Anonymous #49", "There are 2 types of people in this world:\nPeople who say they pee in the shower, and the dirty fucking liars."}, {"Anonymous #50", "London 2012 Olympic Games - A bunch of countries coming across the ocean to put their flags in britain and try to get a bunch of gold... it's like history but opposite."}, diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index e0c4bfdf..8d89cf92 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -981,8 +981,8 @@ void ScintillaEditView::setJsLexer() basic_string kwlW = pKwArray[LANG_INDEX_INSTR]; keywordListInstruction = wstring2string(kwlW, CP_ACP); } - const char *jsEmbbededInstrs = getCompleteKeywordList(keywordListInstruction, L_JS, LANG_INDEX_INSTR); - execute(SCI_SETKEYWORDS, 0, (LPARAM)jsEmbbededInstrs); + const char *jsEmbeddedInstrs = getCompleteKeywordList(keywordListInstruction, L_JS, LANG_INDEX_INSTR); + execute(SCI_SETKEYWORDS, 0, (LPARAM)jsEmbeddedInstrs); } execute(SCI_SETPROPERTY, reinterpret_cast("fold"), reinterpret_cast("1")); diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index bc532c50..7b65cd9c 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -115,7 +115,7 @@ instanceof assert if else switch case default break goto return for while do continue new throw throws try catch finally this super extends implements import true false null package transient strictfp void char short int long double float const static volatile byte boolean class interface native private protected public final abstract synchronized enum - + abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends final finally float for from function goto if implements import in instanceof int interface let long native new null of package private protected public return short static super switch synchronized this throw throws transient try typeof var void volatile while with true false prototype diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 31bd3722..6cdca812 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -406,7 +406,7 @@ - + @@ -419,7 +419,7 @@ - + diff --git a/README.md b/README.md index 8994ed61..09e2a6a8 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ like to debug Notepad++, but don't have boost. ## To build `notepad++.exe`: - 1. Open [`PowerEditor\visual.net\notepadPlus.vcproj`](https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/visual.net/notepadPlus.vcxproj) + 1. Open [`PowerEditor\visual.net\notepadPlus.vcxproj`](https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/PowerEditor/visual.net/notepadPlus.vcxproj) 2. Build Notepad++ [like a normal Visual Studio project](https://msdn.microsoft.com/en-us/library/7s88b19e.aspx).