From 43a49d0b54ed9f50eca887a2e026caf81caed64b Mon Sep 17 00:00:00 2001 From: Don Ho Date: Fri, 21 Aug 2009 01:21:26 +0000 Subject: [PATCH] [MODIF] Modify menu items and controls names. [NEW] Add Uzbek, Kazakh and Afrikaans languages. [UPDATE] Update English, Chinese, French and the other language files. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@524 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../installer/nativeLang/afrikaans.xml | 539 ++++++++++ PowerEditor/installer/nativeLang/aranese.xml | 6 +- PowerEditor/installer/nativeLang/basque.xml | 6 +- .../installer/nativeLang/belarusian.xml | 6 +- .../nativeLang/brazilian_portuguese.xml | 6 +- .../installer/nativeLang/bulgarian.xml | 6 +- PowerEditor/installer/nativeLang/catalan.xml | 6 +- PowerEditor/installer/nativeLang/chinese.xml | 21 +- .../nativeLang/chineseSimplified.xml | 6 +- PowerEditor/installer/nativeLang/croatian.xml | 6 +- PowerEditor/installer/nativeLang/czech.xml | 6 +- PowerEditor/installer/nativeLang/danish.xml | 6 +- PowerEditor/installer/nativeLang/dutch.xml | 6 +- PowerEditor/installer/nativeLang/english.xml | 413 ++++---- .../installer/nativeLang/extremaduran.xml | 6 +- PowerEditor/installer/nativeLang/farsi.xml | 6 +- PowerEditor/installer/nativeLang/finnish.xml | 16 +- PowerEditor/installer/nativeLang/french.xml | 19 +- PowerEditor/installer/nativeLang/friulian.xml | 6 +- PowerEditor/installer/nativeLang/galician.xml | 6 +- PowerEditor/installer/nativeLang/german.xml | 6 +- PowerEditor/installer/nativeLang/greek.xml | 924 +++++++++--------- .../installer/nativeLang/hungarian.xml | 91 +- .../installer/nativeLang/hungarianA.xml | 91 +- PowerEditor/installer/nativeLang/italian.xml | 6 +- PowerEditor/installer/nativeLang/japanese.xml | 6 +- PowerEditor/installer/nativeLang/kazakh.xml | 536 ++++++++++ PowerEditor/installer/nativeLang/korean.xml | 6 +- .../installer/nativeLang/luxembourgish.xml | 6 +- PowerEditor/installer/nativeLang/malay.xml | 7 +- .../installer/nativeLang/norwegian.xml | 6 +- PowerEditor/installer/nativeLang/nynorsk.xml | 6 +- PowerEditor/installer/nativeLang/occitan.xml | 6 +- PowerEditor/installer/nativeLang/polish.xml | 6 +- .../installer/nativeLang/portuguese.xml | 4 +- PowerEditor/installer/nativeLang/romanian.xml | 6 +- PowerEditor/installer/nativeLang/russian.xml | 65 +- PowerEditor/installer/nativeLang/serbian.xml | 6 +- PowerEditor/installer/nativeLang/slovak.xml | 118 ++- PowerEditor/installer/nativeLang/slovakA.xml | 6 +- .../installer/nativeLang/slovenian.xml | 6 +- PowerEditor/installer/nativeLang/spanish.xml | 6 +- .../installer/nativeLang/spanish_ar.xml | 6 +- PowerEditor/installer/nativeLang/swedish.xml | 6 +- PowerEditor/installer/nativeLang/tagalog.xml | 6 +- PowerEditor/installer/nativeLang/thai.xml | 6 +- PowerEditor/installer/nativeLang/turkish.xml | 6 +- .../installer/nativeLang/ukrainian.xml | 6 +- PowerEditor/installer/nativeLang/uzbek.xml | 544 +++++++++++ .../installer/nativeLang/uzbekCyrillic.xml | 544 +++++++++++ PowerEditor/installer/nppSetup.nsi | 5 +- PowerEditor/src/Notepad_plus.cpp | 35 +- PowerEditor/src/Notepad_plus.rc | 159 ++- .../src/ScitillaComponent/FindReplaceDlg.cpp | 2 +- .../src/ScitillaComponent/FindReplaceDlg.rc | 14 +- .../src/ScitillaComponent/UserDefineDialog.rc | 30 +- .../src/ScitillaComponent/columnEditor.rc | 4 +- .../WinControls/ColourPicker/WordStyleDlg.rc | 22 +- .../src/WinControls/Preference/preference.rc | 82 +- .../WinControls/Preference/preferenceDlg.cpp | 10 +- .../WinControls/Preference/preference_rc.h | 1 + .../WinControls/StaticDialog/RunDlg/RunDlg.rc | 4 +- .../src/WinControls/WindowsDlg/WindowsDlg.rc | 4 +- .../src/WinControls/shortcut/RunMacroDlg.rc | 2 +- PowerEditor/src/lastRecentFileList.cpp | 2 +- PowerEditor/src/localizationString.h | Bin 6188 -> 6534 bytes PowerEditor/visual.net/notepadPlus.vcproj | 4 + 67 files changed, 3348 insertions(+), 1174 deletions(-) create mode 100644 PowerEditor/installer/nativeLang/afrikaans.xml create mode 100644 PowerEditor/installer/nativeLang/kazakh.xml create mode 100644 PowerEditor/installer/nativeLang/uzbek.xml create mode 100644 PowerEditor/installer/nativeLang/uzbekCyrillic.xml diff --git a/PowerEditor/installer/nativeLang/afrikaans.xml b/PowerEditor/installer/nativeLang/afrikaans.xml new file mode 100644 index 000000000..25e043e22 --- /dev/null +++ b/PowerEditor/installer/nativeLang/afrikaans.xml @@ -0,0 +1,539 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/aranese.xml b/PowerEditor/installer/nativeLang/aranese.xml index 867116b9e..b98eee253 100644 --- a/PowerEditor/installer/nativeLang/aranese.xml +++ b/PowerEditor/installer/nativeLang/aranese.xml @@ -313,7 +313,7 @@ - + @@ -325,8 +325,6 @@ - - @@ -341,7 +339,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/basque.xml b/PowerEditor/installer/nativeLang/basque.xml index b92db7348..143833164 100644 --- a/PowerEditor/installer/nativeLang/basque.xml +++ b/PowerEditor/installer/nativeLang/basque.xml @@ -388,7 +388,7 @@ - + @@ -400,8 +400,6 @@ - - @@ -416,7 +414,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/belarusian.xml b/PowerEditor/installer/nativeLang/belarusian.xml index ff7771165..36a6afc75 100644 --- a/PowerEditor/installer/nativeLang/belarusian.xml +++ b/PowerEditor/installer/nativeLang/belarusian.xml @@ -313,7 +313,7 @@ - + @@ -325,8 +325,6 @@ - - @@ -341,7 +339,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml index a4759cfb9..bb1dd06b9 100644 --- a/PowerEditor/installer/nativeLang/brazilian_portuguese.xml +++ b/PowerEditor/installer/nativeLang/brazilian_portuguese.xml @@ -438,7 +438,7 @@ - + @@ -450,8 +450,6 @@ - - @@ -466,7 +464,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/bulgarian.xml b/PowerEditor/installer/nativeLang/bulgarian.xml index bb622513c..2751c5c1e 100644 --- a/PowerEditor/installer/nativeLang/bulgarian.xml +++ b/PowerEditor/installer/nativeLang/bulgarian.xml @@ -435,7 +435,7 @@ - + @@ -447,8 +447,6 @@ - - @@ -463,7 +461,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/catalan.xml b/PowerEditor/installer/nativeLang/catalan.xml index b570edbe3..cd38831fd 100644 --- a/PowerEditor/installer/nativeLang/catalan.xml +++ b/PowerEditor/installer/nativeLang/catalan.xml @@ -405,7 +405,7 @@ - + @@ -417,8 +417,6 @@ - - @@ -433,7 +431,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index a908809ab..e0b11a7fe 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -233,7 +233,6 @@ - @@ -264,7 +263,6 @@ - @@ -383,12 +381,7 @@ - - - - - - + @@ -425,12 +418,15 @@ - + + + + - + @@ -442,8 +438,6 @@ - - @@ -458,7 +452,8 @@ - + + diff --git a/PowerEditor/installer/nativeLang/chineseSimplified.xml b/PowerEditor/installer/nativeLang/chineseSimplified.xml index 172bfbb45..1e4d2bd85 100644 --- a/PowerEditor/installer/nativeLang/chineseSimplified.xml +++ b/PowerEditor/installer/nativeLang/chineseSimplified.xml @@ -434,7 +434,7 @@ - + @@ -446,8 +446,6 @@ - - @@ -462,7 +460,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/croatian.xml b/PowerEditor/installer/nativeLang/croatian.xml index 3a15a6ee3..cadf25410 100644 --- a/PowerEditor/installer/nativeLang/croatian.xml +++ b/PowerEditor/installer/nativeLang/croatian.xml @@ -412,7 +412,7 @@ - + @@ -424,8 +424,6 @@ - - @@ -440,7 +438,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/czech.xml b/PowerEditor/installer/nativeLang/czech.xml index b49283836..8af7ef405 100644 --- a/PowerEditor/installer/nativeLang/czech.xml +++ b/PowerEditor/installer/nativeLang/czech.xml @@ -443,7 +443,7 @@ - + @@ -455,8 +455,6 @@ - - @@ -472,7 +470,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/danish.xml b/PowerEditor/installer/nativeLang/danish.xml index 4a4b2cc4a..0d74113ad 100644 --- a/PowerEditor/installer/nativeLang/danish.xml +++ b/PowerEditor/installer/nativeLang/danish.xml @@ -439,7 +439,7 @@ - + @@ -451,8 +451,6 @@ - - @@ -467,7 +465,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/dutch.xml b/PowerEditor/installer/nativeLang/dutch.xml index 6d1b9d097..9c584d143 100644 --- a/PowerEditor/installer/nativeLang/dutch.xml +++ b/PowerEditor/installer/nativeLang/dutch.xml @@ -436,7 +436,7 @@ - + @@ -448,8 +448,6 @@ - - @@ -464,7 +462,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 1eb381ab0..87f340275 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -20,20 +20,20 @@ - + - - + + - - - + + + - + - - + + @@ -47,7 +47,7 @@ - + @@ -65,82 +65,82 @@ - - - - - - - + + + + + + + - - + + - + - - - - - - - - + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - + + + + + + @@ -156,58 +156,58 @@ - - - - + + + + - - + + - + - + - - + + - - - + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + @@ -219,7 +219,7 @@ - + @@ -227,30 +227,29 @@ - + - - - - + + + - + - - + + - + - + @@ -258,14 +257,13 @@ - - + + - @@ -273,55 +271,51 @@ - - - + + + - - - - - - + + + + - + - - + + - + - + - - + + - - - - - + + + + + - - - + + + @@ -336,16 +330,16 @@ - - + + - - + + @@ -354,60 +348,55 @@ - + - - + + - + - + - - - + + + - - + + - + - - + + - - + + - - - - - - + - - - - + + + + - + - - + + - + @@ -417,36 +406,37 @@ - - - - - - + + + + + + - + + + + - - - + + + - + - - @@ -461,48 +451,49 @@ - - - + + + + - + - - - + + + - + - + - + - + - + - + - - - + + + - - + + - + @@ -513,18 +504,18 @@ - + - - + + - - + + diff --git a/PowerEditor/installer/nativeLang/extremaduran.xml b/PowerEditor/installer/nativeLang/extremaduran.xml index 3cb9c5f08..3801a0714 100644 --- a/PowerEditor/installer/nativeLang/extremaduran.xml +++ b/PowerEditor/installer/nativeLang/extremaduran.xml @@ -361,7 +361,7 @@ - + @@ -373,8 +373,6 @@ - - @@ -389,7 +387,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/farsi.xml b/PowerEditor/installer/nativeLang/farsi.xml index 44fe26d60..6234a26e6 100644 --- a/PowerEditor/installer/nativeLang/farsi.xml +++ b/PowerEditor/installer/nativeLang/farsi.xml @@ -402,7 +402,7 @@ - + @@ -414,8 +414,6 @@ - - @@ -430,7 +428,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/finnish.xml b/PowerEditor/installer/nativeLang/finnish.xml index 2af21176a..6738f4207 100644 --- a/PowerEditor/installer/nativeLang/finnish.xml +++ b/PowerEditor/installer/nativeLang/finnish.xml @@ -482,7 +482,7 @@ - + @@ -494,18 +494,12 @@ - - - - @@ -513,15 +507,9 @@ - - - - - + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 9cbb64a60..1819144f4 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -231,7 +231,6 @@ - @@ -262,7 +261,6 @@ - @@ -379,11 +377,6 @@ - - - - - @@ -419,12 +412,15 @@ - + + + + - + @@ -436,8 +432,6 @@ - - @@ -452,7 +446,8 @@ - + + diff --git a/PowerEditor/installer/nativeLang/friulian.xml b/PowerEditor/installer/nativeLang/friulian.xml index f0ec52e03..3f1c14277 100644 --- a/PowerEditor/installer/nativeLang/friulian.xml +++ b/PowerEditor/installer/nativeLang/friulian.xml @@ -388,7 +388,7 @@ - + @@ -400,8 +400,6 @@ - - @@ -416,7 +414,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/galician.xml b/PowerEditor/installer/nativeLang/galician.xml index 012337df7..38b84b338 100644 --- a/PowerEditor/installer/nativeLang/galician.xml +++ b/PowerEditor/installer/nativeLang/galician.xml @@ -364,7 +364,7 @@ - + @@ -376,8 +376,6 @@ - - @@ -392,7 +390,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml index fd72f8249..bcc146018 100644 --- a/PowerEditor/installer/nativeLang/german.xml +++ b/PowerEditor/installer/nativeLang/german.xml @@ -419,7 +419,7 @@ - + @@ -431,8 +431,6 @@ - - @@ -448,7 +446,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/greek.xml b/PowerEditor/installer/nativeLang/greek.xml index 7552cd46d..4a967ef92 100644 --- a/PowerEditor/installer/nativeLang/greek.xml +++ b/PowerEditor/installer/nativeLang/greek.xml @@ -1,9 +1,9 @@ - + - +
- + @@ -17,476 +17,520 @@ - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - + + - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/PowerEditor/installer/nativeLang/hungarian.xml b/PowerEditor/installer/nativeLang/hungarian.xml index ee7786c85..491008cb0 100644 --- a/PowerEditor/installer/nativeLang/hungarian.xml +++ b/PowerEditor/installer/nativeLang/hungarian.xml @@ -20,8 +20,20 @@ - - + + + + + + + + + + + + + + @@ -51,8 +63,8 @@ - - + + @@ -64,19 +76,19 @@ - + - - - + + + - + @@ -98,6 +110,17 @@ + + + + + + + + + + + @@ -109,8 +132,8 @@ - - + + @@ -133,10 +156,10 @@ - + - - + + @@ -169,7 +192,7 @@ - + @@ -178,8 +201,8 @@ - - + + @@ -188,9 +211,9 @@ - - - + + + @@ -220,6 +243,9 @@ + + + @@ -243,7 +269,7 @@ - + @@ -251,14 +277,11 @@ - - + @@ -352,6 +375,7 @@ + @@ -404,8 +428,9 @@ + - + @@ -417,8 +442,6 @@ - - @@ -433,7 +456,7 @@ - + @@ -442,19 +465,19 @@ - + - + - - + + @@ -485,7 +508,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/hungarianA.xml b/PowerEditor/installer/nativeLang/hungarianA.xml index 9e194de98..b3f6282ad 100644 --- a/PowerEditor/installer/nativeLang/hungarianA.xml +++ b/PowerEditor/installer/nativeLang/hungarianA.xml @@ -20,8 +20,20 @@ - - + + + + + + + + + + + + + + @@ -51,8 +63,8 @@ - - + + @@ -64,19 +76,19 @@ - + - - - + + + - + @@ -98,6 +110,17 @@ + + + + + + + + + + + @@ -109,8 +132,8 @@ - - + + @@ -133,10 +156,10 @@ - + - - + + @@ -169,7 +192,7 @@ - + @@ -178,8 +201,8 @@ - - + + @@ -188,9 +211,9 @@ - - - + + + @@ -220,6 +243,9 @@ + + + @@ -243,7 +269,7 @@ - + @@ -251,14 +277,11 @@ - - + @@ -352,6 +375,7 @@ + @@ -404,8 +428,9 @@ + - + @@ -417,8 +442,6 @@ - - @@ -433,7 +456,7 @@ - + @@ -442,19 +465,19 @@ - + - + - - + + @@ -485,7 +508,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/italian.xml b/PowerEditor/installer/nativeLang/italian.xml index 6e96fbf9f..a453cffa3 100644 --- a/PowerEditor/installer/nativeLang/italian.xml +++ b/PowerEditor/installer/nativeLang/italian.xml @@ -420,7 +420,7 @@ - + @@ -432,8 +432,6 @@ - - @@ -449,7 +447,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/japanese.xml b/PowerEditor/installer/nativeLang/japanese.xml index 9d079bccb..b289e0b9c 100644 --- a/PowerEditor/installer/nativeLang/japanese.xml +++ b/PowerEditor/installer/nativeLang/japanese.xml @@ -361,7 +361,7 @@ - + @@ -373,8 +373,6 @@ - - @@ -389,7 +387,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/kazakh.xml b/PowerEditor/installer/nativeLang/kazakh.xml new file mode 100644 index 000000000..370b07c31 --- /dev/null +++ b/PowerEditor/installer/nativeLang/kazakh.xml @@ -0,0 +1,536 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/nativeLang/korean.xml b/PowerEditor/installer/nativeLang/korean.xml index 1280a4751..cf528e7ae 100644 --- a/PowerEditor/installer/nativeLang/korean.xml +++ b/PowerEditor/installer/nativeLang/korean.xml @@ -811,7 +811,7 @@ mail= "kmshts@naver.com" - + - - - + diff --git a/PowerEditor/installer/nativeLang/luxembourgish.xml b/PowerEditor/installer/nativeLang/luxembourgish.xml index b80aab82e..1719b1289 100644 --- a/PowerEditor/installer/nativeLang/luxembourgish.xml +++ b/PowerEditor/installer/nativeLang/luxembourgish.xml @@ -383,7 +383,7 @@ - + @@ -395,8 +395,6 @@ - - @@ -411,7 +409,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/malay.xml b/PowerEditor/installer/nativeLang/malay.xml index f551b745e..a060d28d3 100644 --- a/PowerEditor/installer/nativeLang/malay.xml +++ b/PowerEditor/installer/nativeLang/malay.xml @@ -395,7 +395,7 @@ Desc: Malay translation for Notepad++ - + @@ -407,9 +407,6 @@ Desc: Malay translation for Notepad++ - - - @@ -424,7 +421,7 @@ Desc: Malay translation for Notepad++ - + diff --git a/PowerEditor/installer/nativeLang/norwegian.xml b/PowerEditor/installer/nativeLang/norwegian.xml index d32cd0580..23c687f97 100644 --- a/PowerEditor/installer/nativeLang/norwegian.xml +++ b/PowerEditor/installer/nativeLang/norwegian.xml @@ -409,7 +409,7 @@ - + @@ -421,8 +421,6 @@ - - @@ -437,7 +435,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/nynorsk.xml b/PowerEditor/installer/nativeLang/nynorsk.xml index 70a795cb2..2a07e3a7c 100644 --- a/PowerEditor/installer/nativeLang/nynorsk.xml +++ b/PowerEditor/installer/nativeLang/nynorsk.xml @@ -371,7 +371,7 @@ - + @@ -383,8 +383,6 @@ - - @@ -399,7 +397,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/occitan.xml b/PowerEditor/installer/nativeLang/occitan.xml index a1d300aaf..0c4f99fc4 100644 --- a/PowerEditor/installer/nativeLang/occitan.xml +++ b/PowerEditor/installer/nativeLang/occitan.xml @@ -393,7 +393,7 @@ - + @@ -405,8 +405,6 @@ - - @@ -421,7 +419,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/polish.xml b/PowerEditor/installer/nativeLang/polish.xml index 32345fefb..3a3669b42 100644 --- a/PowerEditor/installer/nativeLang/polish.xml +++ b/PowerEditor/installer/nativeLang/polish.xml @@ -433,7 +433,7 @@ - + @@ -445,8 +445,6 @@ - - @@ -461,7 +459,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/portuguese.xml b/PowerEditor/installer/nativeLang/portuguese.xml index c4c0fb46b..27d67986f 100644 --- a/PowerEditor/installer/nativeLang/portuguese.xml +++ b/PowerEditor/installer/nativeLang/portuguese.xml @@ -350,7 +350,7 @@ - + @@ -362,7 +362,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/romanian.xml b/PowerEditor/installer/nativeLang/romanian.xml index 519b9f562..db8ee5791 100644 --- a/PowerEditor/installer/nativeLang/romanian.xml +++ b/PowerEditor/installer/nativeLang/romanian.xml @@ -441,7 +441,7 @@ - + @@ -453,8 +453,6 @@ - - @@ -470,7 +468,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/russian.xml b/PowerEditor/installer/nativeLang/russian.xml index c0ff56d7e..8b1841219 100644 --- a/PowerEditor/installer/nativeLang/russian.xml +++ b/PowerEditor/installer/nativeLang/russian.xml @@ -108,9 +108,9 @@ - + - + @@ -135,8 +135,8 @@ - - + + @@ -226,7 +226,6 @@ - @@ -242,6 +241,7 @@ + @@ -278,35 +278,34 @@ - - + - - - - + + + + - + - - + + + - + + - + @@ -372,8 +371,8 @@ - - + + @@ -394,11 +393,11 @@ - + - + @@ -418,7 +417,7 @@ - + @@ -429,7 +428,7 @@ - + @@ -441,8 +440,6 @@ - - @@ -458,7 +455,7 @@ - + @@ -475,9 +472,9 @@ - + - + @@ -492,7 +489,7 @@ - + @@ -513,16 +510,16 @@ - + - + - - + + diff --git a/PowerEditor/installer/nativeLang/serbian.xml b/PowerEditor/installer/nativeLang/serbian.xml index b34de52e5..5a2db6f83 100644 --- a/PowerEditor/installer/nativeLang/serbian.xml +++ b/PowerEditor/installer/nativeLang/serbian.xml @@ -352,7 +352,7 @@ - + @@ -364,8 +364,6 @@ - - @@ -380,7 +378,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/slovak.xml b/PowerEditor/installer/nativeLang/slovak.xml index d8ec44cd9..f3fa97452 100644 --- a/PowerEditor/installer/nativeLang/slovak.xml +++ b/PowerEditor/installer/nativeLang/slovak.xml @@ -20,6 +20,18 @@ + + + + + + + + + + + + @@ -33,14 +45,14 @@ - + - + @@ -51,14 +63,14 @@ - - + + - + @@ -98,6 +110,17 @@ + + + + + + + + + + + @@ -112,40 +135,41 @@ - + - - + + - - - - - - + + + + + + - - - + + + + + - - + @@ -216,9 +240,14 @@ + + + + + @@ -241,7 +270,8 @@ - + + @@ -250,9 +280,6 @@ - @@ -351,35 +378,36 @@ + - - - - + + + + - + - + - + - + @@ -403,8 +431,9 @@ + - + @@ -416,8 +445,6 @@ - - @@ -432,7 +459,7 @@ - + @@ -450,16 +477,15 @@ - - - - + + + + - + - - + @@ -467,21 +493,21 @@ - + - + - + - + diff --git a/PowerEditor/installer/nativeLang/slovakA.xml b/PowerEditor/installer/nativeLang/slovakA.xml index 6662804f4..105b87732 100644 --- a/PowerEditor/installer/nativeLang/slovakA.xml +++ b/PowerEditor/installer/nativeLang/slovakA.xml @@ -404,7 +404,7 @@ - + @@ -416,8 +416,6 @@ - - @@ -432,7 +430,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/slovenian.xml b/PowerEditor/installer/nativeLang/slovenian.xml index 1391e2208..2ba2cbf42 100644 --- a/PowerEditor/installer/nativeLang/slovenian.xml +++ b/PowerEditor/installer/nativeLang/slovenian.xml @@ -388,7 +388,7 @@ - + @@ -400,8 +400,6 @@ - - @@ -416,7 +414,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/spanish.xml b/PowerEditor/installer/nativeLang/spanish.xml index 9069c279f..509730d01 100644 --- a/PowerEditor/installer/nativeLang/spanish.xml +++ b/PowerEditor/installer/nativeLang/spanish.xml @@ -433,7 +433,7 @@ - + @@ -445,8 +445,6 @@ - - @@ -461,7 +459,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/spanish_ar.xml b/PowerEditor/installer/nativeLang/spanish_ar.xml index 471aff93b..b168c77ad 100644 --- a/PowerEditor/installer/nativeLang/spanish_ar.xml +++ b/PowerEditor/installer/nativeLang/spanish_ar.xml @@ -383,7 +383,7 @@ - + @@ -395,8 +395,6 @@ - - @@ -411,7 +409,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/swedish.xml b/PowerEditor/installer/nativeLang/swedish.xml index 7abf85a6f..c6d2d9d4c 100644 --- a/PowerEditor/installer/nativeLang/swedish.xml +++ b/PowerEditor/installer/nativeLang/swedish.xml @@ -434,7 +434,7 @@ Comments: Addons neccessary to comply with v5.2. - + @@ -446,8 +446,6 @@ Comments: Addons neccessary to comply with v5.2. - - @@ -462,7 +460,7 @@ Comments: Addons neccessary to comply with v5.2. - + diff --git a/PowerEditor/installer/nativeLang/tagalog.xml b/PowerEditor/installer/nativeLang/tagalog.xml index 63228583b..2ba26ee86 100644 --- a/PowerEditor/installer/nativeLang/tagalog.xml +++ b/PowerEditor/installer/nativeLang/tagalog.xml @@ -433,7 +433,7 @@ - + @@ -445,8 +445,6 @@ - - @@ -461,7 +459,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/thai.xml b/PowerEditor/installer/nativeLang/thai.xml index 625e05d19..d1dcb8643 100644 --- a/PowerEditor/installer/nativeLang/thai.xml +++ b/PowerEditor/installer/nativeLang/thai.xml @@ -365,7 +365,7 @@ - + @@ -377,8 +377,6 @@ - - @@ -393,7 +391,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/turkish.xml b/PowerEditor/installer/nativeLang/turkish.xml index c8703a4c2..316ce4817 100644 --- a/PowerEditor/installer/nativeLang/turkish.xml +++ b/PowerEditor/installer/nativeLang/turkish.xml @@ -433,7 +433,7 @@ - + @@ -445,8 +445,6 @@ - - @@ -461,7 +459,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/ukrainian.xml b/PowerEditor/installer/nativeLang/ukrainian.xml index c3b8a629c..caa009b0a 100644 --- a/PowerEditor/installer/nativeLang/ukrainian.xml +++ b/PowerEditor/installer/nativeLang/ukrainian.xml @@ -444,7 +444,7 @@ - + @@ -456,8 +456,6 @@ - - @@ -473,7 +471,7 @@ - + diff --git a/PowerEditor/installer/nativeLang/uzbek.xml b/PowerEditor/installer/nativeLang/uzbek.xml new file mode 100644 index 000000000..96eb8e3b3 --- /dev/null +++ b/PowerEditor/installer/nativeLang/uzbek.xml @@ -0,0 +1,544 @@ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/uzbekCyrillic.xml b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml new file mode 100644 index 000000000..75b9d1305 --- /dev/null +++ b/PowerEditor/installer/nativeLang/uzbekCyrillic.xml @@ -0,0 +1,544 @@ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 54495d03d..a6b039bb2 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -28,7 +28,7 @@ Name "${APPNAMEANDVERSION}" InstallDir "$PROGRAMFILES\Notepad++" InstallDirRegKey HKLM "Software\${APPNAME}" "" -OutFile "..\bin\npp.5.4.5.Installer.exe" +OutFile "..\bin\npp.5.5.Installer.exe" ; GetWindowsVersion ; @@ -208,6 +208,7 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Galician" !insertmacro MUI_LANGUAGE "Basque" !insertmacro MUI_LANGUAGE "Luxembourgish" + !insertmacro MUI_LANGUAGE "Afrikaans" ;!insertmacro MUI_LANGUAGE "Latvian" ;!insertmacro MUI_LANGUAGE "Macedonian" @@ -219,7 +220,6 @@ FunctionEnd ;!insertmacro MUI_LANGUAGE "Kurdish" ;!insertmacro MUI_LANGUAGE "Irish" ;!insertmacro MUI_LANGUAGE "Uzbek" - ;!insertmacro MUI_LANGUAGE "Afrikaans" !insertmacro MUI_RESERVEFILE_LANGDLL @@ -301,6 +301,7 @@ LangString langFileName ${LANG_MALAY} "malay.xml" LangString langFileName ${LANG_GALICIAN} "galician.xml" LangString langFileName ${LANG_BASQUE} "basque.xml" LangString langFileName ${LANG_LUXEMBOURGISH} "luxembourgish.xml" +LangString langFileName ${LANG_AFRIKAANS} "afrikaans.xml" ;-------------------------------- diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index c3f650756..ea733bea5 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2474,25 +2474,25 @@ BOOL Notepad_plus::notify(SCNotification *notification) if (!_tabPopupMenu.isCreated()) { vector itemUnitArray; - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_CLOSE, TEXT("Close me"))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_CLOSEALL_BUT_CURRENT, TEXT("Close all but me"))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_SAVE, TEXT("Save me"))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_SAVEAS, TEXT("Save me As..."))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_RENAME, TEXT("Rename me"))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_DELETE, TEXT("Delete me"))); - itemUnitArray.push_back(MenuItemUnit(IDM_FILE_PRINT, TEXT("Print me"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_CLOSE, TEXT("Close"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_CLOSEALL_BUT_CURRENT, TEXT("Close All but This"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_SAVE, TEXT("Save"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_SAVEAS, TEXT("Save As..."))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_RENAME, TEXT("Rename"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_DELETE, TEXT("Delete"))); + itemUnitArray.push_back(MenuItemUnit(IDM_FILE_PRINT, TEXT("Print"))); itemUnitArray.push_back(MenuItemUnit(0, NULL)); - itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_SETREADONLY, TEXT("Read only"))); - itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_CLEARREADONLY, TEXT("Clear read only flag"))); + itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_SETREADONLY, TEXT("Read-Only"))); + itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_CLEARREADONLY, TEXT("Clear Read-Only Flag"))); itemUnitArray.push_back(MenuItemUnit(0, NULL)); - itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_FULLPATHTOCLIP, TEXT("Full file path to Clipboard"))); - itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_FILENAMETOCLIP, TEXT("File name to Clipboard"))); - itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_CURRENTDIRTOCLIP, TEXT("Current dir path to Clipboard"))); + itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_FULLPATHTOCLIP, TEXT("Full File Path to Clipboard"))); + itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_FILENAMETOCLIP, TEXT("Filename to Clipboard"))); + itemUnitArray.push_back(MenuItemUnit(IDM_EDIT_CURRENTDIRTOCLIP, TEXT("Current Dir. Path to Clipboard"))); itemUnitArray.push_back(MenuItemUnit(0, NULL)); - itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_ANOTHER_VIEW, TEXT("Move to other view"))); - itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_CLONE_TO_ANOTHER_VIEW, TEXT("Clone to other view"))); - itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_NEW_INSTANCE, TEXT("Move to new instance"))); - itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_LOAD_IN_NEW_INSTANCE, TEXT("Open in new instance"))); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_ANOTHER_VIEW, TEXT("Move to Other View"))); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_CLONE_TO_ANOTHER_VIEW, TEXT("Clone to Other View"))); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_GOTO_NEW_INSTANCE, TEXT("Move to New Instance"))); + itemUnitArray.push_back(MenuItemUnit(IDM_VIEW_LOAD_IN_NEW_INSTANCE, TEXT("Open in New Instance"))); _tabPopupMenu.create(_hSelf, itemUnitArray); changeLangTabContextMenu(); @@ -2549,11 +2549,8 @@ BOOL Notepad_plus::notify(SCNotification *notification) case SCN_CHARADDED: { charAdded(static_cast(notification->ch)); - AutoCompletion * autoC = isFromPrimary?&_autoCompleteMain:&_autoCompleteSub; - autoC->update(notification->ch); - break; } diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 129fa6d4e..42309c6fb 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -194,7 +194,7 @@ BEGIN MENUITEM "Save Session...", IDM_FILE_SAVESESSION MENUITEM SEPARATOR MENUITEM "Print...", IDM_FILE_PRINT - MENUITEM "Print Now!", IDM_FILE_PRINTNOW + MENUITEM "Print Now", IDM_FILE_PRINTNOW MENUITEM SEPARATOR MENUITEM "E&xit", IDM_FILE_EXIT END @@ -210,135 +210,134 @@ BEGIN MENUITEM "&Delete", IDM_EDIT_DELETE MENUITEM "Select A&ll", IDM_EDIT_SELECTALL MENUITEM SEPARATOR - POPUP "Copy to clipboard" + POPUP "Copy to Clipboard" BEGIN - MENUITEM "Current full file path to Clipboard", IDM_EDIT_FULLPATHTOCLIP - MENUITEM "Current file name to Clipboard", IDM_EDIT_FILENAMETOCLIP - MENUITEM "Current dir path to Clipboard", IDM_EDIT_CURRENTDIRTOCLIP + MENUITEM "Current Full File path to Clipboard", IDM_EDIT_FULLPATHTOCLIP + MENUITEM "Current Filename to Clipboard", IDM_EDIT_FILENAMETOCLIP + MENUITEM "Current Dir. Path to Clipboard", IDM_EDIT_CURRENTDIRTOCLIP END POPUP "Indent" BEGIN MENUITEM "Increase Line Indent", IDM_EDIT_INS_TAB MENUITEM "Decrease Line Indent", IDM_EDIT_RMV_TAB END - POPUP "Convert case" + POPUP "Convert Case to" BEGIN - MENUITEM "to &UPPERCASE", IDM_EDIT_UPPERCASE - MENUITEM "to &lowercase", IDM_EDIT_LOWERCASE + MENUITEM "&UPPERCASE", IDM_EDIT_UPPERCASE + MENUITEM "&lowercase", IDM_EDIT_LOWERCASE END - POPUP "Line operations" + POPUP "Line Operations" BEGIN - MENUITEM "Duplicate current line", IDM_EDIT_DUP_LINE - MENUITEM "Split lines", IDM_EDIT_SPLIT_LINES - MENUITEM "Join lines", IDM_EDIT_JOIN_LINES - MENUITEM "Move Up current line", IDM_EDIT_LINE_UP - MENUITEM "Move Down current line", IDM_EDIT_LINE_DOWN + MENUITEM "Duplicate Current Line", IDM_EDIT_DUP_LINE + MENUITEM "Split Lines", IDM_EDIT_SPLIT_LINES + MENUITEM "Join Lines", IDM_EDIT_JOIN_LINES + MENUITEM "Move Up Current Line", IDM_EDIT_LINE_UP + MENUITEM "Move Down Current Line", IDM_EDIT_LINE_DOWN 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 "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 END - POPUP "Auto-completion" + POPUP "Auto-Completion" BEGIN - MENUITEM "Function completion", IDM_EDIT_AUTOCOMPLETE - MENUITEM "Word completion", IDM_EDIT_AUTOCOMPLETE_CURRENTFILE - MENUITEM "Function parameters hint", IDM_EDIT_FUNCCALLTIP + MENUITEM "Function Completion", IDM_EDIT_AUTOCOMPLETE + MENUITEM "Word Completion", IDM_EDIT_AUTOCOMPLETE_CURRENTFILE + MENUITEM "Function Parameters Hint", IDM_EDIT_FUNCCALLTIP END MENUITEM "Trim Trailing Space", IDM_EDIT_TRIMTRAILING MENUITEM SEPARATOR MENUITEM "Column Editor...", IDM_EDIT_COLUMNMODE MENUITEM SEPARATOR - MENUITEM "Set Read Only", IDM_EDIT_SETREADONLY - MENUITEM "Clear Read Only Flag", IDM_EDIT_CLEARREADONLY + MENUITEM "Set Read-Only", IDM_EDIT_SETREADONLY + MENUITEM "Clear Read-Only Flag", IDM_EDIT_CLEARREADONLY //MENUITEM SEPARATOR END POPUP "&Search" BEGIN MENUITEM "&Find...", IDM_SEARCH_FIND - MENUITEM "Find in files...", IDM_SEARCH_FINDINFILES + MENUITEM "Find in Files...", IDM_SEARCH_FINDINFILES MENUITEM "Find &Next", IDM_SEARCH_FINDNEXT MENUITEM "Find &Previous", IDM_SEARCH_FINDPREV - MENUITEM "Find (volatile) Next", IDM_SEARCH_VOLATILE_FINDNEXT - MENUITEM "Find (volatile) Previous", IDM_SEARCH_VOLATILE_FINDPREV + MENUITEM "Find (Volatile) Next", IDM_SEARCH_VOLATILE_FINDNEXT + MENUITEM "Find (Volatile) Previous", IDM_SEARCH_VOLATILE_FINDPREV MENUITEM "&Replace...", IDM_SEARCH_REPLACE - MENUITEM "&Incremental Search...", IDM_SEARCH_FINDINCREMENT + MENUITEM "&Incremental Search", IDM_SEARCH_FINDINCREMENT MENUITEM "&Go to...", IDM_SEARCH_GOTOLINE - MENUITEM "Go to matching brace", IDM_SEARCH_GOTOMATCHINGBRACE + MENUITEM "Go to Matching Brace", IDM_SEARCH_GOTOMATCHINGBRACE MENUITEM SEPARATOR - POPUP "Mark all" + POPUP "Mark All" BEGIN - MENUITEM "Using 1st style", IDM_SEARCH_MARKALLEXT1 - MENUITEM "Using 2nd style", IDM_SEARCH_MARKALLEXT2 - MENUITEM "Using 3rd style", IDM_SEARCH_MARKALLEXT3 - MENUITEM "Using 4th style", IDM_SEARCH_MARKALLEXT4 - MENUITEM "Using 5th style", IDM_SEARCH_MARKALLEXT5 + MENUITEM "Using 1st Style", IDM_SEARCH_MARKALLEXT1 + MENUITEM "Using 2nd Style", IDM_SEARCH_MARKALLEXT2 + MENUITEM "Using 3rd Style", IDM_SEARCH_MARKALLEXT3 + MENUITEM "Using 4th Style", IDM_SEARCH_MARKALLEXT4 + MENUITEM "Using 5th Style", IDM_SEARCH_MARKALLEXT5 END - POPUP "Unmark all" + POPUP "Unmark All" BEGIN - MENUITEM "Clear 1st style", IDM_SEARCH_UNMARKALLEXT1 - MENUITEM "Clear 2nd style", IDM_SEARCH_UNMARKALLEXT2 - MENUITEM "Clear 3rd style", IDM_SEARCH_UNMARKALLEXT3 - MENUITEM "Clear 4th style", IDM_SEARCH_UNMARKALLEXT4 - MENUITEM "Clear 5th style", IDM_SEARCH_UNMARKALLEXT5 - MENUITEM "Clear all styles", IDM_SEARCH_CLEARALLMARKS + MENUITEM "Clear 1st Style", IDM_SEARCH_UNMARKALLEXT1 + MENUITEM "Clear 2nd Style", IDM_SEARCH_UNMARKALLEXT2 + MENUITEM "Clear 3rd Style", IDM_SEARCH_UNMARKALLEXT3 + MENUITEM "Clear 4th Style", IDM_SEARCH_UNMARKALLEXT4 + MENUITEM "Clear 5th Style", IDM_SEARCH_UNMARKALLEXT5 + MENUITEM "Clear all Styles", IDM_SEARCH_CLEARALLMARKS END - MENUITEM SEPARATOR MENUITEM "Toggle Bookmark" , IDM_SEARCH_TOGGLE_BOOKMARK MENUITEM "Next Bookmark", IDM_SEARCH_NEXT_BOOKMARK MENUITEM "Previous Bookmark", IDM_SEARCH_PREV_BOOKMARK - MENUITEM "Clear all Bookmarks", IDM_SEARCH_CLEAR_BOOKMARKS - MENUITEM "Cut bookmarked lines", IDM_SEARCH_CUTMARKEDLINES - MENUITEM "Copy bookmarked lines", IDM_SEARCH_COPYMARKEDLINES - MENUITEM "Paste to (Replace) bookmarked lines", IDM_SEARCH_PASTEMARKEDLINES - MENUITEM "Delete bookmarked lines", IDM_SEARCH_DELETEMARKEDLINES + MENUITEM "Clear All Bookmarks", IDM_SEARCH_CLEAR_BOOKMARKS + MENUITEM "Cut Bookmarked Lines", IDM_SEARCH_CUTMARKEDLINES + MENUITEM "Copy Bookmarked Lines", IDM_SEARCH_COPYMARKEDLINES + MENUITEM "Paste to (Replace) Bookmarked Lines", IDM_SEARCH_PASTEMARKEDLINES + MENUITEM "Delete Bookmarked Lines", IDM_SEARCH_DELETEMARKEDLINES END POPUP "&View" BEGIN - MENUITEM "Always on top", IDM_VIEW_ALWAYSONTOP + MENUITEM "Always on Top", IDM_VIEW_ALWAYSONTOP MENUITEM "Toggle Full Screen Mode", IDM_VIEW_FULLSCREENTOGGLE - MENUITEM "Post-it", IDM_VIEW_POSTIT + MENUITEM "Post-It", IDM_VIEW_POSTIT MENUITEM SEPARATOR POPUP "Show Symbol" BEGIN MENUITEM "Show White Space and TAB", IDM_VIEW_TAB_SPACE - MENUITEM "Show End Of Line", IDM_VIEW_EOL - MENUITEM "Show all characters", IDM_VIEW_ALL_CHARACTERS + MENUITEM "Show End of Line", IDM_VIEW_EOL + MENUITEM "Show All Characters", IDM_VIEW_ALL_CHARACTERS MENUITEM SEPARATOR - MENUITEM "Show Indent guide", IDM_VIEW_INDENT_GUIDE - MENUITEM "Show wrap symbol", IDM_VIEW_WRAP_SYMBOL + MENUITEM "Show Indent Guide", IDM_VIEW_INDENT_GUIDE + MENUITEM "Show Wrap Symbol", IDM_VIEW_WRAP_SYMBOL END POPUP "Zoom" BEGIN - MENUITEM "Zoom &in", IDM_VIEW_ZOOMIN - MENUITEM "Zoom &out", IDM_VIEW_ZOOMOUT - MENUITEM "Restore default zoom", IDM_VIEW_ZOOMRESTORE + MENUITEM "Zoom &In (Ctrl-Mouse Wheel Up)", IDM_VIEW_ZOOMIN + MENUITEM "Zoom &Out (Ctrl-Mouse Wheel Down)", IDM_VIEW_ZOOMOUT + MENUITEM "Restore Default Zoom", IDM_VIEW_ZOOMRESTORE END - POPUP "Move/Clone current document" + POPUP "Move/Clone Current Document" BEGIN - MENUITEM "Move to other view", IDM_VIEW_GOTO_ANOTHER_VIEW - MENUITEM "Clone to other view", IDM_VIEW_CLONE_TO_ANOTHER_VIEW - MENUITEM "Move to new instance", IDM_VIEW_GOTO_NEW_INSTANCE - MENUITEM "Open in new instance", IDM_VIEW_LOAD_IN_NEW_INSTANCE + MENUITEM "Move to Other View", IDM_VIEW_GOTO_ANOTHER_VIEW + MENUITEM "Clone to Other View", IDM_VIEW_CLONE_TO_ANOTHER_VIEW + MENUITEM "Move to New Instance", IDM_VIEW_GOTO_NEW_INSTANCE + MENUITEM "Open in New Instance", IDM_VIEW_LOAD_IN_NEW_INSTANCE END MENUITEM "Word wrap", IDM_VIEW_WRAP - MENUITEM "Focus on other view", IDM_VIEW_SWITCHTO_OTHER_VIEW - MENUITEM "Hide lines", IDM_VIEW_HIDELINES - MENUITEM "User Define Dialog...", IDM_VIEW_USER_DLG + MENUITEM "Focus on Other View", IDM_VIEW_SWITCHTO_OTHER_VIEW + MENUITEM "Hide Lines", IDM_VIEW_HIDELINES + MENUITEM "User-Defined Dialogue...", IDM_VIEW_USER_DLG MENUITEM SEPARATOR - MENUITEM "Fold all", IDM_VIEW_TOGGLE_FOLDALL - MENUITEM "Unfold all", IDM_VIEW_TOGGLE_UNFOLDALL - MENUITEM "Collapse current level", IDM_VIEW_FOLD_CURRENT - MENUITEM "Uncollapse current level", IDM_VIEW_UNFOLD_CURRENT - POPUP "Collapse level" + MENUITEM "Fold All", IDM_VIEW_TOGGLE_FOLDALL + MENUITEM "Unfold All", IDM_VIEW_TOGGLE_UNFOLDALL + MENUITEM "Collapse Current Level", IDM_VIEW_FOLD_CURRENT + MENUITEM "Uncollapse Current Level", IDM_VIEW_UNFOLD_CURRENT + POPUP "Collapse Level" BEGIN MENUITEM "1" , IDM_VIEW_FOLD_1 MENUITEM "2", IDM_VIEW_FOLD_2 @@ -349,7 +348,7 @@ BEGIN MENUITEM "7", IDM_VIEW_FOLD_7 MENUITEM "8", IDM_VIEW_FOLD_8 END - POPUP "Uncollapse level" + POPUP "Uncollapse Level" BEGIN MENUITEM "1" , IDM_VIEW_UNFOLD_1 MENUITEM "2", IDM_VIEW_UNFOLD_2 @@ -440,7 +439,7 @@ BEGIN MENUITEM "XML", IDM_LANG_XML MENUITEM "YAML", IDM_LANG_YAML MENUITEM SEPARATOR - MENUITEM "User Defined", IDM_LANG_USER + MENUITEM "User-Defined", IDM_LANG_USER END POPUP "&Language" BEGIN @@ -532,13 +531,13 @@ BEGIN MENUITEM "XML", IDM_LANG_XML MENUITEM "YAML", IDM_LANG_YAML MENUITEM SEPARATOR - MENUITEM "User Defined", IDM_LANG_USER + MENUITEM "User-Defined", IDM_LANG_USER END POPUP "Se&ttings" BEGIN MENUITEM "Preferences...", IDM_SETTING_PREFERECE - MENUITEM "Styler Configurator...", IDM_LANGSTYLE_CONFIG_DLG + MENUITEM "Style Configurator...", IDM_LANGSTYLE_CONFIG_DLG MENUITEM "Shortcut Mapper...", IDM_SETTING_SHORTCUT_MAPPER MENUITEM SEPARATOR POPUP "Import" @@ -553,8 +552,8 @@ BEGIN MENUITEM "Start Re&cording", IDM_MACRO_STARTRECORDINGMACRO MENUITEM "S&top Recording", IDM_MACRO_STOPRECORDINGMACRO MENUITEM "&Playback", IDM_MACRO_PLAYBACKRECORDEDMACRO - MENUITEM "&Save current recorded macro...", IDM_MACRO_SAVECURRENTMACRO - MENUITEM "&Run a macro multiple times...", IDM_MACRO_RUNMULTIMACRODLG + MENUITEM "&Save Current Recorded Macro...", IDM_MACRO_SAVECURRENTMACRO + MENUITEM "&Run a Macro Multiple Times...", IDM_MACRO_RUNMULTIMACRODLG END POPUP "Run" @@ -568,10 +567,10 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE - MENUITEM "NpWiki++ (Online help)", IDM_ONLINEHELP + MENUITEM "NpWiki++ (Online Help)", IDM_ONLINEHELP //MENUITEM "Wiki FAQ", IDM_WIKIFAQ MENUITEM "Forum", IDM_FORUM - MENUITEM "Get more plugins", IDM_PLUGINSHOME + MENUITEM "Get More Plugins", IDM_PLUGINSHOME MENUITEM SEPARATOR MENUITEM "Update Notepad++", IDM_UPDATE_NPP MENUITEM "About Notepad++", IDM_ABOUT @@ -607,11 +606,11 @@ BEGIN CONTROL "&Offset",IDC_RADIO_GOTOOFFSET,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,98,9,80,10 LTEXT "You are here :",ID_URHERE_STATIC,5,34,95,8,NOT WS_GROUP LTEXT "0123456789",ID_CURRLINE,100,34,45,8,NOT WS_GROUP - LTEXT "You want to &go :",ID_UGO_STATIC,5,51,95,8 + LTEXT "You want to &go to :",ID_UGO_STATIC,5,51,95,8 EDITTEXT ID_GOLINE_EDIT,98,49,71,12,ES_NUMBER LTEXT "You can't go further than :",ID_NOMORETHAN_STATIC,5,68,92,8,NOT WS_GROUP LTEXT "0123456789",ID_LASTLINE,100,68,45,8,NOT WS_GROUP - DEFPUSHBUTTON "Go !",IDOK,181,48,70,14,BS_NOTIFY + DEFPUSHBUTTON "Go",IDOK,181,48,70,14,BS_NOTIFY PUSHBUTTON "I'm going nowhere",IDCANCEL,181,66,70,14,BS_NOTIFY END diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 1ea997e2d..2ba5fe8da 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -279,7 +279,7 @@ void FindReplaceDlg::create(int dialogID, bool isRTL) const TCHAR *find = TEXT("Find"); const TCHAR *replace = TEXT("Replace"); - const TCHAR *findInFiles = TEXT("Find in files"); + const TCHAR *findInFiles = TEXT("Find in Files"); NppParameters::FindDlgTabTitiles & fdTitles = NppParameters::getInstance()->getFindDlgTabTitiles(); diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc index 09c03710d..0d7fa6746 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc @@ -32,7 +32,7 @@ BEGIN COMBOBOX IDFINDWHAT,83,20,125,150,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP RTEXT "Rep&lace with :",ID_STATICTEXT_REPLACE,6,40,75,8 COMBOBOX IDREPLACEWITH,83,38,125,50,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_TABSTOP - CONTROL "&Mark Line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,40,88,10 + CONTROL "&Mark line",IDC_MARKLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,40,88,10 CONTROL "Style found to&ken",IDC_STYLEFOUND_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,52,100,15 GROUPBOX "",IDC_FINDALL_STATIC,6,31,204,54 CONTROL "Purge for each search",IDC_PURGE_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,13,66,99,16 @@ -52,7 +52,7 @@ BEGIN CONTROL "Match &whole word only",IDWHOLEWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,88,140,15 CONTROL "Match &case",IDMATCHCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,100,140,15 CONTROL "Wra&p around",IDWRAP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,6,112,110,15 - GROUPBOX "Search mode",IDC_MODE_STATIC,6,126,138,48 + GROUPBOX "Search Mode",IDC_MODE_STATIC,6,126,138,48 CONTROL "&Normal",IDNORMAL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,12,138,126,10 CONTROL "E&xtended (\\n, \\r, \\t, \\0, \\x...)",IDEXTENDED, "Button",BS_AUTORADIOBUTTON,12,150,126,10 CONTROL "Re&gular expression",IDREGEXP,"Button",BS_AUTORADIOBUTTON,12,162,126,10 @@ -61,17 +61,17 @@ BEGIN GROUPBOX "Direction",IDC_DIR_STATIC,150,126,60,48,WS_GROUP PUSHBUTTON "Find Next",IDOK,217,20,90,14,WS_GROUP PUSHBUTTON "Coun&t",IDCCOUNTALL,217,38,90,14 - PUSHBUTTON "Find all in all &opened documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE - PUSHBUTTON "Find all in current document",IDC_FINDALL_CURRENTFILE,217,80,90,21,BS_MULTILINE + PUSHBUTTON "Find All in All &Opened Documents",IDC_FINDALL_OPENEDFILES,217,56,90,21,BS_MULTILINE + PUSHBUTTON "Find All in Current Document",IDC_FINDALL_CURRENTFILE,217,80,90,21,BS_MULTILINE PUSHBUTTON "&Replace",IDREPLACE,217,38,90,14 PUSHBUTTON "Replace &All",IDREPLACEALL,217,56,90,14 - PUSHBUTTON "Replace all in all &opened documents",IDC_REPLACE_OPENEDFILES,217,74,90,21,BS_MULTILINE + PUSHBUTTON "Replace All in All &Opened Documents",IDC_REPLACE_OPENEDFILES,217,74,90,21,BS_MULTILINE PUSHBUTTON "Find All",IDD_FINDINFILES_FIND_BUTTON,217,20,90,14,WS_GROUP - PUSHBUTTON "&Replace in files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14 + PUSHBUTTON "&Replace in Files",IDD_FINDINFILES_REPLACEINFILES,217,38,90,14 PUSHBUTTON "Close",IDCANCEL,217,98,90,14 GROUPBOX "",IDC_TRANSPARENT_GRPBOX,222,126,85,48 CONTROL "Transparenc&y",IDC_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,218,126,80,10 - CONTROL "On lose focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,138,70,10 + CONTROL "On losing focus",IDC_TRANSPARENT_LOSSFOCUS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,138,70,10 CONTROL "Always",IDC_TRANSPARENT_ALWAYS_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,232,150,70,10 CONTROL "",IDC_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,235,161,53,10 END diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc index 1d1b302a7..67717cf93 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc +++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc @@ -26,7 +26,7 @@ IDD_FOLDER_STYLE_DLG DIALOGEX 36, 44, 320, 460 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0 BEGIN - GROUPBOX "Folder Open Keywords Setting", IDC_FOLDEROPEN_DESCGROUP_STATIC,5,114,300,127,BS_CENTER + GROUPBOX "Folder Open Keywords Settings", IDC_FOLDEROPEN_DESCGROUP_STATIC,5,114,300,127,BS_CENTER LTEXT "Foreground color",IDC_FOLDEROPEN_FG_STATIC,27,144,58,8, 0,WS_EX_RIGHT LTEXT "Background color",IDC_FOLDEROPEN_BG_STATIC,27,168,58,8, 0,WS_EX_RIGHT COMBOBOX IDC_FOLDEROPEN_FONT_COMBO,185,140,104,78, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -38,7 +38,7 @@ BEGIN LTEXT "Font Name :",IDC_FOLDEROPEN_FONTNAME_STATIC,138,142,44, 8,0,WS_EX_RIGHT LTEXT "Font size :",IDC_FOLDEROPEN_FONTSIZE_STATIC,212,164,35, 8,0,WS_EX_RIGHT EDITTEXT IDC_FOLDEROPEN_EDIT,15,203,282,28,ES_MULTILINE | WS_VSCROLL - GROUPBOX "Folder Close Keywords Setting", IDC_FOLDERCLOSE_DESCGROUP_STATIC,5,246,300,125,BS_CENTER + GROUPBOX "Folder Close Keywords Settings", IDC_FOLDERCLOSE_DESCGROUP_STATIC,5,246,300,125,BS_CENTER LTEXT "Foreground color",IDC_FOLDERCLOSE_FG_STATIC,27,277,58,8,0,WS_EX_RIGHT LTEXT "Background color",IDC_FOLDERCLOSE_BG_STATIC,27,301,58,8,0,WS_EX_RIGHT COMBOBOX IDC_FOLDERCLOSE_FONT_COMBO,185,272,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -50,7 +50,7 @@ BEGIN LTEXT "Font Name :",IDC_FOLDERCLOSE_FONTNAME_STATIC,138,273,45,8,0,WS_EX_RIGHT LTEXT "Font size :",IDC_FOLDERCLOSE_FONTSIZE_STATIC,212,294,35, 8,0,WS_EX_RIGHT EDITTEXT IDC_FOLDERCLOSE_EDIT,15,334,282,28,ES_MULTILINE | WS_VSCROLL - GROUPBOX "Default Style Setting",IDC_DEFAULT_DESCGROUP_STATIC,5,7, 300,92,BS_CENTER + GROUPBOX "Default Style Settings",IDC_DEFAULT_DESCGROUP_STATIC,5,7, 300,92,BS_CENTER LTEXT "Foreground color",IDC_DEFAULT_FG_STATIC,27,38,59,8,0, WS_EX_RIGHT LTEXT "Background color",IDC_DEFAULT_BG_STATIC,27,62,59,8,0, WS_EX_RIGHT COMBOBOX IDC_DEFAULT_FONT_COMBO,185,33,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -168,8 +168,8 @@ BEGIN EDITTEXT IDC_COMMENTOPEN_EDIT,14,229,133,28,ES_MULTILINE | WS_VSCROLL GROUPBOX "Comment Block",IDC_COMMENT_DESCGROUP_STATIC,4,133,300,132,BS_CENTER EDITTEXT IDC_COMMENTCLOSE_EDIT,157,229,139,28,ES_MULTILINE | WS_VSCROLL - LTEXT "Comment Open :",IDC_COMMENTOPEN_STATIC,17,218,90,8 - LTEXT "Comment Close :",IDC_COMMENTCLOSE_STATIC,158,218,88,8 + LTEXT "Comment open :",IDC_COMMENTOPEN_STATIC,17,218,90,8 + LTEXT "Comment close :",IDC_COMMENTCLOSE_STATIC,158,218,88,8 CONTROL "Treat keyword as symbol",IDC_COMMENTLINESYMBOL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,78,112,10 CONTROL "Treat keywords as symbols",IDC_COMMENTSYMBOL_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,203,112,10 CONTROL "Underline",IDC_COMMENT_UNDERLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,211,193,59,10 @@ -185,8 +185,8 @@ BEGIN PUSHBUTTON "->",IDC_ADD_BUTTON,127,65,50,14 PUSHBUTTON "<-",IDC_REMOVE_BUTTON,127,94,50,14 LISTBOX IDC_ACTIVATED_SYMBOL_LIST,195,33,41,115,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Activated Operators",IDC_ACTIVATED_SYMBOL_STATIC,182,18,86,8 - LTEXT "Available Symbols",IDC_AVAILABLE_SYMBOLS_STATIC,59,18,90,8 + LTEXT "Activated operators",IDC_ACTIVATED_SYMBOL_STATIC,182,18,86,8 + LTEXT "Available symbols",IDC_AVAILABLE_SYMBOLS_STATIC,59,18,90,8 LTEXT "Foreground color",IDC_SYMBOL_FG_STATIC,25,169,57,8,0,WS_EX_RIGHT LTEXT "Background color",IDC_SYMBOL_BG_STATIC,25,192,57,8,0,WS_EX_RIGHT COMBOBOX IDC_SYMBOL_FONT_COMBO,183,168,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP @@ -213,15 +213,15 @@ BEGIN COMBOBOX IDC_SYMBOL_BC2_COMBO,256,237,40,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Boundary close :",IDC_SYMBOL_BC2_STATIC,168,239,86,8,0,WS_EX_RIGHT GROUPBOX "Delimiter 1",IDC_SYMBOL_DELIMGROUP1_STATIC,3,227,300,93,BS_CENTER | BS_FLAT - LTEXT "Foreground color",IDC_SYMBOL_FG3_STATIC,26,369,56,8,0,WS_EX_RIGHT - LTEXT "Background color",IDC_SYMBOL_BG3_STATIC,26,390,56,8,0,WS_EX_RIGHT + LTEXT "Foreground colour",IDC_SYMBOL_FG3_STATIC,26,369,56,8,0,WS_EX_RIGHT + LTEXT "Background colour",IDC_SYMBOL_BG3_STATIC,26,390,56,8,0,WS_EX_RIGHT COMBOBOX IDC_SYMBOL_FONT3_COMBO,184,367,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_SYMBOL_BO3_COMBO,85,339,40,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Bold",IDC_SYMBOL_BOLD3_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,385,45,10 CONTROL "Italic",IDC_SYMBOL_ITALIC3_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,400,41,10 - GROUPBOX "Font style",IDC_SYMBOL_FONTSTYLEGROUP3_STATIC,132,355,164,60 - GROUPBOX "Colour style",IDC_SYMBOL_COLORSTYLEGROUP3_STATIC,14,355,111,60 - LTEXT "Font Name :",IDC_SYMBOL_FONTNAME3_STATIC,136,368,44,8,0,WS_EX_RIGHT + GROUPBOX "Font Style",IDC_SYMBOL_FONTSTYLEGROUP3_STATIC,132,355,164,60 + GROUPBOX "Colour Style",IDC_SYMBOL_COLORSTYLEGROUP3_STATIC,14,355,111,60 + LTEXT "Font name :",IDC_SYMBOL_FONTNAME3_STATIC,136,368,44,8,0,WS_EX_RIGHT LTEXT "Boundary open :",IDC_SYMBOL_BO3_STATIC,9,340,74,8,0,WS_EX_RIGHT CONTROL "Underline",IDC_SYMBOL_UNDERLINE3_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,211,400,59,10 COMBOBOX IDC_SYMBOL_BC3_COMBO,256,339,40,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -237,7 +237,7 @@ IDD_GLOBAL_USERDEFINE_DLG DIALOGEX 36, 44, 340, 550 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_VSCROLL | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW -CAPTION "User Define" +CAPTION "User-Defined" FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0 BEGIN PUSHBUTTON "Rename",IDC_RENAME_BUTTON,174,40,62,14 @@ -246,9 +246,9 @@ BEGIN COMBOBOX IDC_LANGNAME_COMBO,71,23,95,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Remove",IDC_REMOVELANG_BUTTON,243,40,62,14 PUSHBUTTON "Save As...",IDC_SAVEAS_BUTTON,104,40,62,14 - LTEXT "User Language : ",IDC_LANGNAME_STATIC,5,24,63,8,0,WS_EX_RIGHT + LTEXT "User language : ",IDC_LANGNAME_STATIC,5,24,63,8,0,WS_EX_RIGHT EDITTEXT IDC_EXT_EDIT,291,23,33,14,ES_AUTOHSCROLL - RTEXT "Ext :",IDC_EXT_STATIC,257,25,33,8,0,WS_EX_RIGHT + RTEXT "Ext. :",IDC_EXT_STATIC,257,25,33,8,0,WS_EX_RIGHT CONTROL "Transparency",IDC_UD_TRANSPARENT_CHECK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,150,3,66,10 CONTROL "",IDC_UD_PERCENTAGE_SLIDER,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,209,3,53,10 CONTROL "Ignore case",IDC_LANGNAME_IGNORECASE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,175,24,76,10 diff --git a/PowerEditor/src/ScitillaComponent/columnEditor.rc b/PowerEditor/src/ScitillaComponent/columnEditor.rc index 61eb79b2f..aa127e25f 100644 --- a/PowerEditor/src/ScitillaComponent/columnEditor.rc +++ b/PowerEditor/src/ScitillaComponent/columnEditor.rc @@ -27,8 +27,8 @@ EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE CAPTION "Column Editor" FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0 BEGIN - GROUPBOX "Text to insert",IDC_COL_TEXT_GRP_STATIC,12,10,124,54 - GROUPBOX "Number to insert",IDC_COL_NUM_GRP_STATIC,12,75,204,119 + GROUPBOX "Text to Insert",IDC_COL_TEXT_GRP_STATIC,12,10,124,54 + GROUPBOX "Number to Insert",IDC_COL_NUM_GRP_STATIC,12,75,204,119 CONTROL "",IDC_COL_TEXT_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP,7,10,8,9 CONTROL "",IDC_COL_NUM_RADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP, 7,75,8,9 EDITTEXT IDC_COL_TEXT_EDIT,25,32,97,14,ES_AUTOHSCROLL diff --git a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc index b2aa57137..1fa1e2f25 100644 --- a/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc +++ b/PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.rc @@ -32,27 +32,27 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Select theme : ",IDC_SWITCH2THEME_STATIC,6,9,83,8,0,WS_EX_RIGHT COMBOBOX IDC_SWITCH2THEME_COMBO,95,7,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - LTEXT "Foreground color",IDC_FG_STATIC,203,72,59,8,0,WS_EX_RIGHT - LTEXT "Background color",IDC_BG_STATIC,203,99,59,8,0,WS_EX_RIGHT + LTEXT "Foreground colour",IDC_FG_STATIC,203,72,59,8,0,WS_EX_RIGHT + LTEXT "Background colour",IDC_BG_STATIC,203,99,59,8,0,WS_EX_RIGHT COMBOBOX IDC_FONT_COMBO,371,68,104,78,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FONTSIZE_COMBO,442,95,33,82,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Bold",IDC_BOLD_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,88,63,10 CONTROL "Italic",IDC_ITALIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,100,62,10 - GROUPBOX "Font style",IDC_FONTGROUP_STATIC,311,52,169,77 - GROUPBOX "Colour style",IDC_COLOURGROUP_STATIC,191,52,111,77 - LTEXT "Font Name :",IDC_FONTNAME_STATIC,315,71,52,8,0,WS_EX_RIGHT + GROUPBOX "Font Style",IDC_FONTGROUP_STATIC,311,52,169,77 + GROUPBOX "Colour Style",IDC_COLOURGROUP_STATIC,191,52,111,77 + LTEXT "Font name :",IDC_FONTNAME_STATIC,315,71,52,8,0,WS_EX_RIGHT LTEXT "Font size :",IDC_FONTSIZE_STATIC,388,97,51,8,0,WS_EX_RIGHT LTEXT "Style :",IDC_STYLEDESC_STATIC,87,34,68,8 LTEXT " ",IDC_STYLEDESCRIPTION_STATIC,190,30,295,22 EDITTEXT IDC_DEF_EXT_EDIT,17,215,61,14,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Default ext : ",IDC_DEF_EXT_STATIC,20,203,61,8 + LTEXT "Default ext. : ",IDC_DEF_EXT_STATIC,20,203,61,8 EDITTEXT IDC_USER_EXT_EDIT,93,215,71,14,ES_AUTOHSCROLL - LTEXT "User ext :",IDC_USER_EXT_STATIC,95,204,71,8 + LTEXT "User ext. :",IDC_USER_EXT_STATIC,95,204,71,8 CONTROL "Underline",IDC_UNDERLINE_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,112,80,10 EDITTEXT IDC_DEF_KEYWORDS_EDIT,191,151,136,43,ES_MULTILINE | ES_READONLY | WS_VSCROLL EDITTEXT IDC_USER_KEYWORDS_EDIT,347,150,134,43,ES_MULTILINE | WS_VSCROLL LTEXT "Default keywords",IDC_DEF_KEYWORDS_STATIC,193,141,122,8 - LTEXT "User Define keywords",IDC_USER_KEYWORDS_STATIC,349,140,126,8 + LTEXT "User-defined keywords",IDC_USER_KEYWORDS_STATIC,349,140,126,8 LTEXT "+",IDC_PLUSSYMBOL_STATIC,335,166,8,8 PUSHBUTTON "Cancel",IDCANCEL,332,222,57,14 PUSHBUTTON "Save && Close",IDC_SAVECLOSE_BUTTON,255,222,69,14 @@ -64,16 +64,16 @@ BEGIN LTEXT "Language :",IDC_LANGDESC_STATIC,19,34,61,8 GROUPBOX "",IDC_STATIC,181,24,310,184 LTEXT "+",IDC_PLUSSYMBOL2_STATIC,83,217,8,8 - CONTROL "Enable global foreground color",IDC_GLOBAL_FG_CHECK, + CONTROL "Enable global foreground colour",IDC_GLOBAL_FG_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,191,138,132,10 - CONTROL "Enable global background color",IDC_GLOBAL_BG_CHECK, + CONTROL "Enable global background colour",IDC_GLOBAL_BG_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,191,153,131,10 CONTROL "Enable global font",IDC_GLOBAL_FONT_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,134,153,10 CONTROL "Enable global font size",IDC_GLOBAL_FONTSIZE_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,327,149,135,10 CONTROL "Enable global bold font style",IDC_GLOBAL_BOLD_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,328,164,135,10 - CONTROL "Enable global Italic font style",IDC_GLOBAL_ITALIC_CHECK, + CONTROL "Enable global italic font style",IDC_GLOBAL_ITALIC_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,328,179,135,10 CONTROL "Enable global underline font style",IDC_GLOBAL_UNDERLINE_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,328,194,135,10 diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index b826da21c..fb102e0f0 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -37,26 +37,26 @@ IDD_PREFERENCE_BAR_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Tool bar",IDC_TOOLBAR_GB_STATIC,57,45,147,68,BS_CENTER + GROUPBOX "Toolbar",IDC_TOOLBAR_GB_STATIC,57,45,147,68,BS_CENTER CONTROL "Hide",IDC_CHECK_HIDE,"Button",BS_AUTOCHECKBOX,64,55,94,10 CONTROL "Small icons",IDC_RADIO_SMALLICON,"Button",BS_AUTORADIOBUTTON,64,69,114,10 CONTROL "Big icons",IDC_RADIO_BIGICON,"Button",BS_AUTORADIOBUTTON,64,83,109,10 - CONTROL "Small standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,64,97,119,10 - GROUPBOX "Tab bar",IDC_TABBAR_GB_STATIC,223,6,176,151,BS_CENTER + CONTROL "Standard icons",IDC_RADIO_STANDARD,"Button",BS_AUTORADIOBUTTON,64,97,119,10 + GROUPBOX "Tab Bar",IDC_TABBAR_GB_STATIC,223,6,176,151,BS_CENTER CONTROL "Hide",IDC_CHECK_TAB_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,16,108,10 - CONTROL "Multi-Line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,30,134,10 + CONTROL "Multi-line",IDC_CHECK_TAB_MULTILINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,30,134,10 CONTROL "Vertical",IDC_CHECK_TAB_VERTICAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,44,134,10 CONTROL "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,59,108,10 - CONTROL "Lock (No Drag N Drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,73,134,10 - CONTROL "Draw the inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,88,134,10 - CONTROL "Draw the orange top bar",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,133,10 - CONTROL "Enable close button on each tab",IDC_CHECK_ENABLETABCLOSE, + CONTROL "Lock (no drag and drop)",IDC_CHECK_LOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,73,134,10 + CONTROL "Darken inactive tabs",IDC_CHECK_DRAWINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,88,134,10 + CONTROL "Draw an orange bar on active tab",IDC_CHECK_ORANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,137,10 + CONTROL "Show close button on each tab",IDC_CHECK_ENABLETABCLOSE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,118,133,10 CONTROL "Double click to close document",IDC_CHECK_DBCLICK2CLOSE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,133,133,10 - CONTROL "Show Status Bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,163,130,10 - GROUPBOX "Menu bar",IDC_MENUBAR_GB_STATIC,57,117,147,40,BS_CENTER - CONTROL "Hide (Use Alt or F10 key to toggle it)",IDC_CHECK_HIDEMENUBAR, + CONTROL "Show status bar",IDC_CHECK_SHOWSTATUSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,58,163,130,10 + GROUPBOX "Menu Bar",IDC_MENUBAR_GB_STATIC,57,117,147,40,BS_CENTER + CONTROL "Hide (use Alt or F10 key to toggle)",IDC_CHECK_HIDEMENUBAR, "Button",BS_AUTOCHECKBOX | BS_MULTILINE,64,127,135,25 GROUPBOX "Localization",IDC_LOCALIZATION_GB_STATIC,57,6,147,35,BS_CENTER COMBOBOX IDC_COMBO_LOCALIZATION,68,20,119,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -66,7 +66,7 @@ IDD_PREFERENCE_MARGEIN_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Folder margin style",IDC_FMS_GB_STATIC,60,69,149,42,BS_CENTER + GROUPBOX "Folder Margin Style",IDC_FMS_GB_STATIC,60,69,149,42,BS_CENTER CONTROL "Simple",IDC_RADIO_SIMPLE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,69,82,59,10 CONTROL "Arrow",IDC_RADIO_ARROW,"Button",BS_AUTORADIOBUTTON,69,96,60,10 CONTROL "Circle tree",IDC_RADIO_CIRCLE,"Button",BS_AUTORADIOBUTTON,142,82,62,10 @@ -79,15 +79,15 @@ BEGIN CONTROL "Show vertical edge",IDC_CHECK_SHOWVERTICALEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,81,122,10 RTEXT "Number of columns :",IDC_NBCOLONE_STATIC,235,129,83,8 LTEXT "0",IDC_COLONENUMBER_STATIC,325,128,18,8 - GROUPBOX "Vertical Edge Setting",IDC_VES_GB_STATIC,229,69,148,77,BS_CENTER + GROUPBOX "Vertical Edge Settings",IDC_VES_GB_STATIC,229,69,148,77,BS_CENTER CONTROL "Line mode",IDC_RADIO_LNMODE,"Button",BS_AUTORADIOBUTTON,243,97,91,10 CONTROL "Background mode",IDC_RADIO_BGMODE,"Button",BS_AUTORADIOBUTTON,243,111,91,10 GROUPBOX "",IDC_STATIC,48,54,350,118,0,WS_EX_DLGMODALFRAME | WS_EX_CLIENTEDGE COMBOBOX IDC_COMBO_SCINTILLAVIEWCHOIX,167,51,96,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Caret settings",IDC_CARETSETTING_STATIC,51,5,199,40,BS_CENTER + GROUPBOX "Caret Settings",IDC_CARETSETTING_STATIC,51,5,199,40,BS_CENTER LTEXT "Width :",IDC_WIDTH_STATIC,55,24,37,8,0,WS_EX_RIGHT COMBOBOX IDC_WIDTH_COMBO,94,22,40,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Blink Rate :",IDC_BLINKRATE_STATIC,166,17,50,8 + LTEXT "Blink rate :",IDC_BLINKRATE_STATIC,166,17,50,8 CONTROL "",IDC_CARETBLINKRATE_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,161,29,67,13 LTEXT "S",IDC_CARETBLINKRATE_S_STATIC,230,29,12,8 LTEXT "F",IDC_CARETBLINKRATE_F_STATIC,149,29,12,8,0,WS_EX_RIGHT @@ -97,39 +97,39 @@ IDD_PREFERENCE_SETTING_BOX DIALOGEX 0, 0, 455, 185 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "History File Setting",IDC_HISTORY_GB_STATIC,54,4,155,39,BS_CENTER - RTEXT "Max number history file :",IDC_MAXNBFILE_STATIC,57,14,112,8 + GROUPBOX "History File Settings",IDC_HISTORY_GB_STATIC,54,4,155,39,BS_CENTER + RTEXT "Max. number of entries :",IDC_MAXNBFILE_STATIC,57,14,112,8 LTEXT "0",IDC_MAXNBFILEVAL_STATIC,176,14,15,8 CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,27,140,10 - GROUPBOX "Document switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,54,48,155,39,BS_CENTER + GROUPBOX "Document Switcher (Ctrl+TAB)",IDC_DOCUMENTSWITCHER_STATIC,54,48,155,39,BS_CENTER CONTROL "Enable",IDC_CHECK_ENABLEDOCSWITCHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,59,69,10 CONTROL "Enable MRU behaviour",IDC_CHECK_STYLEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,62,72,140,10 CONTROL "Enable Notepad++ auto-updater",IDC_CHECK_AUTOUPDATE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,94,150,10 CONTROL "Smart highlighting",IDC_CHECK_ENABLSMARTHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,136,150,10 CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,108,150,10 - CONTROL "Minimize to sys tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,122,150,10 - CONTROL "Show only filename in titlebar",IDC_CHECK_SHORTTITLE, + CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,122,150,10 + CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,55,150,217,10 - CONTROL "Remember the current session for next launch",IDC_CHECK_REMEMBERSESSION, + CONTROL "Remember current session for next launch",IDC_CHECK_REMEMBERSESSION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,55,164,217,10 - GROUPBOX "Clickable link setting",IDC_CLICKABLELINK_STATIC,232,4,155,39,BS_CENTER + GROUPBOX "Clickable Link Settings",IDC_CLICKABLELINK_STATIC,232,4,155,39,BS_CENTER CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,15,140,10 CONTROL "Don't draw underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,28,140,10 - GROUPBOX "File Status Auto-detection",IDC_FILEAUTODETECTION_STATIC,232,47,155,50,BS_CENTER + GROUPBOX "File Status Auto-Detection",IDC_FILEAUTODETECTION_STATIC,232,47,155,50,BS_CENTER CONTROL "Enable",IDC_CHECK_FILEAUTODETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,57,140,10 CONTROL "Update silently",IDC_CHECK_UPDATESILENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,69,140,10 CONTROL "Scroll to the last line after update",IDC_CHECK_UPDATEGOTOEOF, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,240,81,140,10 - GROUPBOX "Highlight matching tags",IDC_TAGMATCHEDHILITE_STATIC,232,101,155,50,BS_CENTER + GROUPBOX "Highlight Matching Tags",IDC_TAGMATCHEDHILITE_STATIC,232,101,155,50,BS_CENTER CONTROL "Enable",IDC_CHECK_ENABLTAGSMATCHHILITE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,240,111,140,10 CONTROL "Highlight tag attributes",IDC_CHECK_ENABLTAGATTRHILITE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,241,123,140,10 CONTROL "Highlight comment/php/asp zone",IDC_CHECK_HIGHLITENONEHTMLZONE, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,241,136,140,10 - RTEXT "Session file ext:",IDC_SESSIONFILEEXT_STATIC,244,160,108,8 + RTEXT "Session file ext.:",IDC_SESSIONFILEEXT_STATIC,244,160,108,8 EDITTEXT IDC_EDIT_SESSIONFILEEXT,354,157,34,14,ES_AUTOHSCROLL END @@ -145,15 +145,15 @@ BEGIN CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,89,20,80,10 CONTROL "UTF-8 without BOM",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,89,34,128,10 CONTROL "UTF-8",IDC_RADIO_UTF8,"Button",BS_AUTORADIOBUTTON,89,59,62,10 - CONTROL "UCS-2 big endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,89,73,103,10 - CONTROL "UCS-2 small endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,89,87,102,10 - RTEXT "Default Language :",IDC_DEFAULTLANG_STATIC,228,83,77,8 + CONTROL "UCS-2 Big Endian",IDC_RADIO_UCS2BIG,"Button",BS_AUTORADIOBUTTON,89,73,103,10 + CONTROL "UCS-2 Little Endian",IDC_RADIO_UCS2SMALL,"Button",BS_AUTORADIOBUTTON,89,87,102,10 + RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,228,83,77,8 COMBOBOX IDC_COMBO_DEFAULTLANG,310,81,60,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,72,2,304,108,BS_CENTER - GROUPBOX "File Open/Save Directory",IDC_OPENSAVEDIR_GR_STATIC,72,117,304,61,BS_CENTER - CONTROL "Follow the current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO, + GROUPBOX "Default Directory (Open/Save)",IDC_OPENSAVEDIR_GR_STATIC,72,117,304,61,BS_CENTER + CONTROL "Follow current document",IDC_OPENSAVEDIR_FOLLOWCURRENT_RADIO, "Button",BS_AUTORADIOBUTTON | WS_GROUP,89,129,200,10 - CONTROL "Remember the last operation directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO, + CONTROL "Remember last used directory",IDC_OPENSAVEDIR_REMEMBERLAST_RADIO, "Button",BS_AUTORADIOBUTTON,89,144,217,10 CONTROL "",IDC_OPENSAVEDIR_ALWAYSON_RADIO,"Button",BS_AUTORADIOBUTTON,89,156,11,10 EDITTEXT IDC_OPENSAVEDIR_ALWAYSON_EDIT,105,157,179,14,ES_AUTOHSCROLL @@ -167,7 +167,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Language Menu",IDC_CHECK_LANGMENU_GR_STATIC,37,3,220,172,BS_CENTER - CONTROL "Make Language Menu compact",IDC_CHECK_LANGMENUCOMPACT, + CONTROL "Make language menu compact",IDC_CHECK_LANGMENUCOMPACT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,51,14,174,10 CTEXT "Available items",IDC_ENABLEDITEMS_STATIC,55,31,72,8 LISTBOX IDC_LIST_ENABLEDLANG,50,44,78,120,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP @@ -193,8 +193,8 @@ BEGIN CONTROL "Invert",IDC_RADIO_INVERT,"Button",BS_AUTORADIOBUTTON,12,45,90,10 CONTROL "Black on white",IDC_RADIO_BW,"Button",BS_AUTORADIOBUTTON,12,60,90,10 CONTROL "No background colour",IDC_RADIO_NOBG,"Button",BS_AUTORADIOBUTTON,12,76,123,10 - GROUPBOX "Colour Option",IDC_COLOUROPT_STATIC,6,20,133,73,BS_CENTER - CONTROL "Print Line Number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,6,145,10 + GROUPBOX "Colour Options",IDC_COLOUROPT_STATIC,6,20,133,73,BS_CENTER + CONTROL "Print line number",IDC_CHECK_PRINTLINENUM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,6,145,10 EDITTEXT IDC_EDIT_ML,42,136,17,14,ES_NUMBER EDITTEXT IDC_EDIT_MT,59,120,17,14,ES_NUMBER EDITTEXT IDC_EDIT_MR,77,136,17,14,ES_NUMBER @@ -231,7 +231,7 @@ BEGIN RTEXT "Variable :",IDC_VAR_STATIC,198,26,59,8 RTEXT "Which part :",IDC_WHICHPART_STATIC,155,161,80,8 LTEXT "",IDC_VIEWPANEL_STATIC,242,161,190,8 - GROUPBOX "Header and Footer",IDC_STATIC,150,7,296,172,BS_CENTER + GROUPBOX "Header and Footer",IDC_HEADERFPPTER_GR_STATIC,150,7,296,172,BS_CENTER END /* @@ -248,21 +248,21 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Backup",IDC_BACKUPDIR_GRP_STATIC,79,11,289,86,BS_CENTER CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,104,24,87,10 - CONTROL "Simple Backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,228,24,111,10 - CONTROL "Verbose Backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,228,38,111,10 - GROUPBOX "User custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,50,260,40 + CONTROL "Simple backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,228,24,111,10 + CONTROL "Verbose backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,228,38,111,10 + GROUPBOX "Custom backup directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,50,260,40 CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,50,8,10 RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,67,40,8 EDITTEXT IDC_BACKUPDIR_EDIT,146,65,179,14,ES_AUTOHSCROLL PUSHBUTTON "...",IDD_BACKUPDIR_BROWSE_BUTTON,332,65,16,14 - GROUPBOX "Auto-completion",IDD_AUTOC_GRPSTATIC,79,103,289,73,BS_CENTER - CONTROL "Enable Auto-completion on each input",IDD_AUTOC_ENABLECHECK, + GROUPBOX "Auto-Completion",IDD_AUTOC_GRPSTATIC,79,103,289,73,BS_CENTER + CONTROL "Enable auto-completion on each input",IDD_AUTOC_ENABLECHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,114,150,10 CONTROL "Function completion",IDD_AUTOC_FUNCRADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,111,128,145,10 CONTROL "Word completion",IDD_AUTOC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,111,144,145,10 RTEXT "From",IDD_AUTOC_STATIC_FROM,241,114,47,8 CTEXT "1",IDD_AUTOC_STATIC_N,292,114,8,8 - LTEXT "th characters",IDD_AUTOC_STATIC_CHAR,306,114,57,8 + LTEXT "th character",IDD_AUTOC_STATIC_CHAR,306,114,57,8 LTEXT "Valid value : 1 - 9",IDD_AUTOC_STATIC_NOTE,271,124,93,8 CONTROL "Function parameters hint on input",IDD_FUNC_CHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,156,160,10 diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index e40f0dccb..90b1c607f 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -61,15 +61,15 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _backupDlg.init(_hInst, _hSelf); _backupDlg.create(IDD_PREFERENCE_BACKUP_BOX); - _wVector.push_back(DlgInfo(&_barsDlg, TEXT("Global"), TEXT("Global"))); - _wVector.push_back(DlgInfo(&_marginsDlg, TEXT("Edit Components"), TEXT("Scintillas"))); - _wVector.push_back(DlgInfo(&_defaultNewDocDlg, TEXT("New Document/Open Save Directory"), TEXT("NewDoc"))); + _wVector.push_back(DlgInfo(&_barsDlg, TEXT("General"), TEXT("Global"))); + _wVector.push_back(DlgInfo(&_marginsDlg, TEXT("Editing"), TEXT("Scintillas"))); + _wVector.push_back(DlgInfo(&_defaultNewDocDlg, TEXT("New Document/Default Directory"), TEXT("NewDoc"))); _wVector.push_back(DlgInfo(&_fileAssocDlg, TEXT("File Association"), TEXT("FileAssoc"))); _wVector.push_back(DlgInfo(&_langMenuDlg, TEXT("Language Menu/Tab Settings"), TEXT("LangMenu"))); _wVector.push_back(DlgInfo(&_printSettingsDlg, TEXT("Print"), TEXT("Print"))); //_wVector.push_back(DlgInfo(&_printSettings2Dlg, TEXT("Print - Header and Footer"), TEXT("Print2"))); - _wVector.push_back(DlgInfo(&_backupDlg, TEXT("Backup/Auto-completion"), TEXT("Backup"))); - _wVector.push_back(DlgInfo(&_settingsDlg, TEXT("MISC"), TEXT("MISC"))); + _wVector.push_back(DlgInfo(&_backupDlg, TEXT("Backup/Auto-Completion"), TEXT("Backup"))); + _wVector.push_back(DlgInfo(&_settingsDlg, TEXT("MISC."), TEXT("MISC"))); _ctrlTab.createTabs(_wVector); _ctrlTab.display(); RECT rc; diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index d55f736bc..674c69ba9 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -191,6 +191,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #define IDC_VAR_STATIC (IDD_PREFERENCE_PRINT2_BOX + 25) #define IDC_VIEWPANEL_STATIC (IDD_PREFERENCE_PRINT2_BOX + 26) #define IDC_WHICHPART_STATIC (IDD_PREFERENCE_PRINT2_BOX + 27) + #define IDC_HEADERFPPTER_GR_STATIC (IDD_PREFERENCE_PRINT2_BOX + 28) #define IDD_PREFERENCE_BACKUP_BOX 6800 //(IDD_PREFERENCE_BOX + 800) diff --git a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc index 23dcedc27..81c63a470 100644 --- a/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc +++ b/PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.rc @@ -32,12 +32,12 @@ EXSTYLE WS_EX_TOOLWINDOW CAPTION "Run..." FONT 8, TEXT("MS Shell Dlg"), 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Run!",IDOK,16,74,47,14 + DEFPUSHBUTTON "Run",IDOK,16,74,47,14 PUSHBUTTON "Cancel",IDCANCEL, 121,74,48,14 PUSHBUTTON "...",IDC_BUTTON_FILE_BROWSER,154,30,16,14 COMBOBOX IDC_COMBO_RUN_PATH,14,31,136,71,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Type your program to run here",IDC_MAINTEXT_STATIC,7,10, + GROUPBOX "The Program to Run",IDC_MAINTEXT_STATIC,7,10, 172,49,BS_CENTER PUSHBUTTON "Save...",IDC_BUTTON_SAVE,68,74,50,14 END diff --git a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.rc b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.rc index 6ee96843a..10b43226c 100644 --- a/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.rc +++ b/PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.rc @@ -30,8 +30,8 @@ BEGIN CONTROL "", IDC_WINDOWS_LIST, TEXT("SysListView32"), LVS_REPORT | LVS_OWNERDATA | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP, 7, 7, 206, 160 DEFPUSHBUTTON "&Activate",IDOK,219,7,60,14 PUSHBUTTON "&Save",IDC_WINDOWS_SAVE,219,26,60,14 - PUSHBUTTON "&Close Window(s)",IDC_WINDOWS_CLOSE,219,44,60,14 - PUSHBUTTON "Sort &Tabs",IDC_WINDOWS_SORT,219,60,60,14 + PUSHBUTTON "&Close window(s)",IDC_WINDOWS_CLOSE,219,44,60,14 + PUSHBUTTON "Sort &tabs",IDC_WINDOWS_SORT,219,60,60,14 PUSHBUTTON "&OK",IDCANCEL,219,169,60,14 END diff --git a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc index 615a75aa0..aba4ca5a0 100644 --- a/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc +++ b/PowerEditor/src/WinControls/shortcut/RunMacroDlg.rc @@ -32,7 +32,7 @@ BEGIN DEFPUSHBUTTON "&Run",IDOK,27,82,50,14 PUSHBUTTON "&Cancel",IDCANCEL,91,82,50,14 CONTROL "Run",IDC_M_RUN_MULTI,"Button",BS_AUTORADIOBUTTON,21,38,47,10 - CONTROL "Run until &end of file", IDC_M_RUN_EOF,"Button", BS_AUTORADIOBUTTON,21,56,140,10 + CONTROL "Run until the &end of file", IDC_M_RUN_EOF,"Button", BS_AUTORADIOBUTTON,21,56,140,10 EDITTEXT IDC_M_RUN_TIMES,68,35,25,14,ES_AUTOHSCROLL | ES_NUMBER | WS_EX_DLGMODALFRAME COMBOBOX IDC_MACRO_COMBO,67,10,96,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Macro to run :",IDC_MACRO2RUN_STATIC,5,12,59,8 diff --git a/PowerEditor/src/lastRecentFileList.cpp b/PowerEditor/src/lastRecentFileList.cpp index 0f8ef08a5..f16dd8d10 100644 --- a/PowerEditor/src/lastRecentFileList.cpp +++ b/PowerEditor/src/lastRecentFileList.cpp @@ -35,7 +35,7 @@ void LastRecentFileList::updateMenu() { const char * nativeLangCleanFilesList = (NppParameters::getInstance())->getNativeLangMenuStringA(IDM_CLEAN_RECENT_FILE_LIST); const char * openAllFileStr = nativeLangOpenAllFiles?nativeLangOpenAllFiles:"Open All Recent Files"; - const char * cleanFileListStr = nativeLangCleanFilesList?nativeLangCleanFilesList:"Clean Recent Files List"; + const char * cleanFileListStr = nativeLangCleanFilesList?nativeLangCleanFilesList:"Empty Recent Files List"; ::InsertMenu(_hMenu, _posBase + 0, MF_BYPOSITION, UINT(-1), 0); #ifdef UNICODE WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance(); diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h index f6eb94bdad438437e81d6ee996589651b89be78e..658361142d2dab1f2e6ab326f99629f795fd598f 100644 GIT binary patch delta 161 zcmZ2u&}O{hjrimR>>~V*3~3BS44Dks42eLPH#whOTrd$;jG=h)M0REFSu6%D=0H4~ z#bdI)m^dd$M->ofPcGzC<@aZhP^e-^Vn_v=l+2JZ*-%KFy%Z=96qy_-q{__))N9CM f%3{Uh4$>_Nl>@4FW~c + +