diff --git a/PowerEditor/bin/NppHelp.chm b/PowerEditor/bin/NppHelp.chm index f38706cae..a5dc20d2f 100644 Binary files a/PowerEditor/bin/NppHelp.chm and b/PowerEditor/bin/NppHelp.chm differ diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 4ad7e8807..267fef1c5 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -6,7 +6,9 @@ Notepad++ v5.6.1 new features and fixed bugs (from v5.6) : 4. Enhance Html encoding auto-detection. 5. Fix case-insensitive searching bug for non-ascii characters (for example some characters in French and Cyrillic letters). 6. Add find result commands in the menu. -7. Add DOS CodePage : CP437, CP737, CP850, CP852, CP855, CP857, CP858, CP860, CP861, CP863, CP865, CP866 and CP869 +7. Add DOS CodePage : CP437, CP737, CP850, CP852, CP855, CP857, CP858, CP860, CP861, CP863, CP865, CP866 and CP869. +8. Fix localization combo box unselected in preference dialog bug after startup (when a localization file is in use). + Notepad++ v5.6 new features and fixed bugs (from v5.5.1) : diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 5b39b66fd..b6f2a2a4e 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml index 8460c43ef..0f414a9c1 100644 --- a/PowerEditor/installer/nativeLang/afrikaans.xml +++ b/PowerEditor/installer/nativeLang/afrikaans.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/albanian.xml b/PowerEditor/installer/nativeLang/albanian.xml index 36967470b..9fad77912 100644 --- a/PowerEditor/installer/nativeLang/albanian.xml +++ b/PowerEditor/installer/nativeLang/albanian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/arabic.xml b/PowerEditor/installer/nativeLang/arabic.xml index 7cbf8e058..788c4b4c8 100644 --- a/PowerEditor/installer/nativeLang/arabic.xml +++ b/PowerEditor/installer/nativeLang/arabic.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/aranese.xml b/PowerEditor/installer/nativeLang/aranese.xml index b98eee253..d044af582 100644 --- a/PowerEditor/installer/nativeLang/aranese.xml +++ b/PowerEditor/installer/nativeLang/aranese.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index 143833164..0ebb68e0a 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml index 36a6afc75..2bd6fdaae 100644 --- a/PowerEditor/installer/nativeLang/belarusian.xml +++ b/PowerEditor/installer/nativeLang/belarusian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index 9e508aaec..51229ca6e 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml index 1efb0ad8e..61b9e0fd1 100644 --- a/PowerEditor/installer/nativeLang/bulgarian.xml +++ b/PowerEditor/installer/nativeLang/bulgarian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index 7b020f0d8..e01fbdd7c 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index e0b11a7fe..266375397 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 1f3240fe6..2b1106084 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml index cadf25410..2312c3f61 100644 --- a/PowerEditor/installer/nativeLang/croatian.xml +++ b/PowerEditor/installer/nativeLang/croatian.xml @@ -5,7 +5,7 @@ Please e-mail errors, suggestions etc. to domazd(at)mail(dot)ru. --> - +
diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index 027b88593..24eb4cb86 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index dd8e3a569..7ccfddcfd 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml index da7539842..2e6348df9 100644 --- a/PowerEditor/installer/nativeLang/dutch.xml +++ b/PowerEditor/installer/nativeLang/dutch.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index b4ae66623..304e5616c 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/extremaduran.xml b/PowerEditor/installer/nativeLang/extremaduran.xml index 3801a0714..31debab4f 100644 --- a/PowerEditor/installer/nativeLang/extremaduran.xml +++ b/PowerEditor/installer/nativeLang/extremaduran.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index 6234a26e6..86403a4e3 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index 073d6247a..c5db26130 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -6,7 +6,7 @@ Asennusohjeet => https://sourceforge.net/forum/message.php?msg_id=5691520 --> - +
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index cde4b0753..46c14990b 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml index 3f1c14277..a922a1917 100644 --- a/PowerEditor/installer/nativeLang/friulian.xml +++ b/PowerEditor/installer/nativeLang/friulian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/galician.xml b/PowerEditor/installer/nativeLang/galician.xml index 38b84b338..335c7eab2 100644 --- a/PowerEditor/installer/nativeLang/galician.xml +++ b/PowerEditor/installer/nativeLang/galician.xml @@ -3,7 +3,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/georgian.xml b/PowerEditor/installer/nativeLang/georgian.xml index 3f37b7bbe..ac4bb57c6 100644 --- a/PowerEditor/installer/nativeLang/georgian.xml +++ b/PowerEditor/installer/nativeLang/georgian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index 42250e5ae..a22ba7b40 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -6,7 +6,7 @@ For installation instructions, see https://sourceforge.net/forum/message.php?msg_id=5691520 --> - +
diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml index 4a967ef92..74635e166 100644 --- a/PowerEditor/installer/nativeLang/greek.xml +++ b/PowerEditor/installer/nativeLang/greek.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/hebrew.xml b/PowerEditor/installer/nativeLang/hebrew.xml index ec5fcdab2..a4f1be51b 100644 --- a/PowerEditor/installer/nativeLang/hebrew.xml +++ b/PowerEditor/installer/nativeLang/hebrew.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/hungarian.xml b/PowerEditor/installer/nativeLang/hungarian.xml index 603c36b99..b0f9662bc 100644 --- a/PowerEditor/installer/nativeLang/hungarian.xml +++ b/PowerEditor/installer/nativeLang/hungarian.xml @@ -2,7 +2,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/hungarianA.xml b/PowerEditor/installer/nativeLang/hungarianA.xml index dd86aa98b..9a14a549b 100644 --- a/PowerEditor/installer/nativeLang/hungarianA.xml +++ b/PowerEditor/installer/nativeLang/hungarianA.xml @@ -2,7 +2,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/indonesian.xml b/PowerEditor/installer/nativeLang/indonesian.xml index 2937940fc..91a7a8841 100644 --- a/PowerEditor/installer/nativeLang/indonesian.xml +++ b/PowerEditor/installer/nativeLang/indonesian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 7fcb6883e..81880172e 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -6,7 +6,7 @@ For updates, see https://sourceforge.net/forum/message.php?msg_id=4588171 --> - +
diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml index 37a02fe7e..16ab437d1 100644 --- a/PowerEditor/installer/nativeLang/japanese.xml +++ b/PowerEditor/installer/nativeLang/japanese.xml @@ -1,6 +1,6 @@ - +
@@ -540,5 +540,5 @@ - - + + diff --git a/PowerEditor/installer/nativeLang/kazakh.xml b/PowerEditor/installer/nativeLang/kazakh.xml index e189be8f2..a6d1bce7e 100644 --- a/PowerEditor/installer/nativeLang/kazakh.xml +++ b/PowerEditor/installer/nativeLang/kazakh.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml index cf528e7ae..53bdd452c 100644 --- a/PowerEditor/installer/nativeLang/korean.xml +++ b/PowerEditor/installer/nativeLang/korean.xml @@ -17,7 +17,7 @@ name= "JongPil Kim" mail= "kmshts@naver.com" /> --> - +
diff --git a/PowerEditor/installer/nativeLang/kyrgyz.xml b/PowerEditor/installer/nativeLang/kyrgyz.xml index d20cf008c..29aaf6dbb 100644 --- a/PowerEditor/installer/nativeLang/kyrgyz.xml +++ b/PowerEditor/installer/nativeLang/kyrgyz.xml @@ -3,7 +3,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/lithuanian.xml b/PowerEditor/installer/nativeLang/lithuanian.xml index f3987dde6..f839b95ae 100644 --- a/PowerEditor/installer/nativeLang/lithuanian.xml +++ b/PowerEditor/installer/nativeLang/lithuanian.xml @@ -1,6 +1,6 @@ - + diff --git a/PowerEditor/installer/nativeLang/luxembourgish.xml b/PowerEditor/installer/nativeLang/luxembourgish.xml index 1719b1289..f304b8f9c 100644 --- a/PowerEditor/installer/nativeLang/luxembourgish.xml +++ b/PowerEditor/installer/nativeLang/luxembourgish.xml @@ -4,7 +4,7 @@ Last modified 02 December 2008 by Steve Gengler. --> - +
diff --git a/PowerEditor/installer/nativeLang/macedonian.xml b/PowerEditor/installer/nativeLang/macedonian.xml index 50596b627..59506dd7c 100644 --- a/PowerEditor/installer/nativeLang/macedonian.xml +++ b/PowerEditor/installer/nativeLang/macedonian.xml @@ -5,7 +5,7 @@ Please e-mail errors, suggestions etc. to kiril.sardjoski(at)gmail(dot)com. --> - +
diff --git a/PowerEditor/installer/nativeLang/malay.xml b/PowerEditor/installer/nativeLang/malay.xml index a060d28d3..0fb099c31 100644 --- a/PowerEditor/installer/nativeLang/malay.xml +++ b/PowerEditor/installer/nativeLang/malay.xml @@ -4,7 +4,7 @@ Author: Andi Rady Kurniawan Date: 12 October 2008 Desc: Malay translation for Notepad++ --> - + diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml index 9c13dee0b..4ab2ec7c3 100644 --- a/PowerEditor/installer/nativeLang/norwegian.xml +++ b/PowerEditor/installer/nativeLang/norwegian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml index 2a07e3a7c..277c1315b 100644 --- a/PowerEditor/installer/nativeLang/nynorsk.xml +++ b/PowerEditor/installer/nativeLang/nynorsk.xml @@ -1,6 +1,6 @@ - + diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml index 2923e11ce..70325bc1e 100644 --- a/PowerEditor/installer/nativeLang/polish.xml +++ b/PowerEditor/installer/nativeLang/polish.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index 27d67986f..03d38c519 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index 18376c013..d899fc0d8 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index 8b1841219..fbd591807 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/samogitian.xml b/PowerEditor/installer/nativeLang/samogitian.xml index 8d3f7ee4b..4b4a76b81 100644 --- a/PowerEditor/installer/nativeLang/samogitian.xml +++ b/PowerEditor/installer/nativeLang/samogitian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/serbian.xml b/PowerEditor/installer/nativeLang/serbian.xml index 5a2db6f83..8c056b372 100644 --- a/PowerEditor/installer/nativeLang/serbian.xml +++ b/PowerEditor/installer/nativeLang/serbian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml index 344f7b062..6d0005c6b 100644 --- a/PowerEditor/installer/nativeLang/slovak.xml +++ b/PowerEditor/installer/nativeLang/slovak.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/slovakA.xml b/PowerEditor/installer/nativeLang/slovakA.xml index 81cb51f0c..53db16666 100644 --- a/PowerEditor/installer/nativeLang/slovakA.xml +++ b/PowerEditor/installer/nativeLang/slovakA.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml index 2ba2cbf42..2aadccdd9 100644 --- a/PowerEditor/installer/nativeLang/slovenian.xml +++ b/PowerEditor/installer/nativeLang/slovenian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml index dc5812c72..0be729db0 100644 --- a/PowerEditor/installer/nativeLang/spanish.xml +++ b/PowerEditor/installer/nativeLang/spanish.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index b168c77ad..754bf0785 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index c6d2d9d4c..b6e6fbf42 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -30,7 +30,7 @@ Comments: Addons neccessary to comply with v5.2. *** Send new updates to the author of Notepad++ (don.h@free.fr) *** --> - +
diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml index 2ba26ee86..81abcdec3 100644 --- a/PowerEditor/installer/nativeLang/tagalog.xml +++ b/PowerEditor/installer/nativeLang/tagalog.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml index d1dcb8643..62223e7aa 100644 --- a/PowerEditor/installer/nativeLang/thai.xml +++ b/PowerEditor/installer/nativeLang/thai.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index 316ce4817..9dc18308b 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/ukrainian.xml b/PowerEditor/installer/nativeLang/ukrainian.xml index caa009b0a..7656bb978 100644 --- a/PowerEditor/installer/nativeLang/ukrainian.xml +++ b/PowerEditor/installer/nativeLang/ukrainian.xml @@ -1,6 +1,6 @@ - +
diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml index 96eb8e3b3..a0bbed4e8 100644 --- a/PowerEditor/installer/nativeLang/uzbek.xml +++ b/PowerEditor/installer/nativeLang/uzbek.xml @@ -4,7 +4,7 @@ - +
diff --git a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml index 75b9d1305..d55196194 100644 --- a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml +++ b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml @@ -4,7 +4,7 @@ - +
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 6549bc081..f6b7f26b7 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -197,7 +197,7 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Portuguese" !insertmacro MUI_LANGUAGE "Farsi" !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Indonesian" + !insertmacro MUI_LANGUAGE "Indonesian" !insertmacro MUI_LANGUAGE "Japanese" !insertmacro MUI_LANGUAGE "Croatian" !insertmacro MUI_LANGUAGE "Serbian" @@ -211,9 +211,9 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Luxembourgish" !insertmacro MUI_LANGUAGE "Afrikaans" !insertmacro MUI_LANGUAGE "Uzbek" + !insertmacro MUI_LANGUAGE "Macedonian" ;!insertmacro MUI_LANGUAGE "Latvian" - ;!insertmacro MUI_LANGUAGE "Macedonian" ;!insertmacro MUI_LANGUAGE "Estonian" ; !insertmacro MUI_LANGUAGE "Mongolian" ;!insertmacro MUI_LANGUAGE "Breton" @@ -242,7 +242,7 @@ Function .onInit Abort StrCmp $R0 "ME" 0 +3 - MessageBox MB_OK "The installer contains only Unicode version of Notepad++,, which is not compatible with your Windows ME.$\nPlease use ANSI version in zipped package, which you can download here :$\nhttps://sourceforge.net/project/showfiles.php?group_id=95717&package_id=102072" + MessageBox MB_OK "The installer contains only Unicode version of Notepad++, which is not compatible with your Windows ME.$\nPlease use ANSI version in zipped package, which you can download here :$\nhttps://sourceforge.net/project/showfiles.php?group_id=95717&package_id=102072" Abort !insertmacro MUI_LANGDLL_DISPLAY @@ -262,49 +262,60 @@ FunctionEnd LangString langFileName ${LANG_ENGLISH} "english.xml" LangString langFileName ${LANG_FRENCH} "french.xml" LangString langFileName ${LANG_TRADCHINESE} "chinese.xml" +LangString langFileName ${LANG_SIMPCHINESE} "chineseSimplified.xml" +LangString langFileName ${LANG_KOREAN} "korean.xml" +LangString langFileName ${LANG_JAPANESE} "japanese.xml" LangString langFileName ${LANG_GERMAN} "german.xml" LangString langFileName ${LANG_SPANISH} "spanish.xml" -LangString langFileName ${LANG_HUNGARIAN} "hungarian.xml" -LangString langFileName ${LANG_RUSSIAN} "russian.xml" -LangString langFileName ${LANG_DUTCH} "dutch.xml" -LangString langFileName ${LANG_SIMPCHINESE} "chineseSimplified.xml" LangString langFileName ${LANG_ITALIAN} "italian.xml" -LangString langFileName ${LANG_DANISH} "danish.xml" +LangString langFileName ${LANG_PORTUGUESE} "portuguese.xml" +LangString langFileName ${LANG_PORTUGUESEBR} "brazilian_portuguese.xml" +LangString langFileName ${LANG_DUTCH} "dutch.xml" +LangString langFileName ${LANG_RUSSIAN} "russian.xml" LangString langFileName ${LANG_POLISH} "polish.xml" +LangString langFileName ${LANG_CATALAN} "catalan.xml" LangString langFileName ${LANG_CZECH} "czech.xml" +LangString langFileName ${LANG_HUNGARIAN} "hungarian.xml" +LangString langFileName ${LANG_ROMANIAN} "romanian.xml" +LangString langFileName ${LANG_TURKISH} "turkish.xml" +LangString langFileName ${LANG_FARSI} "farsi.xml" +LangString langFileName ${LANG_UKRAINIAN} "ukrainian.xml" +LangString langFileName ${LANG_HEBREW} "hebrew.xml" +LangString langFileName ${LANG_NORWEGIANNYNORSK} "nynorsk.xml" +LangString langFileName ${LANG_NORWEGIAN} "norwegian.xml" + +LangString langFileName ${LANG_THAI} "thai.xml" + +LangString langFileName ${LANG_ARABIC} "arabic.xml" +LangString langFileName ${LANG_FINNISH} "finnish.xml" +LangString langFileName ${LANG_LITHUANIAN} "lithuanian.xml" +LangString langFileName ${LANG_GREEK} "greek.xml" +LangString langFileName ${LANG_SWEDISH} "swedish.xml" +LangString langFileName ${LANG_GALICIAN} "galician.xml" LangString langFileName ${LANG_SLOVENIAN} "slovenian.xml" LangString langFileName ${LANG_SLOVAK} "slovak.xml" -LangString langFileName ${LANG_SWEDISH} "swedish.xml" -LangString langFileName ${LANG_NORWEGIAN} "norwegian.xml" -LangString langFileName ${LANG_PORTUGUESEBR} "brazilian_portuguese.xml" -LangString langFileName ${LANG_UKRAINIAN} "ukrainian.xml" -LangString langFileName ${LANG_TURKISH} "turkish.xml" -LangString langFileName ${LANG_CATALAN} "catalan.xml" -LangString langFileName ${LANG_ARABIC} "arabic.xml" -LangString langFileName ${LANG_LITHUANIAN} "lithuanian.xml" -LangString langFileName ${LANG_FINNISH} "finnish.xml" -LangString langFileName ${LANG_GREEK} "greek.xml" -LangString langFileName ${LANG_ROMANIAN} "romanian.xml" -LangString langFileName ${LANG_KOREAN} "korean.xml" -LangString langFileName ${LANG_HEBREW} "hebrew.xml" -LangString langFileName ${LANG_PORTUGUESE} "portuguese.xml" -LangString langFileName ${LANG_FARSI} "farsi.xml" +LangString langFileName ${LANG_DANISH} "danish.xml" + + + LangString langFileName ${LANG_BULGARIAN} "bulgarian.xml" LangString langFileName ${LANG_INDONESIAN} "indonesian.xml" -LangString langFileName ${LANG_JAPANESE} "japanese.xml" -LangString langFileName ${LANG_CROATIAN} "croatian.xml" -LangString langFileName ${LANG_SERBIAN} "serbian.xml" -LangString langFileName ${LANG_THAI} "thai.xml" -LangString langFileName ${LANG_NORWEGIANNYNORSK} "nynorsk.xml" -LangString langFileName ${LANG_BELARUSIAN} "belarusian.xml" LangString langFileName ${LANG_ALBANIAN} "albanian.xml" -LangString langFileName ${LANG_MALAY} "malay.xml" -LangString langFileName ${LANG_GALICIAN} "galician.xml" +LangString langFileName ${LANG_CROATIAN} "croatian.xml" + LangString langFileName ${LANG_BASQUE} "basque.xml" + +LangString langFileName ${LANG_BELARUSIAN} "belarusian.xml" +LangString langFileName ${LANG_SERBIAN} "serbian.xml" +LangString langFileName ${LANG_MALAY} "malay.xml" LangString langFileName ${LANG_LUXEMBOURGISH} "luxembourgish.xml" + LangString langFileName ${LANG_AFRIKAANS} "afrikaans.xml" + LangString langFileName ${LANG_UZBEK} "uzbek.xml" +LangString langFileName ${LANG_MACEDONIAN} "macedonian.xml" + ;-------------------------------- ;Variables diff --git a/PowerEditor/misc/npp.help/HTML/Encoding.html b/PowerEditor/misc/npp.help/HTML/Encoding.html index 13807a50a..c340958ec 100644 --- a/PowerEditor/misc/npp.help/HTML/Encoding.html +++ b/PowerEditor/misc/npp.help/HTML/Encoding.html @@ -38,5 +38,6 @@ byte BOM will be added upon save.
UTF-16 Big Endian
All characters are two bytes in size, pairs are Big Endian ordered. A 4 byte BOM is added upon save. -

In addition, since version 5.6, Notepad++ supports changing the character set being used to display the text, exactly the way you can change it on most web browsers. Thiese encodings are available using the More menu entry which comes right after the Encode in ... family items. +

In addition, since version 5.6, Notepad++ supports changing the character set being used to display the text, exactly the way you can change it on most web browsers. Thiese encodings are available using the Character sets menu entry which comes right after the Encode in ... family items. +

Note that, for HTML and XML files, Notepad++ attempts to detect the encoding being used when the file is opened, thus avoiding a number of errors which may not show before the file is being used on a server. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Newline format.html b/PowerEditor/misc/npp.help/HTML/Newline format.html index f41686b72..9f2cc06fb 100644 --- a/PowerEditor/misc/npp.help/HTML/Newline format.html +++ b/PowerEditor/misc/npp.help/HTML/Newline format.html @@ -9,7 +9,7 @@ indicate where one line ends and a new one begins. Because operating systems hav different traditional formats, Notepad++ and Scintilla have support to handle and them. When editing a file, Notepad++ will try to determine the newline format used and base any newline operations on that. To -change the format used, simple select it from the Format menu. All +change the format used, simply select it from the Edit menu. All newlines will be changed and subsequent newlines added will be of this format. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Search window.html b/PowerEditor/misc/npp.help/HTML/Search window.html index d490d0f33..31ce4095e 100644 --- a/PowerEditor/misc/npp.help/HTML/Search window.html +++ b/PowerEditor/misc/npp.help/HTML/Search window.html @@ -23,7 +23,6 @@ location. Using the Open All right-click menu ent

Search->Switch to found results window shows this window if hidden and not empty, and toggles focus between it and the main Notepad++ window. When the window is not shown, Go to Next found result and Go to Previous found result navigate among results. -On earlier versions of Notepad++, the three menu entries are not there, and the names may not show on the Shortcut mapper. Default key bindings are F7, F4 and Shift+F4 respectively).

The diff --git a/PowerEditor/misc/npp.help/HTML/Selecting.html b/PowerEditor/misc/npp.help/HTML/Selecting.html index c8da3ba8d..4499967ce 100644 --- a/PowerEditor/misc/npp.help/HTML/Selecting.html +++ b/PowerEditor/misc/npp.help/HTML/Selecting.html @@ -24,7 +24,7 @@ You can extend a selection by shift clicking its new insertion point. in conjunction with the Shift modifier. These keyboard shortcuts can be changed at any time using the Shortcut Mapper.

Stream vs rectangular selection

The above procedures are known to define a stream selection, which encompasses -a contiguous range of text. +a contiguous range of text. Using the SCI_SWAPMAINANCHORCARET Scintilla command from the Shortcut mapper, you can choose whether the caret starts or ends the selection.

However, Notepad++ also knows about rectangular selections, which define a rectangle of strips on contiguous lines. To select a rectangle, use the above methods while also holding the Alt modifier key down. For exmple, the basic way with the mouse is to Alt-click the start point and Alt-move the mouse to the end point, and so forth. The Alt- versions of keyboard shortcuts can be changed as well. @@ -34,7 +34,7 @@ This is probably less useful, but is not a bug.

Multiple stream selections

If a stream area is selected, it is possible to add another, disjoint area by Ctrl-clicking its start point and moving the mouse to the end point. More than one extra selection can be added this way. However, this ability -does not extend to rectangular selections. A rectangular selection may still cling to one of the stream selections though. +does not extend to rectangular selections. A rectangular selection may still cling to one of the stream selections though. The SCI_ROTATESELECTION Scintilla command enables to cycle through selections, in the order they were defined.

When copying or cutting a multiple selection, the text is recorded in the order the selections appear, regardless of the order in which they were made. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/HTML/Shell Extension.html b/PowerEditor/misc/npp.help/HTML/Shell Extension.html index 9217c67a6..cd6ed2e9b 100644 --- a/PowerEditor/misc/npp.help/HTML/Shell Extension.html +++ b/PowerEditor/misc/npp.help/HTML/Shell Extension.html @@ -17,5 +17,5 @@ logout and log back in or use the task manager to kill explorer

If the Shell extension is already installed, the Notepad++ installer cannot update or overwrite it, you first have to uninstall it and restart Explorer. -

If you issue the install command for the dll, which is regsvr32 /i NppShell.dll, a dialog box will pop up from which various details of the behaviour of the extension can be tweaked. +

If you issue the install command for the dll, which is regsvr32 /i NppShell_01.dll, a dialog box will pop up from which various details of the behaviour of the extension can be tweaked. The trailing number will increase as versions go. \ No newline at end of file diff --git a/PowerEditor/misc/npp.help/Notepad++Help.hhp b/PowerEditor/misc/npp.help/Notepad++Help.hhp index 303d3b73d..0ea0ad6cf 100644 --- a/PowerEditor/misc/npp.help/Notepad++Help.hhp +++ b/PowerEditor/misc/npp.help/Notepad++Help.hhp @@ -7,10 +7,10 @@ Default topic=HTML\Introduction.html Display compile progress=No Index file=Index.hhk Language=0x809 Anglais (Royaume-Uni) -Title=Notepad++ Reference Manual - version 5.6 +Title=Notepad++ Reference Manual - version 5.6.1 [WINDOWS] -WinType1="Notepad++ Reference Manual - Version 5.6","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0 +WinType1="Notepad++ Reference Manual - Version 5.6.1","Table of Contents.hhc","Index.hhk","HTML\Introduction.html",,,,,,0x3120,,0x300e,[104,86,765,538],0x10080000,0x404,,,,,0 [FILES] diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index d1425f6ed..e54071cfa 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -86,9 +86,9 @@ Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _p _isRTL = (strcmp(rtl, "yes") == 0); // get original file name (defined by Notpad++) from the attribute - LocalizationSwitcher & localizationSwitcher = (NppParameters::getInstance())->getLocalizationSwitcher(); - const char *fn = element->Attribute("fileName"); + const char *fn = element->Attribute("filename"); #ifdef UNICODE + LocalizationSwitcher & localizationSwitcher = (NppParameters::getInstance())->getLocalizationSwitcher(); if (fn) { localizationSwitcher.setFileName(fn); diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 83ddfb6cf..b340c3ee5 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -209,12 +209,6 @@ BEGIN MENUITEM "&Delete", IDM_EDIT_DELETE MENUITEM "Select A&ll", IDM_EDIT_SELECTALL MENUITEM SEPARATOR - POPUP "EOL Conversion" - BEGIN - MENUITEM "Windows Format", IDM_FORMAT_TODOS - MENUITEM "UNIX Format", IDM_FORMAT_TOUNIX - MENUITEM "Mac Format", IDM_FORMAT_TOMAC - END POPUP "Copy to Clipboard" BEGIN MENUITEM "Current Full File path to Clipboard", IDM_EDIT_FULLPATHTOCLIP @@ -252,6 +246,12 @@ BEGIN MENUITEM "Word Completion", IDM_EDIT_AUTOCOMPLETE_CURRENTFILE MENUITEM "Function Parameters Hint", IDM_EDIT_FUNCCALLTIP END + POPUP "EOL Conversion" + BEGIN + MENUITEM "Windows Format", IDM_FORMAT_TODOS + MENUITEM "UNIX Format", IDM_FORMAT_TOUNIX + MENUITEM "Mac Format", IDM_FORMAT_TOMAC + END MENUITEM "Trim Trailing Space", IDM_EDIT_TRIMTRAILING MENUITEM SEPARATOR MENUITEM "Column Editor...", IDM_EDIT_COLUMNMODE