From 9e0bf8b63a107b663bb79c0c40293d265ed8dd02 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 1 Sep 2013 13:11:06 +0000 Subject: [PATCH] [UPDATE] Rename "block comment" to "Single line comment" and "stream comment" to "block comment". [UPDATE] Remove invalid command "Online Documentation". git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1105 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nativeLang/english.xml | 10 +++++----- .../installer/nativeLang/english_customizable.xml | 10 +++++----- PowerEditor/src/Notepad_plus.rc | 12 ++++++------ PowerEditor/src/langs.model.xml | 5 ++--- scintilla/win32/ScintRes.rc | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 6159f2ded..efeb3a712 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -100,9 +100,9 @@ - - - + + + @@ -129,8 +129,8 @@ - - + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index 887540643..c23eb7180 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -100,9 +100,9 @@ - - - + + + @@ -129,8 +129,8 @@ - - + + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 383a2efbd..3ac33e012 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -268,11 +268,11 @@ BEGIN END POPUP "Comment/Uncomment" BEGIN - MENUITEM "Toggle Block Comment", IDM_EDIT_BLOCK_COMMENT - MENUITEM "Block Comment", IDM_EDIT_BLOCK_COMMENT_SET - MENUITEM "Block Uncomment", IDM_EDIT_BLOCK_UNCOMMENT - MENUITEM "Stream Comment", IDM_EDIT_STREAM_COMMENT - MENUITEM "Stream Uncomment", IDM_EDIT_STREAM_UNCOMMENT + MENUITEM "Toggle Single Line Comment", IDM_EDIT_BLOCK_COMMENT + MENUITEM "Single Line Comment", IDM_EDIT_BLOCK_COMMENT_SET + MENUITEM "Single Line Uncomment", IDM_EDIT_BLOCK_UNCOMMENT + MENUITEM "Block Comment", IDM_EDIT_STREAM_COMMENT + MENUITEM "Block Uncomment", IDM_EDIT_STREAM_UNCOMMENT END POPUP "Auto-Completion" BEGIN @@ -815,7 +815,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE - MENUITEM "Online Documentation", IDM_ONLINEHELP + //MENUITEM "Online Documentation", IDM_ONLINEHELP MENUITEM "Forum", IDM_FORUM MENUITEM "Get More Plugins", IDM_PLUGINSHOME MENUITEM SEPARATOR diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index 6534eb56c..cbf66ecab 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -56,9 +56,8 @@ access acquire actual address advancing after all allowing alphabet alphabetic alphabetic-lower alphabetic-upper alphanumeric alphanumeric-edited also alternate and any are area areas as ascending at attribute author auto auto-hyphen-skip auto-skip automatic autoterminate background-color background-colour backward basis beep before beginning bell binary blank blink blinking block bold bottom box boxed by c01 c02 c03 c04 c05 c06 c07 c08 c09 c10 c11 c12 cancel cbl cd centered cf ch chaining changed character characters chart class clock-units cobol code code-set col collating color colour column com-reg comma command-line commit commitment common communication comp comp-0 comp-1 comp-2 comp-3 comp-4 comp-5 comp-6 comp-x compression computational computational-1 computational-2 computational-3 computational-4 computational-5 computational-6 computational-x computational console contains content control-area controls conversion converting core-index corr corresponding crt crt-under csp currency current-date cursor cycle cyl-index cyl-overflow date date-compiled date-written day day-of-week dbcs de debug debug-contents debug-item debug-line debug-name debug-sub-1 debug-sub-2 debug-sub-3 debugging decimal-point default delimited delimiter depending descending destination detail disable disk disp display-1 display-st down duplicates dynamic echo egcs egi emi empty-check encryption end end-of-page ending enter entry eol eop eos equal equals error escape esi every exceeds exception excess-3 exclusive exhibit extend extended-search external externally-described-key factory false fd fh--fcd fh--keydef file-id file-limit file-limits file-prefix filler final first fixed footing for foreground-color foreground-colour footing format from full giving global greater grid group heading high high-value high-values highlight id in index indexed indic indicate indicator indicators inheriting initial installation into invalid invoked is japanese just justified kanji kept key keyboard label last leading left left-justify leftline length length-check less limit limits lin linage linage-counter line line-counter lines lock lock-holding locking low low-value low-values lower lowlight manual mass-update master-index memory message method mode modified modules more-labels multiple name named national national-edited native nchar negative next no no-echo nominal not note nstd-reels null nulls number numeric numeric-edited numeric-fill o-fill object object-computer object-storage occurs of off omitted on oostackptr optional or order organization other others overflow overline packed-decimal padding page page-counter packed-decimal paragraph password pf ph pic picture plus pointer pop-up pos position positioning positive previous print-control print-switch printer printer-1 printing prior private procedure-pointer procedures proceed process processing prompt protected public purge queue quote quotes random range rd readers ready record record-overflow recording records redefines reel reference references relative remainder remarks removal renames reorg-criteria repeated replacing reporting reports required resident return-code returning reverse reverse-video reversed rf rh right right-justify rolling rounded s01 s02 s03 s04 s05 same screen scroll sd secure security segment segment-limit selective self selfclass sentence separate sequence sequential service setshadow shift-in shift-out sign size skip1 skip2 skip3 sort-control sort-core-size sort-file-size sort-merge sort-message sort-mode-size sort-option sort-return source source-computer space spaces space-fill spaces standard standard-1 standard-2 starting status sub-queue-1 sub-queue-2 sub-queue-3 subfile super symbolic sync synchronized sysin sysipt syslst sysout syspch syspunch system-info tab tallying tape terminal terminal-info test text than through thru time time-of-day time-out timeout times title to top totaled totaling trace track-area track-limit tracks trailing trailing-sign transaction true type typedef underline underlined unequal unit until up updaters upon upper upsi-0 upsi-1 upsi-2 upsi-3 upsi-4 upsi-5 upsi-6 upsi-7 usage user using value values variable varying when-compiled window with words write-only write-verify writerszero zero zero-fill zeros zeroes - if else switch case default break goto return for while do continue typedef sizeof NULL new delete throw try catch namespace operator this const_cast static_cast dynamic_cast reinterpret_cast true false using typeid and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq - void struct union enum char short int long double float signed unsigned const static extern auto register volatile bool class private protected public friend inline template virtual asm explicit typename mutable - a addindex addtogroup anchor arg attention author b brief bug c class code date def defgroup deprecated dontinclude e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li line link mainpage name namespace nosubgrouping note overload p page par param post preref relates remarks return retval sa section see showinitializer since skip skipline struct subsection test throw throws todo typedef union until var verbatim verbinclude version warning weakgroup $ @ \ & < > # { } + alignof and and_eq bitand bitor break case catch compl const_cast continue default delete do dynamic_cast else false for goto if namespace new not not_eq nullptr operator or or_eq reinterpret_cast return sizeof static_assert static_cast switch this throw true try typedef typeid using while xor xor_eq NULL + alignas asm auto bool char char16_t char32_t class const constexpr decltype double enum explicit export extern final float friend inline int long mutable noexcept override private protected public register short signed static struct template thread_local typename union unsigned virtual void volatile wchar_t abstract as base break case catch checked continue default delegate do else event explicit extern false finally fixed for foreach goto if implicit in interface internal is lock namespace new null object operator out override params private protected public readonly ref return sealed sizeof stackalloc switch this throw true try typeof unchecked unsafe using virtual while diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc index fd34da78b..162d329ca 100644 --- a/scintilla/win32/ScintRes.rc +++ b/scintilla/win32/ScintRes.rc @@ -4,7 +4,7 @@ #include -#define VERSION_SCINTILLA "3.3.4" +#define VERSION_SCINTILLA "3.3.4 for Notepad++" #define VERSION_WORDS 3, 3, 4, 0 VS_VERSION_INFO VERSIONINFO