From 9ac8c7dea81180a2a2a21adeeff5e5fbfe47eb51 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 19 Mar 2012 00:01:58 +0000 Subject: [PATCH] [FIXED_BUG] Fix some minor bug. [UPDATE] 1. Update several native language. 2. Update Ruby keywords. 3. add 2 new themes. 4. Change the book marker for adapting darker theme. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@886 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nativeLang/basque.xml | 112 +- PowerEditor/installer/nativeLang/catalan.xml | 329 ++--- PowerEditor/installer/nativeLang/croatian.xml | 11 +- PowerEditor/installer/nativeLang/danish.xml | 12 +- PowerEditor/installer/nativeLang/farsi.xml | 1224 ++++++++-------- PowerEditor/installer/nativeLang/italian.xml | 143 +- .../installer/nativeLang/portuguese.xml | 741 +++++----- PowerEditor/installer/nativeLang/russian.xml | 1237 +++++++++-------- PowerEditor/installer/nativeLang/slovak.xml | 7 + PowerEditor/installer/nativeLang/swedish.xml | 75 +- .../installer/themes/Solarized-light.xml | 880 ++++++++++++ PowerEditor/installer/themes/Solarized.xml | 880 ++++++++++++ PowerEditor/src/ScitillaComponent/Buffer.cpp | 2 +- PowerEditor/src/langs.model.xml | 2 +- PowerEditor/src/winmain.cpp | 15 + PowerEditor/src/xpm_icons.h | 148 +- 16 files changed, 3862 insertions(+), 1956 deletions(-) create mode 100644 PowerEditor/installer/themes/Solarized-light.xml create mode 100644 PowerEditor/installer/themes/Solarized.xml diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index cad3662c..55a556a0 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -9,13 +9,13 @@ - + - - - - + + + + @@ -27,7 +27,7 @@ - + @@ -39,6 +39,7 @@ + @@ -70,12 +71,13 @@ + - + @@ -118,15 +120,16 @@ - + + - + @@ -199,7 +202,9 @@ - + + + @@ -218,10 +223,10 @@ - - + - + + @@ -238,11 +243,13 @@ - + + - + + @@ -318,7 +325,7 @@ - + @@ -365,7 +372,7 @@ - + @@ -462,8 +469,8 @@ - - + + @@ -487,7 +494,7 @@ - + @@ -502,6 +509,7 @@ + @@ -609,7 +617,7 @@ - + @@ -617,15 +625,71 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index acf0e8b6..012a03bb 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -1,17 +1,16 @@
- - + @@ -23,19 +22,18 @@ By Hiro5 (from sourceforge.net) - - - + + - - - + + + @@ -45,9 +43,9 @@ By Hiro5 (from sourceforge.net) - + - + @@ -65,10 +63,8 @@ By Hiro5 (from sourceforge.net) - - - + @@ -87,60 +83,54 @@ By Hiro5 (from sourceforge.net) - - - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + - - + + - - - - + @@ -155,13 +145,13 @@ By Hiro5 (from sourceforge.net) - + - + @@ -180,7 +170,7 @@ By Hiro5 (from sourceforge.net) - + @@ -188,23 +178,21 @@ By Hiro5 (from sourceforge.net) - + - - - - + + - + - + - + @@ -216,153 +204,50 @@ By Hiro5 (from sourceforge.net) - + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + - - - + @@ -371,18 +256,12 @@ By Hiro5 (from sourceforge.net) - - - - - -
- - + + @@ -403,7 +282,6 @@ By Hiro5 (from sourceforge.net) - @@ -414,23 +292,19 @@ By Hiro5 (from sourceforge.net) - - - - @@ -441,12 +315,12 @@ By Hiro5 (from sourceforge.net) - + - + @@ -480,24 +354,19 @@ By Hiro5 (from sourceforge.net) - - - - - @@ -508,7 +377,7 @@ By Hiro5 (from sourceforge.net) - + @@ -519,11 +388,9 @@ By Hiro5 (from sourceforge.net) - - @@ -576,15 +443,11 @@ By Hiro5 (from sourceforge.net) - - - - - - + + @@ -600,42 +463,36 @@ By Hiro5 (from sourceforge.net) - - - + + - - + - + - - - + + - - - - - - + + + + + - - @@ -643,22 +500,18 @@ By Hiro5 (from sourceforge.net) - - - - - - - - - - - - + + + + + + + + @@ -669,7 +522,6 @@ By Hiro5 (from sourceforge.net) - @@ -682,58 +534,49 @@ By Hiro5 (from sourceforge.net) - - + - - - - + - - - - - @@ -743,7 +586,6 @@ By Hiro5 (from sourceforge.net) - @@ -769,17 +611,14 @@ By Hiro5 (from sourceforge.net) - + - - - @@ -791,7 +630,7 @@ By Hiro5 (from sourceforge.net) - + @@ -801,6 +640,8 @@ By Hiro5 (from sourceforge.net) + + @@ -819,20 +660,26 @@ By Hiro5 (from sourceforge.net) - + + + - + + + + + diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml index 0ee39e85..5fde4b64 100644 --- a/PowerEditor/installer/nativeLang/croatian.xml +++ b/PowerEditor/installer/nativeLang/croatian.xml @@ -1,7 +1,7 @@ @@ -640,6 +640,8 @@ + + @@ -647,14 +649,17 @@ + + + + - diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index ca74969d..b8cc49fa 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,7 +1,7 @@ - +
@@ -488,6 +488,7 @@ + @@ -679,6 +680,8 @@ den p + + @@ -699,6 +702,8 @@ den p + + @@ -706,12 +711,15 @@ den p + + - + + diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index 4223602e..8812fba3 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -1,665 +1,661 @@ - - +
- - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + - + - - + + - + - + - - + + - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -
- - +
+ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 3159fc22..88b52cba 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -1,12 +1,12 @@ - +
@@ -47,23 +47,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -245,9 +245,9 @@ - - - + + + @@ -290,7 +290,6 @@ - @@ -301,7 +300,6 @@ - @@ -316,15 +314,15 @@ - - - - - - - - - + + + + + + + + + @@ -485,9 +483,10 @@ + - + @@ -627,51 +626,59 @@ - - - - - - - - - + + + + + + + + + - - + + + + - - + + - - - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - + + + + + diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index 5753f28e..e9052c2e 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -3,6 +3,9 @@ Updated by: André Silva 29/05/2011 +New update by: +David Cunha +05/01/2012 --> @@ -25,25 +28,27 @@ Andr - + - - - - - - - - - - + + + + + + + + + + + - + - - + + - + + @@ -68,244 +73,256 @@ Andr - - + + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - + + - - + + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + +
- + - + - - - - - + + + + + - - - - + + + + - - + + - - + + - - - - + + + + - + - + - + - + - - - + + + - + - + - - - + + + - + @@ -315,14 +332,14 @@ Andr - - + + - + - + @@ -330,19 +347,20 @@ Andr - - + + - - - - + + + + + - - + + - + @@ -350,101 +368,100 @@ Andr - - + - + - + - - + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - + + + - - + + - - + + + - - + - + - - - + + + - + - - + + - - - + + + - + - - - + + + - + - - - + + + @@ -456,18 +473,18 @@ Andr - - - - + + + + - - - - + + + + - + @@ -477,121 +494,122 @@ Andr - - + + + - + - - - + + + + - - + + - - + + - - + + - + - + - + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - + + - - + + - + - - - + + - - + + - + - - + + - - - - + + + + - - - + + + - + - + - - + + - - - + + + - + @@ -601,5 +619,62 @@ Andr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index f29de958..2f0d9452 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -1,624 +1,691 @@ - + - - -
- + + +
+ - /// Ãë. ìåíþ |&File - /// Ãë. ìåíþ |&Edit - /// Ãë. ìåíþ |&Search - /// Ãë. ìåíþ |&View - /// Ãë. ìåíþ |E&ncoding - /// Ãë. ìåíþ |&Language - /// Ãë. ìåíþ |Se&ttings - /// Ãë. ìåíþ |Macro - /// Ãë. ìåíþ |Run - /// Ãë. ìåíþ |Plugins - /// Ãë. ìåíþ |Window + + + + + + + + + + + - + + - /// Ïîäìåíþ Ïðàâêà |Copy to Clipboard - /// Ïîäìåíþ Ïðàâêà |Indent - /// Ïîäìåíþ Ïðàâêà |Convert Case to - /// Ïîäìåíþ Ïðàâêà |Line Operations - /// Ïîäìåíþ Ïðàâêà |Comment/Uncomment - /// Ïîäìåíþ Ïðàâêà |Auto-Completion - /// Ïîäìåíþ Ïðàâêà |EOL Conversion - /// Ïîäìåíþ Ïðàâêà |Blank Operations - /// Ïîäìåíþ Ïðàâêà |Paste Special - /// Ïîäìåíþ Ïîèñê |Mark All - /// Ïîäìåíþ Ïîèñê |Unmark All - /// Ïîäìåíþ Ïîèñê |Jump Up - /// Ïîäìåíþ Ïîèñê |Jump Down - /// Ïîäìåíþ Ïîèñê |Bookmark - /// Ïîäìåíþ Âèä |Show Symbol - /// Ïîäìåíþ Âèä |Zoom - /// Ïîäìåíþ Âèä |Move/Clone Current Document - /// Ïîäìåíþ Âèä |Collapse Level - /// Ïîäìåíþ Âèä |Uncollapse Level - /// Ïîäìåíþ Êîäèðîâêà |Character Set - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Arabic - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Baltic - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Celtic - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Cyrillic - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Central European - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Chinese - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Eastern European - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Greek - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Hebrew - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Japanese - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Korean - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |North European - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Thai - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Turkish - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Western European - /// Ïîäìåíþ Êîäèðîâêà/Íàáîð ñèìâîëîâ |Vietnamese - /// Ïîäìåíþ Óñòàíîâêè |Import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - /// ì_Ôàéë |&New - /// ì_Ôàéë |&Open - /// ì_Ôàéë |Reload from Disk - /// ì_Ôàéë |&Save - /// ì_Ôàéë |Save &As... - /// ì_Ôàéë |Save a Copy As... - /// ì_Ôàéë |Sav&e All - /// ì_Ôàéë |Rename... - /// ì_Ôàéë |Close - /// ì_Ôàéë |C&lose All - /// ì_Ôàéë |Close All BUT Current Document - /// ì_Ôàéë |Delete from Disk - /// ì_Ôàéë |Load Session... - /// ì_Ôàéë |Save Session... - /// ì_Ôàéë |Print... - /// ì_Ôàéë |Print Now - /// ì_Ôàéë |Open All Recent Files - /// ì_Ôàéë |Empty Recent Files List - /// ì_Ôàéë |E&xit - - /// ì_Ïðàâêà |&Undo - /// ì_Ïðàâêà |&Redo - /// ì_Ïðàâêà |Cu&t - /// ì_Ïðàâêà |&Copy - /// ì_Ïðàâêà |&Paste - /// ì_Ïðàâêà |&Delete - /// ì_Ïðàâêà |Select A&ll - /// ì_Ïðàâêà/Â Áóôåð |Current File Path to Clipboard - /// ì_Ïðàâêà/Â Áóôåð |Current Filename to Clipboard - /// ì_Ïðàâêà/Â Áóôåð |Current Dir. Path to Clipboard - /// ì_Ïðàâêà/Îòñòóï (òàáóëÿöèåé) |Increase Line Indent - /// ì_Ïðàâêà/Îòñòóï (òàáóëÿöèåé) |Decrease Line Indent - /// ì_Ïðàâêà/Ðåãèñòð (âûäåëåíîãî) |UPPERCASE - /// ì_Ïðàâêà/Ðåãèñòð (âûäåëåíîãî) |lowercase - /// ì_Ïðàâêà/Ñòðîêè |Duplicate Current Line - /// ì_Ïðàâêà/Ñòðîêè |Split Lines - /// ì_Ïðàâêà/Ñòðîêè |Join Lines - /// ì_Ïðàâêà/Ñòðîêè |Move Up Current Line - /// ì_Ïðàâêà/Ñòðîêè |Move Down Current Line - /// ì_Ïðàâêà/Êîììåíò.(ñ ó÷.Ñèíòàêñ) |Toggle Block Comment - /// ì_Ïðàâêà/Êîììåíò.(ñ ó÷.Ñèíòàêñ) |Block Comment - /// ì_Ïðàâêà/Êîììåíò.(ñ ó÷.Ñèíòàêñ) |Block Uncomment - /// ì_Ïðàâêà/Êîììåíò.(ñ ó÷.Ñèíòàêñ) |Stream Comment - /// ì_Ïðàâêà/Àâòîçàâåðøåíèå |Function Completion - /// ì_Ïðàâêà/Àâòîçàâåðøåíèå |Word Completion - /// ì_Ïðàâêà/Àâòîçàâåðøåíèå |Function Parameters Hint - /// ì_Ïðàâêà/Êîíåö ñòðîê (âåñü ôàéë) |Convert to Windows Format - /// ì_Ïðàâêà/Êîíåö ñòðîê (âåñü ôàéë) |Convert to UNIX Format - /// ì_Ïðàâêà/Êîíåö ñòðîê (âåñü ôàéë) |Convert to MAC Format - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |Trim Trailing Space - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |Trim Leading Space - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |Trim Leading and Trailing Space - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |EOL to Space - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |Remove Unnecessary Blank and EOL - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |TAB to Space - /// ì_Ïðàâêà/Ïðîáåëû (âåñü ôàéë) |Space to TAB - /// ì_Ïðàâêà/Ñïåö Âñòàâêà |Paste HTML Content - /// ì_Ïðàâêà/Ñïåö Âñòàâêà |Paste RTF Content - /// ì_Ïðàâêà/Ñïåö Âñòàâêà |Copy Binary Content - /// ì_Ïðàâêà/Ñïåö Âñòàâêà |Cut Binary Content - /// ì_Ïðàâêà/Ñïåö Âñòàâêà |Paste Binary Content - /// ì_Ïðàâêà |Column Mode... - /// ì_Ïðàâêà |Column Editor... - /// ì_Ïðàâêà |Set Read-Only - /// ì_Ïðàâêà |Clear Read-Only Flag - - /// ì_Ïîèñê |&Find... - /// ì_Ïîèñê |Find in Files - /// ì_Ïîèñê |Find &Next - /// ì_Ïîèñê |Find Previous - /// ì_Ïîèñê |Select and Find Next - /// ì_Ïîèñê |Select and Find Previous - /// ì_Ïîèñê |Find (Volatile) Next - /// ì_Ïîèñê |Find (Volatile) Previous - /// ì_Ïîèñê |Replace... - /// ì_Ïîèñê |&Incremental Search - /// ì_Ïîèñê |Search Results Window - /// ì_Ïîèñê |Next Search Result - /// ì_Ïîèñê |Previous Search Result - /// ì_Ïîèñê |Go to... - /// ì_Ïîèñê |Go to Matching Brace - /// ì_Ïîèñê/Ïîìåòèòü öâåòîì âñå âõîæäåíèÿ |Using 1st Style - /// ì_Ïîèñê/Ïîìåòèòü öâåòîì âñå âõîæäåíèÿ |Using 2nd Style - /// ì_Ïîèñê/Ïîìåòèòü öâåòîì âñå âõîæäåíèÿ |Using 3rd Style - /// ì_Ïîèñê/Ïîìåòèòü öâåòîì âñå âõîæäåíèÿ |Using 4th Style - /// ì_Ïîèñê/Ïîìåòèòü öâåòîì âñå âõîæäåíèÿ |Using 5th Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear 1st Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear 2nd Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear 3rd Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear 4th Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear 5th Style - /// ì_Ïîèñê/Óáðàòü Ïîìåòêè |Clear All Styles - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |1st style - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |2nd style - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |3rd style - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |4th style - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |5th style - /// ì_Ïîèñê/Ââåðõ ê Ïîìåòêå |Find style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |1st style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |2nd style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |3rd style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |4th style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |5th style - /// ì_Ïîèñê/Âíèç ê Ïîìåòêå |Find style - /// ì_Ïîèñê/Çàêëàäêè |Toggle Bookmark - /// ì_Ïîèñê/Çàêëàäêè |Next Bookmark - /// ì_Ïîèñê/Çàêëàäêè |Previous Bookmark - /// ì_Ïîèñê/Çàêëàäêè |Clear All Bookmarks - /// ì_Ïîèñê/Çàêëàäêè |Cut Bookmarked Lines - /// ì_Ïîèñê/Çàêëàäêè |Copy Bookmarked Lines - /// ì_Ïîèñê/Çàêëàäêè |Paste to (Replace) Bookmarked Lines - /// ì_Ïîèñê/Çàêëàäêè |Delete Bookmarked Lines - /// ì_Ïîèñê/Çàêëàäêè |Remove Unmarked Lines - /// ì_Ïîèñê/Çàêëàäêè |Inverse Bookmark - - /// ì_Âèä |Always on Top - /// ì_Âèä |Toggle Full Screen Mode - /// ì_Âèä |Post-It - /// ì_Âèä/Ïîêàç Ñèìâîëîâ |Show White Space and TAB - /// ì_Âèä/Ïîêàç Ñèìâîëîâ |Show End of Line - /// ì_Âèä/Ïîêàç Ñèìâîëîâ |Show All Characters - /// ì_Âèä/Ïîêàç Ñèìâîëîâ |Show Indent Guide - /// ì_Âèä/Ïîêàç Ñèìâîëîâ |Show Wrap Symbol - /// ì_Âèä/Ìàñøòàá |Zoom &In Ctrl+Mouse Wheel Up - /// ì_Âèä/Ìàñøòàá |Zoom &Out Ctrl+Mouse Wheel Down - /// ì_Âèä/Ìàñøòàá |Restore Default Zoom - /// ì_Âèä/Ïåðåìåñòèòü/Äóáëèðîâàòü Âêëàäêó |Move to Other View - /// ì_Âèä/Ïåðåìåñòèòü/Äóáëèðîâàòü Âêëàäêó |Clone to Other View - /// ì_Âèä/Ïåðåìåñòèòü/Äóáëèðîâàòü Âêëàäêó |Move to New Instance - /// ì_Âèä/Ïåðåìåñòèòü/Äóáëèðîâàòü Âêëàäêó |Open in New Instance - /// ì_Âèä |Wrap - /// ì_Âèä |Focus on Another View - /// ì_Âèä |Hide Lines - /// ì_Âèä |User-Defined Dialogue... - /// ì_Âèä |Fold All - /// ì_Âèä |Unfold All - /// ì_Âèä |Collapse Current Level - /// ì_Âèä |Uncollapse Current Level - /// ì_Âèä |Summary... - /// ì_Âèä |Synchronise Vertical Scrolling - /// ì_Âèä |Synchronise Horizontal Scrolling - /// ì_Âèä |Text Direction RTL - /// ì_Âèä |Text Direction LTR - - /// ì_Êîäèðîâêà |Encode in ANSI - /// ì_Êîäèðîâêà |Encode in UTF-8 without BOM - /// ì_Êîäèðîâêà |Encode in UTF-8 - /// ì_Êîäèðîâêà |Encode in UCS-2 Big Endian - /// ì_Êîäèðîâêà |Encode in UCS-2 Little Endian - /// ì_Êîäèðîâêà |Convert to ANSI - /// ì_Êîäèðîâêà |Convert to UTF-8 without BOM - /// ì_Êîäèðîâêà |Convert to UTF-8 - /// ì_Êîäèðîâêà |Convert to UCS-2 Big Endian - /// ì_Êîäèðîâêà |Convert to UCS-2 Little Endian - - /// ì_Ñèíòàêñèñ |MS INI file - /// ì_Ñèíòàêñèñ |MS-DOS Style - /// ì_Ñèíòàêñèñ |Normal Text - /// ì_Ñèíòàêñèñ |Resource file - /// ì_Ñèíòàêñèñ |User-Defined - - /// ì_Óñòàíîâêè |Preferences... - /// ì_Óñòàíîâêè |Style Configurator... - /// ì_Óñòàíîâêè |Shortcut Mapper... - /// ì_Óñòàíîâêè/Èìïîðòèðîâàòü |Import Plugin(s) ... - /// ì_Óñòàíîâêè/Èìïîðòèðîâàòü |Import Theme(s) ... - /// ì_Óñòàíîâêè |Edit Popup ContextMenu - - /// ì_Ìàêðîñû |&Start Recording - /// ì_Ìàêðîñû |&Stop Recording - /// ì_Ìàêðîñû |&Playback - /// ì_Ìàêðîñû |Save Currently Recorded Macro - /// ì_Ìàêðîñû |Run a Macro Multiple Times... - /// ì_Ìàêðîñû |Modify Shortcut/Delete Macro... - - /// ì_Çàïóñê |&Run... - /// ì_Çàïóñê |Modify Shortcut/Delete Command... - - /// ì_Ñïðàâêà |Help Contents - /// ì_Ñïðàâêà |Notepad++ Home - /// ì_Ñïðàâêà |Notepad++ Project Page - /// ì_Ñïðàâêà |Online Documentation - /// ì_Ñïðàâêà |Forum - /// ì_Ñïðàâêà |Get More Plugins - /// ì_Ñïðàâêà |Update Notepad++ - /// ì_Ñïðàâêà |About Notepad++... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Close - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Close All BUT This - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Save - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Save As... - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Print - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Move to Other View - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Clone to Other View - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Full File Path to Clipboard - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Filename to Clipboard - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Current Dir. Path to Clipboard - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Rename - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Delete - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Read-Only - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Clear Read-Only Flag - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Move to New Instance - /// Êîíò. ìåíþ íà çàãîëîâêå âêëàäêè |Open in New Instance + + + + + + + + + + + + + + + + + - /// ä_Íàéòè (ì_Ïîèñê/Íàéòè) |Find Replace Find in Files Mark - /// ä_Íàéòè |Find what: - /// ä_Íàéòè |Match &whole word only - /// ä_Íàéòè |Match &case - /// ä_Íàéòè |Wrap aroun&d - /// ä_Íàéòè |Search mode - /// ä_Íàéòè |Normal - /// ä_Íàéòè |Extended (\n, \r, \t, \0, \x...) - /// ä_Íàéòè |Regular &expression - /// ä_Íàéòè |Direction - /// ä_Íàéòè |&Up - /// ä_Íàéòè |&Down - /// ä_Íàéòè |Transparency - /// ä_Íàéòè |On losing focus - /// ä_Íàéòè |Always - /// ä_Íàéòè |Find Next - /// ä_Íàéòè |Count - /// ä_Íàéòè |Find All in All Opened Documents - /// ä_Íàéòè |Find All in Current Document (*Ïåðåíîñ ñòðîêè äëÿ ëó÷øåãî ïðîñìîòðà) - /// ä_Íàéòè |Close - /// ä_Íàéòè/Çàìåíèòü |Re&place with: - /// ä_Íàéòè/Çàìåíèòü |&Replace - /// ä_Íàéòè/Çàìåíèòü |Replace &All - /// ä_Íàéòè/Çàìåíèòü |In selection - /// ä_Íàéòè/Çàìåíèòü |Replace All in All Opened Documents - /// ä_Íàéòè/Íàéòè â ôàéëàõ |Filters: - /// ä_Íàéòè/Íàéòè â ôàéëàõ |Directory: - /// ä_Íàéòè/Íàéòè â ôàéëàõ |Find All - /// ä_Íàéòè/Íàéòè â ôàéëàõ |In all sub-folders - /// ä_Íàéòè/Íàéòè â ôàéëàõ |In hidden folders - /// ä_Íàéòè/Íàéòè â ôàéëàõ |Replace in Files - /// ä_Íàéòè/Íàéòè â ôàéëàõ |Follow current doc. - /// ä_Íàéòè/Íàéòè_Ïîìåòèòü |Find All - /// ä_Íàéòè/Íàéòè_Ïîìåòèòü (*êí.) |Clear - /// ä_Íàéòè/Íàéòè_Ïîìåòèòü |Mark line - /// ä_Íàéòè/Íàéòè_Ïîìåòèòü |Purge for each search - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Ïåðåéòè ê (ì_Ïîèñê/Ïåðåéòè ê) |Go to... - /// ä_Ïåðåéòè ê |Line - /// ä_Ïåðåéòè ê |Offset - /// ä_Ïåðåéòè ê |&Go - /// ä_Ïåðåéòè ê |I'm going nowhere - /// ä_Ïåðåéòè ê |You are here: - /// ä_Ïåðåéòè ê |You want to go to: - /// ä_Ïåðåéòè ê |You can't go further than: + + + + + + + + - /// ä_Çàïóñê (ì_Çàïóñê/Çàïóñê) |Run... - /// ä_Çàïóñê |The Program to Run - /// ä_Çàïóñê |Run - /// ä_Çàïóñê |Cancel - /// ä_Çàïóñê |Save... + + + + + + - /// ä_Êîíôèãóðàòîð Ñòèëåé (ì_Óñòàíîâêè/Ñòèëü) |Style Configurator - /// ä_Êîíôèãóðàòîð Ñòèëåé |Select theme: - /// ä_Êîíôèãóðàòîð Ñòèëåé |Save && Close - /// ä_Êîíôèãóðàòîð Ñòèëåé |Cancel - /// ä_Êîíôèãóðàòîð Ñòèëåé |Transparency + + + + + + - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Language: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Style: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Default ext.: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |User ext.: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Colour Style - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Foreground colour - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Background colour - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global foreground colour - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global background colour - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Font Style - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Font name: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Bold - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Italic - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Underline - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Font size: - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global font - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global font size - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global bold font style - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global italic font style - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Enable global underline font style - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |Default keywords - /// ä_Êîíôèãóðàòîð Ñòèëåé/ |User-defined keywords + + + + + + + + + + + + + + + + + + + + + + - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå (ì_Âèä/Ïîëüçîâàòåëüñêîå îïðåäåëåíèå) |User-Defined - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |User language: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Transparency - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Dock - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Create New... - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Save As... - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Ignore case - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Export... - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Import... - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Rename - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå(êí.) |Remove - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Ext.: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Colour Style - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Foreground colour - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Background colour - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Font Style - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Font name: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Bold - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Font size: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Italic - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå |Underline - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñòàíäàðòíûé |Folder && Default - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñòàíäàðòíûé |Default Style Settings - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñòàíäàðòíûé |Folder Open Keywords Settings - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñòàíäàðòíûé |Folder Close Keywords Settings + + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |Keywords Lists - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |1st Group - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |2nd Group - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |3rd Group - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |4th Group - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |Prefix mode - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |Prefix mode - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |Prefix mode - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Ñïèñêè êëþ÷åâûõ ñëîâ |Prefix mode + + + + + + + + + - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Comment && Number - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Comment Line - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Treat keyword as symbol - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Comment Block - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Treat keywords as symbols - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Comment open: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Comment close: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Êîììåíòàðèé è Íóìåðàöèÿ |Number + + + + + + + + - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Operators - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Operator - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Available symbols - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Activated operators - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Enable escape character : - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Delimiter 1 - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Boundary open: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Boundary close: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Delimiter 2 - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Boundary open: - /// ä_Ïîëüçîâàòåëüñêîå Îïðåäåëåíèå/Îïåðàòîðû |Boundary close: + + + + + + + + + + + - /// ä_Íàñòðîéêè (ì_Óñòàíîâêè/Íàñòðîéêè) |Preferences - /// ä_Íàñòðîéêè |Close - /// ä_Íàñòðîéêè/Îáùèå |General - /// ä_Íàñòðîéêè/Îáùèå |Localization - /// ä_Íàñòðîéêè/Îáùèå |Toolbar - /// ä_Íàñòðîéêè/Îáùèå |Hide - /// ä_Íàñòðîéêè/Îáùèå |Small icons - /// ä_Íàñòðîéêè/Îáùèå |Big icons - /// ä_Íàñòðîéêè/Îáùèå |Standard icons - /// ä_Íàñòðîéêè/Îáùèå |Menu Bar - /// ä_Íàñòðîéêè/Îáùèå |Hide (use Alt or F10 key to toggle) - /// ä_Íàñòðîéêè/Îáùèå |Show status bar + + + + + + + + + + + + + + + + + + + + + + - - /// ä_Íàñòðîéêè/Îáùèå |Tab Bar - /// ä_Íàñòðîéêè/Îáùèå |Hide - /// ä_Íàñòðîéêè/Îáùèå |Multi-line - /// ä_Íàñòðîéêè/Îáùèå |Vertical - /// ä_Íàñòðîéêè/Îáùèå |Reduce - /// ä_Íàñòðîéêè/Îáùèå |Lock (no drag and drop) - /// ä_Íàñòðîéêè/Îáùèå |Darken inactive tabs - /// ä_Íàñòðîéêè/Îáùèå |Draw a coloured bar on active tab - /// ä_Íàñòðîéêè/Îáùèå |Show close button on each tab - /// ä_Íàñòðîéêè/Îáùèå |Double click to close document + - /// ä_Íàñòðîéêè/Ïðàâêà |Editing - /// ä_Íàñòðîéêè/Ïðàâêà |Caret Settings - /// ä_Íàñòðîéêè/Ïðàâêà |Width: - /// ä_Íàñòðîéêè/Ïðàâêà |Blink Rate: - /// ä_Íàñòðîéêè/Ïðàâêà |F - /// ä_Íàñòðîéêè/Ïðàâêà |S - /// ä_Íàñòðîéêè/Ïðàâêà |Multi-Editing Settings - /// ä_Íàñòðîéêè/Ïðàâêà |Enable (Ctrl+Mouse click/selection) - /// ä_Íàñòðîéêè/Ïðàâêà |Folder Margin Style - /// ä_Íàñòðîéêè/Ïðàâêà |Simple - /// ä_Íàñòðîéêè/Ïðàâêà |Arrow - /// ä_Íàñòðîéêè/Ïðàâêà |Circle tree - /// ä_Íàñòðîéêè/Ïðàâêà |Box tree - /// ä_Íàñòðîéêè/Ïðàâêà |None - /// ä_Íàñòðîéêè/Ïðàâêà |Vertical Edge Settings - /// ä_Íàñòðîéêè/Ïðàâêà |Show vertical edge - /// ä_Íàñòðîéêè/Ïðàâêà |Line mode - /// ä_Íàñòðîéêè/Ïðàâêà |Background mode - /// ä_Íàñòðîéêè/Ïðàâêà |Number of columns: - /// ä_Íàñòðîéêè/Ïðàâêà |Line Wrap - /// ä_Íàñòðîéêè/Ïðàâêà |Default - /// ä_Íàñòðîéêè/Ïðàâêà |Aligned - /// ä_Íàñòðîéêè/Ïðàâêà |Indent - /// ä_Íàñòðîéêè/Ïðàâêà |Display line numbers - /// ä_Íàñòðîéêè/Ïðàâêà |Display bookmarks - /// ä_Íàñòðîéêè/Ïðàâêà |Enable current line highlighting + + + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |New Document/Default Directory - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Format - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Windows - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Unix - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Mac - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Encoding - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |ANSI - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |UTF-8 without BOM - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |UTF-8 - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |UCS-2 Big Endian - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |UCS-2 Little Endian - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Default language: - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Default Directory (Open/Save) - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Follow current document - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Remember last used directory - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |New Document - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Apply to opened ANSI files - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Recent Files History - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Don't check at launch time - /// ä_Íàñòðîéêè/Íîâûé Äîêóìåíò |Max. number of entries: + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Íàñòðîéêè/Àññîöèàöèÿ Ôàéëîâ |File Association - /// ä_Íàñòðîéêè/Àññîöèàöèÿ Ôàéëîâ |Supported exts: - /// ä_Íàñòðîéêè/Àññîöèàöèÿ Ôàéëîâ |Registered exts: + + + - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Language Menu/Tab Settings - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Language Menu - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Make language menu compact - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Available items - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Disabled items - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Tab Settings - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Replace by space - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Tab size: - /// ä_Íàñòðîéêè/Ñèíòàêñèñ_Òàáóëÿöèÿ |Use default value + + + + + + + + + - /// ä_Íàñòðîéêè/Ïå÷àòü |Print - /// ä_Íàñòðîéêè/Ïå÷àòü |Print line number - /// ä_Íàñòðîéêè/Ïå÷àòü |Colour Options - /// ä_Íàñòðîéêè/Ïå÷àòü |WYSIWYG - /// ä_Íàñòðîéêè/Ïå÷àòü |Invert - /// ä_Íàñòðîéêè/Ïå÷àòü |Black on white - /// ä_Íàñòðîéêè/Ïå÷àòü |No background colour - /// ä_Íàñòðîéêè/Ïå÷àòü |Marge Settings (Unit:mm) - /// ä_Íàñòðîéêè/Ïå÷àòü |Left - /// ä_Íàñòðîéêè/Ïå÷àòü |Top - /// ä_Íàñòðîéêè/Ïå÷àòü |Right - /// ä_Íàñòðîéêè/Ïå÷àòü |Bottom - /// ä_Íàñòðîéêè/Ïå÷àòü |Header and Footer - /// ä_Íàñòðîéêè/Ïå÷àòü |Variable: - /// ä_Íàñòðîéêè/Ïå÷àòü |Add - /// ä_Íàñòðîéêè/Ïå÷àòü |Header - /// ä_Íàñòðîéêè/Ïå÷àòü |Left part - /// ä_Íàñòðîéêè/Ïå÷àòü |Middle part - /// ä_Íàñòðîéêè/Ïå÷àòü |Right part - /// ä_Íàñòðîéêè/Ïå÷àòü |Bold - /// ä_Íàñòðîéêè/Ïå÷àòü |Italic - /// ä_Íàñòðîéêè/Ïå÷àòü |Footer - /// ä_Íàñòðîéêè/Ïå÷àòü |Left part - /// ä_Íàñòðîéêè/Ïå÷àòü |Middle part - /// ä_Íàñòðîéêè/Ïå÷àòü |Right part - /// ä_Íàñòðîéêè/Ïå÷àòü |Bold - /// ä_Íàñòðîéêè/Ïå÷àòü |Italic - /// ä_Íàñòðîéêè/Ïå÷àòü |Which part : + + + + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Backup/Auto-Completion - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Backup - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |None - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Simple backup - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Verbose backup - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Custom Backup Directory - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Directory: - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Auto-Completion - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Enable auto-completion on each input - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Function completion - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Word completion - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |From - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |th character - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Valid value: 1 - 9 - /// ä_Íàñòðîéêè/Ðåçåðâ_Àâòîçàâåðøåíèå |Function parameters hint on input - - /// ä_Íàñòðîéêè/Ðàçíîå |MISC. - /// ä_Íàñòðîéêè/Ðàçíîå |Recent Files History - /// ä_Íàñòðîéêè/Ðàçíîå |Max. number of entries: - /// ä_Íàñòðîéêè/Ðàçíîå |Don't check at launch time - /// ä_Íàñòðîéêè/Ðàçíîå |Document Switcher (Ctrl+TAB) - /// ä_Íàñòðîéêè/Ðàçíîå |Enable - /// ä_Íàñòðîéêè/Ðàçíîå |Enable MRU behaviour - /// ä_Íàñòðîéêè/Ðàçíîå |Enable Notepad++ auto-updater - /// ä_Íàñòðîéêè/Ðàçíîå |Auto-indent - /// ä_Íàñòðîéêè/Ðàçíîå |Minimize to system tray - /// ä_Íàñòðîéêè/Ðàçíîå |Enable smart highlighting - /// ä_Íàñòðîéêè/Ðàçíîå |Show only filename in title bar - /// ä_Íàñòðîéêè/Ðàçíîå |Remember current session for next launch - /// ä_Íàñòðîéêè/Ðàçíîå |Clickable Link Settings - /// ä_Íàñòðîéêè/Ðàçíîå |Enable - /// ä_Íàñòðîéêè/Ðàçíîå |No underline - /// ä_Íàñòðîéêè/Ðàçíîå |File Status Auto-Detection - /// ä_Íàñòðîéêè/Ðàçíîå |Enable - /// ä_Íàñòðîéêè/Ðàçíîå |Update silently - /// ä_Íàñòðîéêè/Ðàçíîå |Scroll to the last line after update - /// ä_Íàñòðîéêè/Ðàçíîå |Highlight Matching Tags - /// ä_Íàñòðîéêè/Ðàçíîå |Enable - /// ä_Íàñòðîéêè/Ðàçíîå |Highlight tag attributes - /// ä_Íàñòðîéêè/Ðàçíîå |Highlight comment/php/asp zone - /// ä_Íàñòðîéêè/Ðàçíîå |Session file ext.: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… (ì_Ìàêðîñû/Çàïóñòèòü ìíîãîêðàòíî) |Run a Macro Multiple Times - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |Macro to run: - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |Run - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |times - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |Run until the end of file - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |Run - /// ä_Çàïóñòèòü Ìíîãîêðàòíî… |Cancel + + + + + + + - /// ä_Îêíà (ì_Îêíà/Îêíà) |Windows - /// ä_Îêíà |Activate - /// ä_Îêíà |Save - /// ä_Îêíà |Close window(s) - /// ä_Îêíà |Sort tabs - /// ä_Îêíà |OK + + + + + + - /// ä_Ðåäàêòîð Êîëîíêè (ì_Ïðàâêà/Ðåäàêòîð Êîëîíêè) |Column Editor - /// ä_Ðåäàêòîð Êîëîíêè |Text to Insert - /// ä_Ðåäàêòîð Êîëîíêè |Number to Insert - /// ä_Ðåäàêòîð Êîëîíêè |Initial number: - /// ä_Ðåäàêòîð Êîëîíêè |Increase by: - /// ä_Ðåäàêòîð Êîëîíêè |Leading zeros - /// ä_Ðåäàêòîð Êîëîíêè |Format - /// ä_Ðåäàêòîð Êîëîíêè |Dec - /// ä_Ðåäàêòîð Êîëîíêè |Oct - /// ä_Ðåäàêòîð Êîëîíêè |Hex - /// ä_Ðåäàêòîð Êîëîíêè |Bin - /// ä_Ðåäàêòîð Êîëîíêè |OK - /// ä_Ðåäàêòîð Êîëîíêè |Cancel + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml index 9dd1e61f..23ea93ee 100644 --- a/PowerEditor/installer/nativeLang/slovak.xml +++ b/PowerEditor/installer/nativeLang/slovak.xml @@ -470,6 +470,7 @@ + @@ -668,6 +669,8 @@ + + @@ -675,11 +678,15 @@ + + + + diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index 30d04adc..6c4fdd5b 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -35,6 +35,10 @@ Comments: Added new strings and deleted old strings. Sorted strings in accordanc E-mail: timmy.almroth@tim-international.net Comments: Minor adjustments and addons neccessary to comply with v5.9. +:: Update for Notepad++ v5.9 by Conny Hansson on Jan 10, 2012 :: +E-mail: coha69@gmail.com +Comments: Added some missing translations. + *** Send new updates to the author of Notepad++ (don.h@free.fr) *** *** Test the translation by overwriting %appdata%\Notepad++\nativeLang.xml *** --> @@ -77,6 +81,7 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. + @@ -219,11 +224,14 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. - + + + + @@ -265,7 +273,7 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. - +
@@ -290,7 +298,7 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. - + @@ -383,8 +391,8 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. - - + + @@ -614,5 +622,62 @@ Comments: Minor adjustments and addons neccessary to comply with v5.9. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml new file mode 100644 index 00000000..b07abac2 --- /dev/null +++ b/PowerEditor/installer/themes/Solarized-light.xml @@ -0,0 +1,880 @@ + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + toto titi + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug newTmplItem + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + True False + + + + + + + + ContentScroller + + + endfunction endif + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml new file mode 100644 index 00000000..38dc5a6b --- /dev/null +++ b/PowerEditor/installer/themes/Solarized.xml @@ -0,0 +1,880 @@ + + + + + + + ContentScroller + + + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + toto titi + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window + XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug newTmplItem + + + + + + + + + param @projectDescription projectDescription @param + + + + + + + + + True False + + + + + + + + ContentScroller + + + endfunction endif + onMotionChanged onMotionFinished Tween ImagesStrip ContentScroller mx transitions easing Sprite Point MouseEvent Event BitmapData Timer TimerEvent addEventListener event x y height width + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + endfunction endif + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the_ID the_post have_posts wp_link_pages the_content + + + + $_POST $_GET $_SESSION + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + ooooo + + + + + + + + + + + + if else for while + bool long int char + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True False + + + + + + + + + + + + + + + + + import + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp index 15f026e1..1d95a93d 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp @@ -116,7 +116,7 @@ void Buffer::setFileName(const TCHAR *fn, LangType defaultLang) } else // if it's not user lang, then check if it's supported lang { - _userLangExt[0] = '\0'; + _userLangExt = TEXT(""); newLang = pNppParamInst->getLangFromExt(ext); } } diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml index 0558466f..db606869 100644 --- a/PowerEditor/src/langs.model.xml +++ b/PowerEditor/src/langs.model.xml @@ -178,7 +178,7 @@ ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY - __FILE__ and def end in or self unless __LINE__ begin defined? ensure module redo super until BEGIN break do false next rescue then when END case else for nil retry true while alias class elsif if not return undef yield + ARGF ARGV BEGIN END ENV FALSE DATA NIL RUBY_PATCHLEVEL RUBY_PLATFORM RUBY_RELEASE_DATE RUBY_VERSION PLATFORM RELEASE_DATE STDERR STDIN STDOUT TOPLEVEL_BINDING TRUE __ENCODING__ __END__ __FILE__ __LINE__ alias and begin break case class def defined? do else elsif end ensure false for if in module next nil not or redo rescue retry return self super then true undef unless until when while yield + - * / = < > <= >= => abs acos and angle append apply asin assoc assoc assq assv atan begin boolean? caar cadr call-with-current-continuation call/cc call-with-input-file call-with-output-file call-with-values car cdr caar cadr cdar cddr caaar caadr cadar caddr cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr cddaar cddadr cdddar cddddr case ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cond cons cos current-input-port current-output-port define define-syntax delay denominator display do dynamic-wind else eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt floor for-each force gcd if imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lambda lcm length let let* let-syntax letrec letrec-syntax list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector map max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file or output-port? pair? peek-char input-port? output-port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? syntax-rules transcript-off transcript-on truncate unquote unquote-splicing values vector vector->list vector-fill! vector-length vector-ref vector-set! vector? with-input-from-file with-output-to-file write write-char zero? diff --git a/PowerEditor/src/winmain.cpp b/PowerEditor/src/winmain.cpp index c6b9d643..b618539e 100644 --- a/PowerEditor/src/winmain.cpp +++ b/PowerEditor/src/winmain.cpp @@ -278,6 +278,21 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) // IMPORTANT !!! ::ShowWindow(hNotepad_plus, sw); + +/* + int sw = 0; + + if (::IsZoomed(hNotepad_plus)) + sw = SW_MAXIMIZE; + else if (::IsIconic(hNotepad_plus)) + sw = SW_RESTORE; + // IMPORTANT !!! + if (sw) + ::ShowWindow(hNotepad_plus, sw); + +*/ + + ::SetForegroundWindow(hNotepad_plus); if (params.size() > 0) //if there are files to open, use the WM_COPYDATA system diff --git a/PowerEditor/src/xpm_icons.h b/PowerEditor/src/xpm_icons.h index d5c96d58..2bd8bed7 100644 --- a/PowerEditor/src/xpm_icons.h +++ b/PowerEditor/src/xpm_icons.h @@ -161,86 +161,76 @@ static char * acBottom_xpm[] = { /* XPM */ static char * bookmark_xpm[] = { -"15 15 64 1", +"13 14 54 1", " c None", -". c #FE0000", -"+ c #9DD3D2", -"@ c #2DC7C9", -"# c #00A0A6", -"$ c #007A76", -"% c #50C4C6", -"& c #02C4C6", -"* c #81C6C7", -"= c #1DBCD9", -"- c #9CCFDA", -"; c #CAECF2", -"> c #8FC8C9", -", c #003236", -"' c #006A96", -") c #0092E6", -"! c #47B0E1", -"~ c #53BAE5", -"{ c #19C5C7", -"] c #003B68", -"^ c #00358E", -"/ c #0048A0", -"( c #005FA8", -"_ c #0065C4", -": c #002040", -"< c #003690", -"[ c #003F9E", -"} c #005BB0", -"| c #004BA8", -"1 c #000636", -"2 c #0040A0", -"3 c #0061C4", -"4 c #0078E8", -"5 c #008AF4", -"6 c #001656", -"7 c #0053B0", -"8 c #0081EE", -"9 c #0994FF", -"0 c #23A4FF", -"a c #1197FF", -"b c #00316E", -"c c #49B4FF", -"d c #53BCFF", -"e c #35ACFF", -"f c #59C2FF", -"g c #6BC8FD", -"h c #62C5FE", -"i c #003B78", -"j c #73D1FD", -"k c #7BD7FD", -"l c #A3D7D7", -"m c #008490", -"n c #003F80", -"o c #0983FF", -"p c #7BDAFD", -"q c #1990FF", -"r c #BEE6E8", -"s c #004A74", -"t c #0088E8", -"u c #19A0FF", -"v c #B6E4E2", -"w c #3DC7C9", -"x c #12C2C4", -"y c #64C6C5", -" +@#$#@+ ", -" %&**+**&% ", -" %&=-;;;-=&% ", -" >,')!~~~!)',> ", -" {]^/(___(/^]{ ", -" :^<[}___}|<^: ", -" 12|3455543|21 ", -" 67389000a8376 ", -" b|8a0cddea8|b ", -" '[5edfghde9[' ", -" >i4cgjkjgc8i> ", -" lmnofjpkfqnml ", -" r*@s(tut(s@*r ", -" v*w{x&x{w*v ", -" l*yyy*l "}; +". c #545254", +"+ c #3C3E3C", +"@ c #646464", +"# c #A4A4A4", +"$ c #B7B8B7", +"% c #747284", +"& c #B4B2C4", +"* c #DCD7E4", +"= c #1C1A1C", +"- c #403E58", +"; c #5C5A8C", +"> c #7C7EAC", +", c #7C8EBC", +"' c #242644", +") c #282668", +"! c #24367C", +"~ c #244A84", +"{ c #2C5098", +"] c #14162C", +"^ c #142E7C", +"/ c #143789", +"( c #204990", +"_ c #174091", +": c #0C0630", +"< c #24327C", +"[ c #2450A0", +"} c #345DB4", +"| c #3C68B8", +"1 c #141244", +"2 c #24428C", +"3 c #3462B9", +"4 c #4470C4", +"5 c #4C7FD6", +"6 c #4472CC", +"7 c #24224C", +"8 c #5C8DEC", +"9 c #5C94F6", +"0 c #5482DF", +"a c #619DF7", +"b c #6CA6FC", +"c c #64A2FC", +"d c #1C2E5C", +"e c #6CA2FC", +"f c #74B2FC", +"g c #7CB8FC", +"h c #1C3264", +"i c #346AD4", +"j c #7CBEFC", +"k c #3C72DC", +"l c #243250", +"m c #346AB4", +"n c #3C82DC", +"o c #6C6A6C", +" .+. ", +" @##$##@ ", +" @%&***&%@ ", +" =-;>,,,>;-= ", +" ')!~{{{~!)' ", +"])^/({{{(_^)]", +":<_[}|||}[_<:", +"12[3455563[21", +"7_365899063_7", +" /|09abc904/ ", +" d}8efgfb83d ", +" hiafjgakh ", +" l~mnm~l ", +" o@o " +}; /* static char * modifUnsaved_xpm[] = {