diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj index ee6728557..2ecb845bc 100644 --- a/grepWinNP3/grepWinNP3.vcxproj +++ b/grepWinNP3/grepWinNP3.vcxproj @@ -143,6 +143,7 @@ Level4 stdcpplatest true + stdc17 true @@ -170,6 +171,7 @@ Level4 stdcpplatest true + stdc17 true @@ -187,7 +189,7 @@ sktoolslib_mod;src\last;%(AdditionalIncludeDirectories) - ProgramDatabase + None NoExtensions true true @@ -202,6 +204,7 @@ true true true + stdc17 true @@ -233,6 +236,7 @@ Level4 stdcpplatest true + stdc17 true @@ -254,7 +258,7 @@ sktoolslib_mod;src\last;%(AdditionalIncludeDirectories) - ProgramDatabase + None true true Use @@ -268,6 +272,7 @@ true true true + stdc17 true @@ -297,6 +302,7 @@ Level4 stdcpplatest true + stdc17 true diff --git a/language/Line numbers to translate.txt b/language/Line numbers to translate.txt index 9366d6e67..150ca1f2a 100644 --- a/language/Line numbers to translate.txt +++ b/language/Line numbers to translate.txt @@ -1,34 +1,34 @@ -========================================================================================================== -== == -== This ".txt" file is intended for "Translators" to communicate to them the "Line Numbers" of the == -== "Added or Modified" elements in the Resource files ("filename_xx_yy.rc" and "grepWinNP3.lang"). == -== == -== Last update: "May 2021" on 2021-05-07 == -========================================================================================================== +======================================================================================================== +== == +== This ".txt" file is intended for "Translators" to communicate to them the "Line numbers" of the == +== "Added or Modified" items in the "Resource" files ("filename_xx_yy.rc" and "grepWinNP3.lang"). == +== == +== Last update: "May 2021" on 2021-05-18 == +======================================================================================================== -January 2022: Line numbers to translate_2022-01.png - +January 2022: Line numbers to translate_2022-01 - -Fbruary 2022: Line numbers to translate_2022-02.png - +February 2022: Line numbers to translate_2022-02 - -March 2021: Line numbers to translate_2021-03.png - https://workupload.com/file/MrtH6U2RhKC (2021-03-31) +March 2021: Line numbers to translate_2021-03 - https://workupload.com/file/MrtH6U2RhKC (2021-03-31) -April 2021: Line numbers to translate_2021-04.png - https://workupload.com/file/jcbdVpEBCfr (2021-04-29) +April 2021: Line numbers to translate_2021-04 - https://workupload.com/file/jcbdVpEBCfr (2021-04-29) -May 2021: Line numbers to translate_2021-05.png - https://workupload.com/file/B3Gq4QFHERL (2021-05-07) +May 2021: Line numbers to translate_2021-05 - https://workupload.com/file/9herVXcC9ED (2021-05-18) -June 2021: Line numbers to translate_2021-06.png - +June 2021: Line numbers to translate_2021-06 - -July 2021: Line numbers to translate_2021-07.png - +July 2021: Line numbers to translate_2021-07 - -August 2021: Line numbers to translate_2021-08.png - +August 2021: Line numbers to translate_2021-08 - -Sept. 2021: Line numbers to translate_2021-09.png - +September 2021: Line numbers to translate_2021-09 - -October 2021: Line numbers to translate_2021-10.png - +October 2021: Line numbers to translate_2021-10 - -Novemb. 2021: Line numbers to translate_2021-11.png - +November 2021: Line numbers to translate_2021-11 - -Decemb. 2021: Line numbers to translate_2021-12.png - +December 2021: Line numbers to translate_2021-12 - Comments and suggestions are welcome... 😃 @@ -36,4 +36,4 @@ Comments and suggestions are welcome... 😃 If you have any difficulties or questions, do not hesitate to contact me. hpwamr - MUI Coordinator ----------------------------------------------------------------------------------------------------------- +-------------------------------------------------------------------------------------------------------- diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 0b0452cc2..ade9b2d83 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL Kod&eer\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Dekodeer\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_af_za/np3_af_za.vcxproj b/language/np3_af_za/np3_af_za.vcxproj index d4226697c..4d5004456 100644 --- a/language/np3_af_za/np3_af_za.vcxproj +++ b/language/np3_af_za/np3_af_za.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 82305b5e9..475de41aa 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "Ка&даваць URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "Д&экадаваць URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_be_by/np3_be_by.vcxproj b/language/np3_be_by/np3_be_by.vcxproj index 7e97660a4..b9b5c86c8 100644 --- a/language/np3_be_by/np3_be_by.vcxproj +++ b/language/np3_be_by/np3_be_by.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 61f23fcba..3c7afbdd5 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Codierung", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decodierung", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decodiere als ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decodiere als...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&URL Codierung\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL Decodierung\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_de_de/np3_de_de.vcxproj b/language/np3_de_de/np3_de_de.vcxproj index 94f001795..b48f9b2d3 100644 --- a/language/np3_de_de/np3_de_de.vcxproj +++ b/language/np3_de_de/np3_de_de.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_el_gr/np3_el_gr.vcxproj b/language/np3_el_gr/np3_el_gr.vcxproj index 45cbca592..69a6e8593 100644 --- a/language/np3_el_gr/np3_el_gr.vcxproj +++ b/language/np3_el_gr/np3_el_gr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 26c7476d7..7676befed 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL &Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_en_gb/np3_en_gb.vcxproj b/language/np3_en_gb/np3_en_gb.vcxproj index ca7a7f98a..01adeb56b 100644 --- a/language/np3_en_gb/np3_en_gb.vcxproj +++ b/language/np3_en_gb/np3_en_gb.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 4b688ee83..4de54a91c 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL &Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_en_us/np3_en_us.vcxproj b/language/np3_en_us/np3_en_us.vcxproj index 1a8fbed58..165dae492 100644 --- a/language/np3_en_us/np3_en_us.vcxproj +++ b/language/np3_en_us/np3_en_us.vcxproj @@ -149,7 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 Windows @@ -177,7 +178,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 Windows @@ -209,7 +211,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 + None Windows @@ -243,7 +247,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 Windows @@ -277,7 +282,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 + None Windows @@ -311,7 +318,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) - Default + stdcpp17 + stdc17 Windows diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc index 3db3ad5c0..17172b91e 100644 --- a/language/np3_es_419/menu_es_419.rc +++ b/language/np3_es_419/menu_es_419.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Codificar", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decodificar", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decodificar como ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decodificar como...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&Codificar URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "D&ecodificar URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_es_419/np3_es_419.vcxproj b/language/np3_es_419/np3_es_419.vcxproj index 990e3de8d..ccf01212e 100644 --- a/language/np3_es_419/np3_es_419.vcxproj +++ b/language/np3_es_419/np3_es_419.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index a62bd9c2a..6b35f2def 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Codificar", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decodificar", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decodificar como ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decodificar como...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&Codificar URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "D&ecodificar URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_es_es/np3_es_es.vcxproj b/language/np3_es_es/np3_es_es.vcxproj index e72620681..1509e600c 100644 --- a/language/np3_es_es/np3_es_es.vcxproj +++ b/language/np3_es_es/np3_es_es.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 8a1e07c1f..5a60741f0 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encodage", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Décodage", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Décodage comme ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Décodage comme...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&URL Encodage\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Décodage\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_fr_fr/np3_fr_fr.vcxproj b/language/np3_fr_fr/np3_fr_fr.vcxproj index 023841705..036bf0270 100644 --- a/language/np3_fr_fr/np3_fr_fr.vcxproj +++ b/language/np3_fr_fr/np3_fr_fr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_hi_in/dialogs_hi_in.rc b/language/np3_hi_in/dialogs_hi_in.rc index 07ef99f7d..0a0392cbe 100644 --- a/language/np3_hi_in/dialogs_hi_in.rc +++ b/language/np3_hi_in/dialogs_hi_in.rc @@ -697,53 +697,53 @@ END // IDD_MUI_SYSFONT_WITHLINK DIALOGEX 13, 54, 243, 234 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Font" +CAPTION "फ़ॉन्ट" FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN - LTEXT "&Font:", stc1, 7, 7, 98, 9 + LTEXT "फ़ॉन्ट: (&F)", stc1, 7, 7, 98, 9 COMBOBOX cmb1, 7, 16, 98, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "Font st&yle:", stc2, 114, 7, 74, 9 + LTEXT "फ़ॉन्ट शैली: (&Y)", stc2, 114, 7, 74, 9 COMBOBOX cmb2, 114, 16, 74, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "&Size:", stc3, 198, 7, 36, 9 + LTEXT "आकार: (&S)", stc3, 198, 7, 36, 9 COMBOBOX cmb3, 198, 16, 36, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - GROUPBOX "Effects", grp1, 7, 97, 98, 76, WS_GROUP + GROUPBOX "प्रभाव", grp1, 7, 97, 98, 76, WS_GROUP AUTOCHECKBOX "Stri&keout", chx1, 13, 111, 90, 10, WS_TABSTOP - AUTOCHECKBOX "&Underline", chx2, 13, 127, 90, 10 + AUTOCHECKBOX "रेखांकित करें (&U)", chx2, 13, 127, 90, 10 - LTEXT "&Color:", stc4, 13, 144, 89, 9 + LTEXT "रंग: (&C)", stc4, 13, 144, 89, 9 COMBOBOX cmb4, 13, 155, 85, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample", grp2, 114, 97, 120, 43, WS_GROUP + GROUPBOX "नमूना", grp2, 114, 97, 120, 43, WS_GROUP CTEXT "AaBbYyZz", stc5, 116, 106, 117, 33, SS_NOPREFIX | NOT WS_VISIBLE LTEXT "", stc6, 7, 178, 227, 20, SS_NOPREFIX | NOT WS_GROUP - LTEXT "Sc&ript:", stc7, 114, 145, 118, 9 + LTEXT "स्क्रिप्ट: (&R)", stc7, 114, 145, 118, 9 COMBOBOX cmb5, 114, 155, 120, 30, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CONTROL "Show more fonts", IDC_MANAGE_LINK, "SysLink", + CONTROL "बाकी फ़ॉन्ट्स दिखाएं", IDC_MANAGE_LINK, "SysLink", WS_TABSTOP, 7, 199, 227, 9 - DEFPUSHBUTTON "OK", IDOK, 141, 215, 45, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 190, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Apply", psh3, 92, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 43, 215, 45, 14, WS_GROUP + DEFPUSHBUTTON "सही है", IDOK, 141, 215, 45, 14, WS_GROUP + PUSHBUTTON "रद्द करें", IDCANCEL, 190, 215, 45, 14, WS_GROUP + PUSHBUTTON "लागू करें (&A)", psh3, 92, 215, 45, 14, WS_GROUP + PUSHBUTTON "मदद (&H)", pshHelp, 43, 215, 45, 14, WS_GROUP END @@ -753,25 +753,25 @@ END IDD_MUI_SYSCOLOR_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 2, 0, 298, 184 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Choose Color" +CAPTION "रंग चुनें" FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN - LTEXT "&Basic colors:", -1, 4, 4, 140, 9 + LTEXT "मूल रंग: (&B)", -1, 4, 4, 140, 9 CONTROL "", COLOR_BOX1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 14, 140, 86 - LTEXT "&Custom colors:", -1, 4, 106, 140, 9 + LTEXT "कस्टम रंग: (&C)", -1, 4, 106, 140, 9 CONTROL "", COLOR_CUSTOM1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 116, 140, 28 - PUSHBUTTON "&Define Custom Colors >>" COLOR_MIX, 4, 150, 138, 14, + PUSHBUTTON "कस्टम रंग परिभाषित करें (&D) >>" COLOR_MIX, 4, 150, 138, 14, WS_TABSTOP | WS_GROUP - DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Help", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "सही है", IDOK, 4, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "रद्द करें", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "मदद (&H)", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP CONTROL "", COLOR_RAINBOW, "static", SS_SIMPLE | WS_CHILD, 152, 4, 118, 116 @@ -783,28 +783,28 @@ BEGIN SS_SIMPLE | WS_CHILD, 152, 124, 40, 26 PUSHBUTTON "&o", COLOR_SOLID, 300, 200, 4, 14, WS_GROUP - RTEXT "Color", COLOR_SOLID_LEFT, 152, 151, 20, 9 + RTEXT "रंग", COLOR_SOLID_LEFT, 152, 151, 20, 9 LTEXT "|S&olid", COLOR_SOLID_RIGHT, 172, 151, 20, 9 - RTEXT "Hu&e:", COLOR_HUEACCEL, 194, 126, 20, 9 + RTEXT "छटा: (&E)", COLOR_HUEACCEL, 194, 126, 20, 9 EDITTEXT, COLOR_HUE, 216, 124, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Sat:", COLOR_SATACCEL, 194, 140, 20, 9 + RTEXT "संतृप्तता: (&S)", COLOR_SATACCEL, 194, 140, 20, 9 EDITTEXT, COLOR_SAT, 216, 138, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Lum:", COLOR_LUMACCEL, 194, 154, 20, 9 + RTEXT "प्रकाश: (&L)", COLOR_LUMACCEL, 194, 154, 20, 9 EDITTEXT, COLOR_LUM, 216, 152, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Red:", COLOR_REDACCEL, 243, 126, 24, 9 + RTEXT "लाल: (&R)", COLOR_REDACCEL, 243, 126, 24, 9 EDITTEXT, COLOR_RED, 269, 124, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Green:", COLOR_GREENACCEL, 243, 140, 24, 9 + RTEXT "हरा: (&G)", COLOR_GREENACCEL, 243, 140, 24, 9 EDITTEXT, COLOR_GREEN, 269, 138, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "Bl&ue:", COLOR_BLUEACCEL, 243, 154, 24, 9 + RTEXT "नीला: (&U)", COLOR_BLUEACCEL, 243, 154, 24, 9 EDITTEXT, COLOR_BLUE, 269, 152, 18, 12, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Add to Custom Colors", COLOR_ADD, 152, 166, 142, 14, + PUSHBUTTON "कस्टम रंग में जोड़ें (&A)", COLOR_ADD, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP END diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index 73635674f..18294cd27 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -79,8 +79,8 @@ BEGIN BEGIN MENUITEM "फ़ाइल में खोजें (&S)\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH MENUITEM SEPARATOR - MENUITEM "&New Empty Window\tAlt+N", IDM_FILE_NEWWINDOW - MENUITEM "&Duplicate Instance\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 + MENUITEM "ख़ाली नई विंडो (&N)\tAlt+N", IDM_FILE_NEWWINDOW + MENUITEM "अवस्था का प्रतिरूप (&D)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR MENUITEM "व्यवस्थापक के रूप में पुनः प्रक्षेपित करें (&R)", IDM_FILE_LAUNCH_ELEVATED MENUITEM SEPARATOR @@ -95,7 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "फ़ाइल को वापस लाएं (&V)\tF5", IDM_FILE_REVERT - MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS + MENUITEM "File-Vars को नज़रअंदाज़ करें (&I)", CMD_IGNORE_FILE_VARS POPUP "एन्कोडिंग (&E)" BEGIN POPUP "इस प्रकार से फ़ाइल में वापस लाएं (&R)" @@ -212,10 +212,10 @@ BEGIN MENUITEM SEPARATOR POPUP "Line &Comment" BEGIN - MENUITEM "&Toggle\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Add\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD - MENUITEM "&Remove\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE - MENUITEM "&Block Edit\tAlt+Shift+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "टॉगल (&T)\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "जोड़ें (&A)\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD + MENUITEM "हटाएँ (&R)\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE + MENUITEM "ब्लॉक सम्पादित करें (&B)\tAlt+Shift+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT END MENUITEM SEPARATOR MENUITEM "Stream टिप्पणी (&R)\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL एन्कोड (&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL डिकोड (&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_hi_in/np3_hi_in.vcxproj b/language/np3_hi_in/np3_hi_in.vcxproj index 5eb1ddf63..8f2c345cd 100644 --- a/language/np3_hi_in/np3_hi_in.vcxproj +++ b/language/np3_hi_in/np3_hi_in.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc index 06fa8ef5f..96e1e9e4f 100644 --- a/language/np3_hi_in/strings_hi_in.rc +++ b/language/np3_hi_in/strings_hi_in.rc @@ -196,10 +196,10 @@ BEGIN IDS_MUI_EXPORT_FAIL "शैली सेटिंग ""%s"" को निर्यात करने में त्रुटि." IDS_MUI_REGEX_INVALID "सामान्य व्यंजक मूल्यांकन करने में त्रुटि। व्यंजक अवैध है!" IDS_MUI_DROP_NO_FILE "प्राप्त हुआ फ़ाईलनाम वैध नहीं है.\nअगर 32-बिट एपलिकेशन से ड्रॉप कर रहे है,\nतो कृपया Notepad3 की औज़ार पट्टी पर ड्रैग और ड्रॉप करें." - IDS_MUI_URL_DIR_EXISTS "URL specified directory exists!" - IDS_MUI_URL_FILE_EXISTS "URL specified file exists!" + IDS_MUI_URL_DIR_EXISTS "URL निर्दिष्ट निदेशिका मौजूद है!" + IDS_MUI_URL_FILE_EXISTS "URL निर्दिष्ट फ़ाईल मौजूद है!" IDS_MUI_URL_PATH_NOT_FOUND - "URL specified path not found!" + "URL निर्दिष्ट स्थान मौजूद नहीं है!" IDS_MUI_URL_OPEN_FILE "\nAlt + फ़ाईल खोलने के लिए क्लिक करें." IDS_MUI_URL_OPEN_BROWSER "\nCtrl + ब्राउज़र में लिंक खोलने के लिए क्लिक करें." IDS_MUI_INF_PRSVFILEMODTM @@ -272,13 +272,13 @@ END STRINGTABLE BEGIN - IDS_MUI_SB_MARK_ALL_OCC "Mark All Occurrences..." - IDS_MUI_SB_TOGGLE_VIEW "Toggle View..." - IDS_MUI_SB_REPLACE_ALL "Replace all..." - IDS_MUI_SB_WRAP_LINES "Wrap Lines..." - IDS_MUI_SB_CONV_LNBRK "Convert Line Breaks..." - IDS_MUI_SB_RECODING_DOC "Recoding Document..." - IDS_MUI_SB_LEXER_STYLING "Apply Lexer Styling..." + IDS_MUI_SB_MARK_ALL_OCC "सभी मौजूदगी चिन्हित करें..." + IDS_MUI_SB_TOGGLE_VIEW "दृश्य टॉगल करें..." + IDS_MUI_SB_REPLACE_ALL "सारा बदलें..." + IDS_MUI_SB_WRAP_LINES "पंक्ति लपेटें..." + IDS_MUI_SB_CONV_LNBRK "Line Breaks परिवर्तित करें..." + IDS_MUI_SB_RECODING_DOC "दस्तावेज़ रिकोड किया जा रहा है..." + IDS_MUI_SB_LEXER_STYLING "Lexer Styling लागू करें..." END STRINGTABLE diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index e91980533..b01b6c2ee 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&URL bekódolás\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "U&RL kikódolás\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_hu_hu/np3_hu_hu.vcxproj b/language/np3_hu_hu/np3_hu_hu.vcxproj index 7f5a75186..97be529e1 100644 --- a/language/np3_hu_hu/np3_hu_hu.vcxproj +++ b/language/np3_hu_hu/np3_hu_hu.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index b27f562b9..62b6326fb 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL &Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_id_id/np3_id_id.vcxproj b/language/np3_id_id/np3_id_id.vcxproj index 1997a02f1..ee8587015 100644 --- a/language/np3_id_id/np3_id_id.vcxproj +++ b/language/np3_id_id/np3_id_id.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc index 4836ae6f7..1b3281f05 100644 --- a/language/np3_it_it/dialogs_it_it.rc +++ b/language/np3_it_it/dialogs_it_it.rc @@ -706,28 +706,28 @@ BEGIN CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "Font st&yle:", stc2, 114, 7, 74, 9 + LTEXT "St&ile Font:", stc2, 114, 7, 74, 9 COMBOBOX cmb2, 114, 16, 74, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "&Size:", stc3, 198, 7, 36, 9 + LTEXT "&Dimensione:", stc3, 198, 7, 36, 9 COMBOBOX cmb3, 198, 16, 36, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - GROUPBOX "Effects", grp1, 7, 97, 98, 76, WS_GROUP - AUTOCHECKBOX "Stri&keout", chx1, 13, 111, 90, 10, WS_TABSTOP - AUTOCHECKBOX "&Underline", chx2, 13, 127, 90, 10 + GROUPBOX "Effetti", grp1, 7, 97, 98, 76, WS_GROUP + AUTOCHECKBOX "Ba&rrato", chx1, 13, 111, 90, 10, WS_TABSTOP + AUTOCHECKBOX "&Sottolineato", chx2, 13, 127, 90, 10 - LTEXT "&Color:", stc4, 13, 144, 89, 9 + LTEXT "&Colore:", stc4, 13, 144, 89, 9 COMBOBOX cmb4, 13, 155, 85, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample", grp2, 114, 97, 120, 43, WS_GROUP + GROUPBOX "Esempio", grp2, 114, 97, 120, 43, WS_GROUP CTEXT "AaBbYyZz", stc5, 116, 106, 117, 33, SS_NOPREFIX | NOT WS_VISIBLE LTEXT "", stc6, 7, 178, 227, 20, SS_NOPREFIX | NOT WS_GROUP @@ -737,13 +737,13 @@ BEGIN CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CONTROL "Show more fonts", IDC_MANAGE_LINK, "SysLink", + CONTROL "Visualizza altri font", IDC_MANAGE_LINK, "SysLink", WS_TABSTOP, 7, 199, 227, 9 DEFPUSHBUTTON "OK", IDOK, 141, 215, 45, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 190, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Apply", psh3, 92, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 43, 215, 45, 14, WS_GROUP + PUSHBUTTON "Annulla", IDCANCEL, 190, 215, 45, 14, WS_GROUP + PUSHBUTTON "&Applica", psh3, 92, 215, 45, 14, WS_GROUP + PUSHBUTTON "&Aiuto", pshHelp, 43, 215, 45, 14, WS_GROUP END @@ -753,25 +753,25 @@ END IDD_MUI_SYSCOLOR_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 2, 0, 298, 184 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Choose Color" +CAPTION "Seleziona Colore" FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN - LTEXT "&Basic colors:", -1, 4, 4, 140, 9 + LTEXT "&Colori di base:", -1, 4, 4, 140, 9 CONTROL "", COLOR_BOX1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 14, 140, 86 - LTEXT "&Custom colors:", -1, 4, 106, 140, 9 + LTEXT "Colori &Personalizzati:", -1, 4, 106, 140, 9 CONTROL "", COLOR_CUSTOM1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 116, 140, 28 - PUSHBUTTON "&Define Custom Colors >>" COLOR_MIX, 4, 150, 138, 14, + PUSHBUTTON "&Definisci Colori Personalizzati >>" COLOR_MIX, 4, 150, 138, 14, WS_TABSTOP | WS_GROUP DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Help", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Aiuto", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP CONTROL "", COLOR_RAINBOW, "static", SS_SIMPLE | WS_CHILD, 152, 4, 118, 116 @@ -783,7 +783,7 @@ BEGIN SS_SIMPLE | WS_CHILD, 152, 124, 40, 26 PUSHBUTTON "&o", COLOR_SOLID, 300, 200, 4, 14, WS_GROUP - RTEXT "Color", COLOR_SOLID_LEFT, 152, 151, 20, 9 + RTEXT "Colore", COLOR_SOLID_LEFT, 152, 151, 20, 9 LTEXT "|S&olid", COLOR_SOLID_RIGHT, 172, 151, 20, 9 RTEXT "Hu&e:", COLOR_HUEACCEL, 194, 126, 20, 9 @@ -804,7 +804,7 @@ BEGIN RTEXT "Bl&ue:", COLOR_BLUEACCEL, 243, 154, 24, 9 EDITTEXT, COLOR_BLUE, 269, 152, 18, 12, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Add to Custom Colors", COLOR_ADD, 152, 166, 142, 14, + PUSHBUTTON "&Aggiungi ai Colori Personalizzati", COLOR_ADD, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP END diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index cb6f31afa..cc4bfa34f 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "&Cerca nei file\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH MENUITEM SEPARATOR - MENUITEM "&New Empty Window\tAlt+N", IDM_FILE_NEWWINDOW - MENUITEM "&Duplicate Instance\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 + MENUITEM "&Nuova finestra vuota\tAlt+N", IDM_FILE_NEWWINDOW + MENUITEM "&Duplica istanza\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR - MENUITEM "&Rilancio con diritti elevati", IDM_FILE_LAUNCH_ELEVATED + MENUITEM "&Rilancia con diritti elevati", IDM_FILE_LAUNCH_ELEVATED MENUITEM SEPARATOR MENUITEM "Esegui &documento\tCtrl+L", IDM_FILE_LAUNCH MENUITEM "&Apri con...\tAlt+L", IDM_FILE_OPENWITH @@ -95,7 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Ri&pristina dal File\tF5", IDM_FILE_REVERT - MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS + MENUITEM "&Ignora File-Vars", CMD_IGNORE_FILE_VARS POPUP "&Codifica" BEGIN POPUP "&Ripristina dal File come" @@ -210,11 +210,11 @@ BEGIN MENUITEM "&Indenta", IDM_EDIT_INDENT MENUITEM "&Rimuovi indentazione", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - POPUP "Line &Comment" + POPUP "&Commento riga" BEGIN - MENUITEM "&Toggle\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Add\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD - MENUITEM "&Remove\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE + MENUITEM "&Commuta\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "&Aggiungi\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD + MENUITEM "&Rimuovi\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE MENUITEM "&Block Edit\tAlt+Shift+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT END MENUITEM SEPARATOR @@ -263,12 +263,12 @@ BEGIN MENUITEM "Indentazione: Spazi -> Ta&b\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 MENUITEM "Indentazione: Tab -> Spa&zi\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2 MENUITEM SEPARATOR - MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE - MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Codifica Base&64", IDM_EDIT_BASE64ENCODE + MENUITEM "Decodifica Base6&4", IDM_EDIT_BASE64DECODE + MENUITEM "Decodifica Base64 a codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR - MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE - MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE + MENUITEM "Codifica &URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE + MENUITEM "&Decodifica URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE MENUITEM "Da Percorso di File System a URL", IDM_EDIT_PATH2URL MENUITEM "Da URL a Percorso di File System", IDM_EDIT_URL2PATH MENUITEM SEPARATOR diff --git a/language/np3_it_it/np3_it_it.vcxproj b/language/np3_it_it/np3_it_it.vcxproj index c1da2f78b..710829037 100644 --- a/language/np3_it_it/np3_it_it.vcxproj +++ b/language/np3_it_it/np3_it_it.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index a9f27007a..2e68f11bf 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -196,10 +196,10 @@ BEGIN IDS_MUI_EXPORT_FAIL "Errore nell'esportazione degli Stili su ""%s""." IDS_MUI_REGEX_INVALID "Errore nella valutazione della regular expression. La RegExp non è valida!" IDS_MUI_DROP_NO_FILE "Nessun nomefile valido.\nSe stai facendo drag-n-drop da una applicazione 32-bit,\nrilascia il file sulla toolbar di Notepad3." - IDS_MUI_URL_DIR_EXISTS "URL specified directory exists!" - IDS_MUI_URL_FILE_EXISTS "URL specified file exists!" + IDS_MUI_URL_DIR_EXISTS "La cartella specificata nella URL esiste!" + IDS_MUI_URL_FILE_EXISTS "Il file specificato nella URL esiste!" IDS_MUI_URL_PATH_NOT_FOUND - "URL specified path not found!" + "Il percorso specificato nella URL non è stato trovato!" IDS_MUI_URL_OPEN_FILE "\nAlt + Click per aprire il file." IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click per aprire il link nel browser." IDS_MUI_INF_PRSVFILEMODTM @@ -272,13 +272,13 @@ END STRINGTABLE BEGIN - IDS_MUI_SB_MARK_ALL_OCC "Mark All Occurrences..." - IDS_MUI_SB_TOGGLE_VIEW "Toggle View..." - IDS_MUI_SB_REPLACE_ALL "Replace all..." - IDS_MUI_SB_WRAP_LINES "Wrap Lines..." - IDS_MUI_SB_CONV_LNBRK "Convert Line Breaks..." - IDS_MUI_SB_RECODING_DOC "Recoding Document..." - IDS_MUI_SB_LEXER_STYLING "Apply Lexer Styling..." + IDS_MUI_SB_MARK_ALL_OCC "Contrassegna tutte le occorrenze..." + IDS_MUI_SB_TOGGLE_VIEW "Commuta visualizzazione..." + IDS_MUI_SB_REPLACE_ALL "Sostituisci tutto..." + IDS_MUI_SB_WRAP_LINES "A capo automatico..." + IDS_MUI_SB_CONV_LNBRK "Converti interruzioni di linea..." + IDS_MUI_SB_RECODING_DOC "Ricodifica documento..." + IDS_MUI_SB_LEXER_STYLING "Applica Lexer Styling..." END STRINGTABLE diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index c33e665d8..49e2bf225 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URLエンコード(&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URLデコード(&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_ja_jp/np3_ja_jp.vcxproj b/language/np3_ja_jp/np3_ja_jp.vcxproj index f065199b8..d0bdb4077 100644 --- a/language/np3_ja_jp/np3_ja_jp.vcxproj +++ b/language/np3_ja_jp/np3_ja_jp.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index d2d1277f0..db437175a 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 인코딩", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 디코딩", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 코드 페이지로 디코딩 ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 코드 페이지로 디코딩...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL 인코딩(&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL 디코딩(&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_ko_kr/np3_ko_kr.vcxproj b/language/np3_ko_kr/np3_ko_kr.vcxproj index 30ec24e9a..bba4552c2 100644 --- a/language/np3_ko_kr/np3_ko_kr.vcxproj +++ b/language/np3_ko_kr/np3_ko_kr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index d7bc683ba..d3545d2c1 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode als ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode als...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_nl_nl/np3_nl_nl.vcxproj b/language/np3_nl_nl/np3_nl_nl.vcxproj index b26160aba..c1b83d949 100644 --- a/language/np3_nl_nl/np3_nl_nl.vcxproj +++ b/language/np3_nl_nl/np3_nl_nl.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index 2c46b23fd..e0f040d70 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -697,53 +697,53 @@ END // IDD_MUI_SYSFONT_WITHLINK DIALOGEX 13, 54, 243, 234 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Font" +CAPTION "Czcionka" FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN - LTEXT "&Font:", stc1, 7, 7, 98, 9 + LTEXT "&Czcionka:", stc1, 7, 7, 98, 9 COMBOBOX cmb1, 7, 16, 98, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "Font st&yle:", stc2, 114, 7, 74, 9 + LTEXT "St&yl czcionki:", stc2, 114, 7, 74, 9 COMBOBOX cmb2, 114, 16, 74, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - LTEXT "&Size:", stc3, 198, 7, 36, 9 + LTEXT "&Rozmiar:", stc3, 198, 7, 36, 9 COMBOBOX cmb3, 198, 16, 36, 76, CBS_SIMPLE | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_HASSTRINGS | CBS_OWNERDRAWFIXED - GROUPBOX "Effects", grp1, 7, 97, 98, 76, WS_GROUP - AUTOCHECKBOX "Stri&keout", chx1, 13, 111, 90, 10, WS_TABSTOP - AUTOCHECKBOX "&Underline", chx2, 13, 127, 90, 10 + GROUPBOX "Efekty", grp1, 7, 97, 98, 76, WS_GROUP + AUTOCHECKBOX "S&kreślenie", chx1, 13, 111, 90, 10, WS_TABSTOP + AUTOCHECKBOX "&Podkreślenie", chx2, 13, 127, 90, 10 - LTEXT "&Color:", stc4, 13, 144, 89, 9 + LTEXT "&Kolor:", stc4, 13, 144, 89, 9 COMBOBOX cmb4, 13, 155, 85, 100, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Sample", grp2, 114, 97, 120, 43, WS_GROUP + GROUPBOX "Próbka", grp2, 114, 97, 120, 43, WS_GROUP CTEXT "AaBbYyZz", stc5, 116, 106, 117, 33, SS_NOPREFIX | NOT WS_VISIBLE LTEXT "", stc6, 7, 178, 227, 20, SS_NOPREFIX | NOT WS_GROUP - LTEXT "Sc&ript:", stc7, 114, 145, 118, 9 + LTEXT "Sk&rypt:", stc7, 114, 145, 118, 9 COMBOBOX cmb5, 114, 155, 120, 30, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CONTROL "Show more fonts", IDC_MANAGE_LINK, "SysLink", + CONTROL "Pokaż więcej czcionek", IDC_MANAGE_LINK, "SysLink", WS_TABSTOP, 7, 199, 227, 9 DEFPUSHBUTTON "OK", IDOK, 141, 215, 45, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 190, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Apply", psh3, 92, 215, 45, 14, WS_GROUP - PUSHBUTTON "&Help", pshHelp, 43, 215, 45, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 190, 215, 45, 14, WS_GROUP + PUSHBUTTON "Z&astosuj", psh3, 92, 215, 45, 14, WS_GROUP + PUSHBUTTON "&Pomoc", pshHelp, 43, 215, 45, 14, WS_GROUP END @@ -753,25 +753,25 @@ END IDD_MUI_SYSCOLOR_DLG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 2, 0, 298, 184 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Choose Color" +CAPTION "Wybierz kolor" FONT 9, "Segoe UI", 0, 0, 0x0 BEGIN - LTEXT "&Basic colors:", -1, 4, 4, 140, 9 + LTEXT "&Kolory postawowe:", -1, 4, 4, 140, 9 CONTROL "", COLOR_BOX1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 14, 140, 86 - LTEXT "&Custom colors:", -1, 4, 106, 140, 9 + LTEXT "&Kolory użytkownika:", -1, 4, 106, 140, 9 CONTROL "", COLOR_CUSTOM1, "static", SS_SIMPLE | WS_CHILD | WS_TABSTOP | WS_GROUP, 4, 116, 140, 28 - PUSHBUTTON "&Define Custom Colors >>" COLOR_MIX, 4, 150, 138, 14, + PUSHBUTTON "&Zdefiniuj kolory użytkownika >>" COLOR_MIX, 4, 150, 138, 14, WS_TABSTOP | WS_GROUP DEFPUSHBUTTON "OK", IDOK, 4, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Help", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Pomoc", pshHelp, 100, 166, 44, 14, WS_GROUP | WS_TABSTOP CONTROL "", COLOR_RAINBOW, "static", SS_SIMPLE | WS_CHILD, 152, 4, 118, 116 @@ -783,28 +783,28 @@ BEGIN SS_SIMPLE | WS_CHILD, 152, 124, 40, 26 PUSHBUTTON "&o", COLOR_SOLID, 300, 200, 4, 14, WS_GROUP - RTEXT "Color", COLOR_SOLID_LEFT, 152, 151, 20, 9 - LTEXT "|S&olid", COLOR_SOLID_RIGHT, 172, 151, 20, 9 + RTEXT "Kolor", COLOR_SOLID_LEFT, 152, 151, 20, 9 + LTEXT "|Jedn&olity", COLOR_SOLID_RIGHT, 172, 151, 20, 9 - RTEXT "Hu&e:", COLOR_HUEACCEL, 194, 126, 20, 9 + RTEXT "Odci&eń:", COLOR_HUEACCEL, 194, 126, 20, 9 EDITTEXT, COLOR_HUE, 216, 124, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Sat:", COLOR_SATACCEL, 194, 140, 20, 9 + RTEXT "Na&Sycenie:", COLOR_SATACCEL, 194, 140, 20, 9 EDITTEXT, COLOR_SAT, 216, 138, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Lum:", COLOR_LUMACCEL, 194, 154, 20, 9 + RTEXT "&Jaskrawość:", COLOR_LUMACCEL, 194, 154, 20, 9 EDITTEXT, COLOR_LUM, 216, 152, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Red:", COLOR_REDACCEL, 243, 126, 24, 9 + RTEXT "&Czerwony:", COLOR_REDACCEL, 243, 126, 24, 9 EDITTEXT, COLOR_RED, 269, 124, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "&Green:", COLOR_GREENACCEL, 243, 140, 24, 9 + RTEXT "&Zielony:", COLOR_GREENACCEL, 243, 140, 24, 9 EDITTEXT, COLOR_GREEN, 269, 138, 18, 12, WS_GROUP | WS_TABSTOP - RTEXT "Bl&ue:", COLOR_BLUEACCEL, 243, 154, 24, 9 + RTEXT "Niebieski:", COLOR_BLUEACCEL, 243, 154, 24, 9 EDITTEXT, COLOR_BLUE, 269, 152, 18, 12, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Add to Custom Colors", COLOR_ADD, 152, 166, 142, 14, + PUSHBUTTON "&Dodaj do kolorów użytkownika", COLOR_ADD, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP END diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 5e06dc757..6340a395a 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -79,8 +79,8 @@ BEGIN BEGIN MENUITEM "&Szukaj w plikach\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH MENUITEM SEPARATOR - MENUITEM "&New Empty Window\tAlt+N", IDM_FILE_NEWWINDOW - MENUITEM "&Duplicate Instance\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 + MENUITEM "&Nowe puste okno\tAlt+N", IDM_FILE_NEWWINDOW + MENUITEM "&Kopia przykładu\tAlt+Shift+N", IDM_FILE_NEWWINDOW2 MENUITEM SEPARATOR MENUITEM "Notepad3 jako &Administrator", IDM_FILE_LAUNCH_ELEVATED MENUITEM SEPARATOR @@ -95,7 +95,7 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "Powróć z pliku\tF5", IDM_FILE_REVERT - MENUITEM "&Ignore File-Vars", CMD_IGNORE_FILE_VARS + MENUITEM "&Ignoruj zmienność plików", CMD_IGNORE_FILE_VARS POPUP "&Kodowanie" BEGIN POPUP "&Powróć z pliku jako" @@ -210,12 +210,12 @@ BEGIN MENUITEM "&Wcięcie", IDM_EDIT_INDENT MENUITEM "&Bez wcięcia", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - POPUP "Line &Comment" + POPUP "Komentarz liniowy" BEGIN - MENUITEM "&Toggle\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Add\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD - MENUITEM "&Remove\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE - MENUITEM "&Block Edit\tAlt+Shift+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT + MENUITEM "&Przełącz\tCtrl+Q", IDM_EDIT_LINECOMMENT + MENUITEM "&Dodaj\tCtrl+Alt+Q", IDM_EDIT_LINECOMMENT_ADD + MENUITEM "&Usuń\tCtrl+Alt+Shift+Q", IDM_EDIT_LINECOMMENT_REMOVE + MENUITEM "&Blokuj edycję\tAlt+Shift+Q", IDM_EDIT_LINECOMMENT_BLOCKEDIT END MENUITEM SEPARATOR MENUITEM "&Komentarz strumieniowy\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT @@ -263,9 +263,9 @@ BEGIN MENUITEM "Wcięcia tabulatorami\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 MENUITEM "Wcięcia spacjami\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2 MENUITEM SEPARATOR - MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE - MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Koduj Base&64", IDM_EDIT_BASE64ENCODE + MENUITEM "Dekoduj Base6&4", IDM_EDIT_BASE64DECODE + MENUITEM "Koduj Base64 do strony kodowej...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&Koduj URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "Dekoduj URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE @@ -449,7 +449,7 @@ BEGIN MENUITEM "&Domyślna czcionka...\tAlt+F12", IDM_VIEW_FONT MENUITEM "Domyślna &czcionka bieżącego schematu...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME MENUITEM SEPARATOR - MENUITEM "Tryb ciemny Windowsa", IDM_VIEW_WIN_DARK_MODE + MENUITEM "Tryb ciemny okna", IDM_VIEW_WIN_DARK_MODE END POPUP "&Ustawienia" BEGIN diff --git a/language/np3_pl_pl/np3_pl_pl.vcxproj b/language/np3_pl_pl/np3_pl_pl.vcxproj index ba0984899..66b69076b 100644 --- a/language/np3_pl_pl/np3_pl_pl.vcxproj +++ b/language/np3_pl_pl/np3_pl_pl.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 104da3302..338d1d1f5 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -196,10 +196,10 @@ BEGIN IDS_MUI_EXPORT_FAIL "Błąd podczas eksportowania ustawień styu do ""%s""." IDS_MUI_REGEX_INVALID "Błąd podczas oceny regularnego wyrażenia. Wyrażenie jest nieuzasadnione!" IDS_MUI_DROP_NO_FILE "Nie rozpoznano żadnej sensownej nazwy pliku.\nJeśli upuścisz aplikację 32-bitową,\nprzeciągnij i upuść do paska narzędzi Notepad3'a." - IDS_MUI_URL_DIR_EXISTS "URL specified directory exists!" - IDS_MUI_URL_FILE_EXISTS "URL specified file exists!" + IDS_MUI_URL_DIR_EXISTS "URL określony katalog istnieje!" + IDS_MUI_URL_FILE_EXISTS "URL określony plik istnieje!" IDS_MUI_URL_PATH_NOT_FOUND - "URL specified path not found!" + "URL nie znaleziono określonej ścieżki!" IDS_MUI_URL_OPEN_FILE "\nAlt + Kliknij, aby otworzyć plik." IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Kliknij, aby otworzyć link w przeglądarce." IDS_MUI_INF_PRSVFILEMODTM @@ -272,13 +272,13 @@ END STRINGTABLE BEGIN - IDS_MUI_SB_MARK_ALL_OCC "Mark All Occurrences..." - IDS_MUI_SB_TOGGLE_VIEW "Toggle View..." - IDS_MUI_SB_REPLACE_ALL "Replace all..." - IDS_MUI_SB_WRAP_LINES "Wrap Lines..." - IDS_MUI_SB_CONV_LNBRK "Convert Line Breaks..." - IDS_MUI_SB_RECODING_DOC "Recoding Document..." - IDS_MUI_SB_LEXER_STYLING "Apply Lexer Styling..." + IDS_MUI_SB_MARK_ALL_OCC "Zaznacz wszystkie przykłady..." + IDS_MUI_SB_TOGGLE_VIEW "Przełącz widok..." + IDS_MUI_SB_REPLACE_ALL "Zamień wszystko..." + IDS_MUI_SB_WRAP_LINES "Zawiń linie..." + IDS_MUI_SB_CONV_LNBRK "Konwertuj podziały wierszy..." + IDS_MUI_SB_RECODING_DOC "Ponowne kodowanie dokumentu..." + IDS_MUI_SB_LEXER_STYLING "Zastosuj stylizację Lexera..." END STRINGTABLE @@ -291,7 +291,7 @@ Notepad3 \t[/?] [...[Kodowanie]] [...[Tryb końca wiersza]] [/e] [/g] [/m] [/l]\ file\tMust be the last argument, no quoted spaces by default.\r\n\ +\tAccept multiple file arguments (with quoted spaces).\r\n\ -\tAccept single file argument (without quoted spaces).\r\n\r\n\ -Options:\r\n\ +Opcje:\r\n\ /?\tDispay this help message.\r\n\ ...\tEncoding (/ansi, /unicode, /unicodebe, /utf8, /utf8sig).\r\n\ ...\tLine ending mode (/crlf, /cr, /lf).\r\n\ diff --git a/language/np3_pt_br/np3_pt_br.vcxproj b/language/np3_pt_br/np3_pt_br.vcxproj index 870aca303..ad8e46038 100644 --- a/language/np3_pt_br/np3_pt_br.vcxproj +++ b/language/np3_pt_br/np3_pt_br.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 630394928..e8af0bc07 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "Codificar &URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "&Descodificar URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_pt_pt/np3_pt_pt.vcxproj b/language/np3_pt_pt/np3_pt_pt.vcxproj index 1ac03981b..95218c6d2 100644 --- a/language/np3_pt_pt/np3_pt_pt.vcxproj +++ b/language/np3_pt_pt/np3_pt_pt.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 013aa93ea..7357a0ff2 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "Ко&дировать URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "Дек&одировать URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_ru_ru/np3_ru_ru.vcxproj b/language/np3_ru_ru/np3_ru_ru.vcxproj index 4e6913dcb..e540385ad 100644 --- a/language/np3_ru_ru/np3_ru_ru.vcxproj +++ b/language/np3_ru_ru/np3_ru_ru.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index 4259e3595..ee4d461e3 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "&Kódovať URL\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "&Dekódovať URL\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_sk_sk/np3_sk_sk.vcxproj b/language/np3_sk_sk/np3_sk_sk.vcxproj index 2795339ae..32c9979ed 100644 --- a/language/np3_sk_sk/np3_sk_sk.vcxproj +++ b/language/np3_sk_sk/np3_sk_sk.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 21ee62168..abc5d26f6 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL-kodning\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "Ta bort URL-kodning\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_sv_se/np3_sv_se.vcxproj b/language/np3_sv_se/np3_sv_se.vcxproj index 4b3607760..8d02b5516 100644 --- a/language/np3_sv_se/np3_sv_se.vcxproj +++ b/language/np3_sv_se/np3_sv_se.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 95e921a50..6aa6decaf 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL &Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_tr_tr/np3_tr_tr.vcxproj b/language/np3_tr_tr/np3_tr_tr.vcxproj index e19ee210f..4f72598aa 100644 --- a/language/np3_tr_tr/np3_tr_tr.vcxproj +++ b/language/np3_tr_tr/np3_tr_tr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index c2b95e208..e4a29c6f7 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL &Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_vi_vn/np3_vi_vn.vcxproj b/language/np3_vi_vn/np3_vi_vn.vcxproj index 9db4684e8..d7fa31442 100644 --- a/language/np3_vi_vn/np3_vi_vn.vcxproj +++ b/language/np3_vi_vn/np3_vi_vn.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index a01b7b7d7..e3a19a4b0 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL 编码(&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL 解码(&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_zh_cn/np3_zh_cn.vcxproj b/language/np3_zh_cn/np3_zh_cn.vcxproj index 079de747d..9db2cb7a4 100644 --- a/language/np3_zh_cn/np3_zh_cn.vcxproj +++ b/language/np3_zh_cn/np3_zh_cn.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index f39131dc2..e054597eb 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -265,7 +265,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Base&64 Encode", IDM_EDIT_BASE64ENCODE MENUITEM "Base6&4 Decode", IDM_EDIT_BASE64DECODE - MENUITEM "Base64 Decode to codepage ...", IDM_EDIT_B64DECODESEL + MENUITEM "Base64 Decode to codepage...", IDM_EDIT_B64DECODESEL MENUITEM SEPARATOR MENUITEM "URL 編碼(&E)\tCtrl+Shift+E", IDM_EDIT_URLENCODE MENUITEM "URL 解碼(&D)\tCtrl+Shift+R", IDM_EDIT_URLDECODE diff --git a/language/np3_zh_tw/np3_zh_tw.vcxproj b/language/np3_zh_tw/np3_zh_tw.vcxproj index 3c45a2f7f..fdb298e12 100644 --- a/language/np3_zh_tw/np3_zh_tw.vcxproj +++ b/language/np3_zh_tw/np3_zh_tw.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -243,6 +250,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +286,9 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 + None Windows @@ -311,6 +323,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/lexilla/Lexilla.vcxproj b/lexilla/Lexilla.vcxproj index c6e023ece..44354b00c 100644 --- a/lexilla/Lexilla.vcxproj +++ b/lexilla/Lexilla.vcxproj @@ -237,6 +237,7 @@ false false true + stdc17 Console @@ -272,6 +273,8 @@ false false true + stdc17 + None Console @@ -308,6 +311,7 @@ MultiThreaded OldStyle true + stdc17 Console @@ -339,6 +343,7 @@ false false true + stdc17 Console @@ -373,6 +378,8 @@ false false true + stdc17 + None Console @@ -408,6 +415,7 @@ OldStyle true + stdc17 Console diff --git a/minipath/minipath.vcxproj b/minipath/minipath.vcxproj index 8b53091a0..40252bc2c 100644 --- a/minipath/minipath.vcxproj +++ b/minipath/minipath.vcxproj @@ -136,6 +136,8 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false /MACHINE:I386 %(AdditionalOptions) @@ -188,7 +190,7 @@ $(IntDir) Level4 true - ProgramDatabase + None Default true @@ -201,6 +203,8 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false /MACHINE:I386 %(AdditionalOptions) @@ -267,6 +271,8 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false /MACHINE:I386 %(AdditionalOptions) @@ -334,6 +340,8 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false false @@ -378,6 +386,9 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false + None false @@ -423,6 +434,8 @@ /utf-8 %(AdditionalOptions) stdcpp17 Sync + stdc17 + false false diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index 3845d6cd8..dd46b0665 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -186,6 +186,7 @@ true false true + stdc17 true @@ -213,6 +214,7 @@ false true + stdc17 MachineX64 @@ -247,6 +249,7 @@ true false true + stdc17 true @@ -278,6 +281,7 @@ Default false true + stdc17 true @@ -311,6 +315,7 @@ true false true + stdc17 @@ -340,6 +345,7 @@ false true + stdc17 MachineX64 diff --git a/scintilla/oniguruma/doc/CHANGES_7.0 b/scintilla/oniguruma/doc/CHANGES_7.0 new file mode 100644 index 000000000..0047571a5 --- /dev/null +++ b/scintilla/oniguruma/doc/CHANGES_7.0 @@ -0,0 +1,65 @@ +CHANGES_7.0 2021/05/17 + +The changes from 6.9 to 7.0 are shown below. + +* Already changed + + + Defined the OnigPos type (== ptrdiff_t). + + + Changed the return value of onig_search(), onig_search_with_param(), onig_match() and onig_match_with_param() from int to OnigPos. + + + Changed the argument value of onig_regset_search(), onig_regset_search_with_param() and onig_error_code_to_str() from int to OnigPos. + + + POSIX API: Changed the regoff_t type from int to OnigPos + + + Move the definition of OnigEncodingType structure from oniguruma.h to regenc.h + + + Removed from oniguruma.h + ONIGENC_IS_MBC_WORD_ASCII() + ONIGENC_MBC_CASE_FOLD() + ONIGENC_LEFT_ADJUST_CHAR_HEAD() + ONIGENC_IS_VALID_MBC_STRING() + ONIGENC_APPLY_ALL_CASE_FOLD() + ONIGENC_GET_CASE_FOLD_CODES_BY_STR() + ONIGENC_STEP_BACK() + ONIGENC_MBC_ENC_LEN() + ONIGENC_MBC_MAXLEN_DIST() + ONIGENC_PROPERTY_NAME_TO_CTYPE() + ONIGENC_GET_CTYPE_CODE_RANGE() + + + change macro to function in oniguruma.h + onig_enc_len() -> onig_enc_len() + ONIGENC_IS_UNDEF() -> onigenc_is_undef() + ONIGENC_IS_SINGLEBYTE() -> onigenc_is_singlebyte() + ONIGENC_IS_MBC_HEAD() -> onigenc_is_mbc_head() + ONIGENC_IS_MBC_ASCII() -> onigenc_is_mbc_ascii() + ONIGENC_IS_CODE_ASCII() -> onigenc_is_code_ascii() + ONIGENC_IS_MBC_WORD() -> onigenc_is_mbc_word() + ONIGENC_NAME() -> onigenc_name() + ONIGENC_IS_ALLOWED_REVERSE_MATCH() -> onigenc_is_allowed_reverse_match() + ONIGENC_MBC_MAXLEN() -> onigenc_mbc_maxlen() + ONIGENC_MBC_MINLEN() -> onigenc_mbc_minlen() + ONIGENC_IS_MBC_NEWLINE() -> onigenc_is_mbc_newline() + ONIGENC_MBC_TO_CODE() -> onigenc_mbc_to_code() + ONIGENC_CODE_TO_MBCLEN() -> onigenc_code_to_mbclen() + ONIGENC_CODE_TO_MBC() -> onigenc_code_to_mbc() + ONIGENC_IS_CODE_CTYPE() -> onigenc_is_code_ctype() + + +* Will change + + + Increase the size of the ONIG_SYN_OP/OP2_XXX flag area. + + Improve the API of syntax-op. + (Eliminate the distinction between OP and OP2) + + Eliminate deprecated functions. + + update LTVERSION + + +* To Be Determined + + + Remove UChar from the oniguruma.h + + Disable Capture History (?@..) by default. (USE_CAPTURE_HISTORY) + + Disable Callout (*name..) (?{...}) by default. (USE_CALLOUT) + + +//END diff --git a/scintilla/oniguruma/src/oniguruma.h b/scintilla/oniguruma/src/oniguruma.h index 5a9a68366..36fb25789 100644 --- a/scintilla/oniguruma/src/oniguruma.h +++ b/scintilla/oniguruma/src/oniguruma.h @@ -133,30 +133,9 @@ typedef struct { typedef int (*OnigApplyAllCaseFoldFunc)(OnigCodePoint from, OnigCodePoint* to, int to_len, void* arg); -typedef struct OnigEncodingTypeST { - int (*mbc_enc_len)(const OnigUChar* p); - const char* name; - int max_enc_len; - int min_enc_len; - int (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end); - OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end); - int (*code_to_mbclen)(OnigCodePoint code); - int (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf); - int (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to); - int (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg); - int (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[]); - int (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUChar* p, OnigUChar* end); - int (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype); - int (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[]); - OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p); - int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end); - int (*init)(void); - int (*is_initialized)(void); - int (*is_valid_mbc_string)(const OnigUChar* s, const OnigUChar* end); - unsigned int flag; - OnigCodePoint sb_range; - int index; -} OnigEncodingType; +struct OnigEncodingTypeST; + +typedef struct OnigEncodingTypeST OnigEncodingType; typedef OnigEncodingType* OnigEncoding; @@ -266,84 +245,70 @@ typedef enum { #define ONIGENC_MAX_STD_CTYPE ONIGENC_CTYPE_ASCII - -#define onig_enc_len(enc,p,end) ONIGENC_MBC_ENC_LEN(enc,p) - -#define ONIGENC_IS_UNDEF(enc) ((enc) == ONIG_ENCODING_UNDEF) -#define ONIGENC_IS_SINGLEBYTE(enc) (ONIGENC_MBC_MAXLEN(enc) == 1) -#define ONIGENC_IS_MBC_HEAD(enc,p) (ONIGENC_MBC_ENC_LEN(enc,p) != 1) -#define ONIGENC_IS_MBC_ASCII(p) (*(p) < 128) -#define ONIGENC_IS_CODE_ASCII(code) ((code) < 128) -#define ONIGENC_IS_MBC_WORD(enc,s,end) \ - ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end)) -#define ONIGENC_IS_MBC_WORD_ASCII(enc,s,end) onigenc_is_mbc_word_ascii(enc,s,end) - -#define ONIGENC_NAME(enc) ((enc)->name) - -#define ONIGENC_MBC_CASE_FOLD(enc,flag,pp,end,buf) \ - (enc)->mbc_case_fold(flag,(const OnigUChar** )pp,end,buf) -#define ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc,s,end) \ - (enc)->is_allowed_reverse_match(s,end) -#define ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc,start,s) \ - (enc)->left_adjust_char_head(start, s) -#define ONIGENC_IS_VALID_MBC_STRING(enc,s,end) \ - (enc)->is_valid_mbc_string(s,end) -#define ONIGENC_APPLY_ALL_CASE_FOLD(enc,case_fold_flag,f,arg) \ - (enc)->apply_all_case_fold(case_fold_flag,f,arg) -#define ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc,case_fold_flag,p,end,acs) \ - (enc)->get_case_fold_codes_by_str(case_fold_flag,p,end,acs) -#define ONIGENC_STEP_BACK(enc,start,s,n) \ - onigenc_step_back((enc),(start),(s),(n)) - -#define ONIGENC_MBC_ENC_LEN(enc,p) (enc)->mbc_enc_len(p) -#define ONIGENC_MBC_MAXLEN(enc) ((enc)->max_enc_len) -#define ONIGENC_MBC_MAXLEN_DIST(enc) ONIGENC_MBC_MAXLEN(enc) -#define ONIGENC_MBC_MINLEN(enc) ((enc)->min_enc_len) -#define ONIGENC_IS_MBC_NEWLINE(enc,p,end) (enc)->is_mbc_newline((p),(end)) -#define ONIGENC_MBC_TO_CODE(enc,p,end) (enc)->mbc_to_code((p),(end)) -#define ONIGENC_CODE_TO_MBCLEN(enc,code) (enc)->code_to_mbclen(code) -#define ONIGENC_CODE_TO_MBC(enc,code,buf) (enc)->code_to_mbc(code,buf) -#define ONIGENC_PROPERTY_NAME_TO_CTYPE(enc,p,end) \ - (enc)->property_name_to_ctype(enc,p,end) - -#define ONIGENC_IS_CODE_CTYPE(enc,code,ctype) (enc)->is_code_ctype(code,ctype) - #define ONIGENC_IS_CODE_NEWLINE(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_NEWLINE) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_NEWLINE) #define ONIGENC_IS_CODE_GRAPH(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_GRAPH) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_GRAPH) #define ONIGENC_IS_CODE_PRINT(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PRINT) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_PRINT) #define ONIGENC_IS_CODE_ALNUM(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALNUM) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_ALNUM) #define ONIGENC_IS_CODE_ALPHA(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_ALPHA) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_ALPHA) #define ONIGENC_IS_CODE_LOWER(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_LOWER) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_LOWER) #define ONIGENC_IS_CODE_UPPER(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_UPPER) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_UPPER) #define ONIGENC_IS_CODE_CNTRL(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_CNTRL) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_CNTRL) #define ONIGENC_IS_CODE_PUNCT(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_PUNCT) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_PUNCT) #define ONIGENC_IS_CODE_SPACE(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_SPACE) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_SPACE) #define ONIGENC_IS_CODE_BLANK(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_BLANK) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_BLANK) #define ONIGENC_IS_CODE_DIGIT(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_DIGIT) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_DIGIT) #define ONIGENC_IS_CODE_XDIGIT(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_XDIGIT) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_XDIGIT) #define ONIGENC_IS_CODE_WORD(enc,code) \ - ONIGENC_IS_CODE_CTYPE(enc,code,ONIGENC_CTYPE_WORD) - -#define ONIGENC_GET_CTYPE_CODE_RANGE(enc,ctype,sbout,ranges) \ - (enc)->get_ctype_code_range(ctype,sbout,ranges) + onigenc_is_code_ctype(enc,code,ONIGENC_CTYPE_WORD) +ONIG_EXTERN +int onig_enc_len P_((OnigEncoding enc, const OnigUChar* p, const OnigUChar* end)); +ONIG_EXTERN +int onigenc_is_undef P_((OnigEncoding enc)); +ONIG_EXTERN +int onigenc_is_singlebyte P_((OnigEncoding enc)); +ONIG_EXTERN +int onigenc_is_mbc_head P_((OnigEncoding enc, OnigUChar* p)); +ONIG_EXTERN +int onigenc_is_mbc_ascii P_((OnigUChar* p)); +ONIG_EXTERN +int onigenc_is_code_ascii P_((OnigCodePoint code)); +ONIG_EXTERN +int onigenc_is_mbc_word P_((OnigEncoding enc, OnigUChar* s, OnigUChar* end)); +ONIG_EXTERN +const char* onigenc_name P_((OnigEncoding enc)); +ONIG_EXTERN +int onigenc_is_allowed_reverse_match P_((OnigEncoding enc, OnigUChar* s, OnigUChar* end)); +ONIG_EXTERN +int onigenc_mbc_maxlen P_((OnigEncoding enc)); +ONIG_EXTERN +int onigenc_mbc_minlen P_((OnigEncoding enc)); +ONIG_EXTERN +int onigenc_is_mbc_newline P_((OnigEncoding enc, OnigUChar* p, OnigUChar* end)); +ONIG_EXTERN +OnigCodePoint onigenc_mbc_to_code P_((OnigEncoding enc, OnigUChar* p, OnigUChar* end)); +ONIG_EXTERN +int onigenc_code_to_mbclen P_((OnigEncoding enc, OnigCodePoint code)); +ONIG_EXTERN +int onigenc_code_to_mbc P_((OnigEncoding enc, OnigCodePoint code, OnigUChar buf[])); +ONIG_EXTERN +int onigenc_is_code_ctype P_((OnigEncoding enc, OnigCodePoint code, int ctype)); ONIG_EXTERN OnigUChar* onigenc_step_back P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, int n)); - /* encoding API */ ONIG_EXTERN int onigenc_init P_((void)); diff --git a/scintilla/oniguruma/src/regcomp.c b/scintilla/oniguruma/src/regcomp.c index 921a05270..9fe74c791 100644 --- a/scintilla/oniguruma/src/regcomp.c +++ b/scintilla/oniguruma/src/regcomp.c @@ -6468,7 +6468,7 @@ node_max_byte_len(Node* node, ParseEnv* env) case NODE_CTYPE: case NODE_CCLASS: - len = ONIGENC_MBC_MAXLEN_DIST(env->enc); + len = ONIGENC_MBC_MAXLEN(env->enc); break; case NODE_BACKREF: @@ -6640,7 +6640,7 @@ optimize_nodes(Node* node, OptNode* opt, OptEnv* env) if (IS_NOT_NULL(cc->mbuf) || IS_NCCLASS_NOT(cc)) { OnigLen min = ONIGENC_MBC_MINLEN(enc); - OnigLen max = ONIGENC_MBC_MAXLEN_DIST(enc); + OnigLen max = ONIGENC_MBC_MAXLEN(enc); mml_set_min_max(&opt->len, min, max); } @@ -6661,7 +6661,7 @@ optimize_nodes(Node* node, OptNode* opt, OptEnv* env) int min, max; int range; - max = ONIGENC_MBC_MAXLEN_DIST(enc); + max = ONIGENC_MBC_MAXLEN(enc); if (max == 1) { min = 1; @@ -7218,7 +7218,7 @@ print_optimize_info(FILE* f, regex_t* reg) ONIGENC_IS_CODE_PRINT(reg->enc, (OnigCodePoint )i)) fputc(i, f); else - fprintf(f, "%d", i); + fprintf(f, "0x%02x", i); } } fprintf(f, "]\n"); @@ -8165,9 +8165,22 @@ onig_detect_can_be_slow_pattern(const UChar* pattern, + count.backref + count.backref_with_level + count.call + count.anychar_reluctant_many; if (count.heavy_element != 0) - n += count.heavy_element * 10; + n += count.heavy_element << 8; r = n; + +#ifdef ONIG_DEBUG_PARSE + fprintf(DBGFP, "-- detect can be slow --\n"); + fprintf(DBGFP, " prec_read: %d\n", count.prec_read); + fprintf(DBGFP, " look_behind: %d\n", count.look_behind); + fprintf(DBGFP, " backref: %d\n", count.backref); + fprintf(DBGFP, " backref_with_level: %d\n", count.backref_with_level); + fprintf(DBGFP, " call: %d\n", count.call); + fprintf(DBGFP, " any_reluctant_many: %d\n", count.anychar_reluctant_many); + fprintf(DBGFP, " heavy_element: %d\n", count.heavy_element); + fprintf(DBGFP, " r: %d\n", r); + fprintf(DBGFP, "\n"); +#endif } if (IS_NOT_NULL(scan_env.mem_env_dynamic)) diff --git a/scintilla/oniguruma/src/regenc.c b/scintilla/oniguruma/src/regenc.c index a5d9f2a13..803c43e1d 100644 --- a/scintilla/oniguruma/src/regenc.c +++ b/scintilla/oniguruma/src/regenc.c @@ -2,7 +2,7 @@ regenc.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2020 K.Kosako + * Copyright (c) 2002-2021 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -132,6 +132,108 @@ onig_initialize_encoding(OnigEncoding enc) return 0; } +extern int +onig_enc_len(OnigEncoding enc, const UChar* p, const UChar* end) +{ + return ONIGENC_MBC_ENC_LEN(enc, p); +} + +extern int +onigenc_is_undef(OnigEncoding enc) +{ + return ONIGENC_IS_UNDEF(enc); +} + +extern int +onigenc_is_singlebyte(OnigEncoding enc) +{ + return ONIGENC_IS_SINGLEBYTE(enc); +} + +extern int +onigenc_is_mbc_head(OnigEncoding enc, UChar* p) +{ + return ONIGENC_IS_MBC_HEAD(enc, p); +} + +extern int +onigenc_is_mbc_ascii(UChar* p) +{ + return ONIGENC_IS_MBC_ASCII(p); +} + +extern int +onigenc_is_code_ascii(OnigCodePoint code) +{ + return ONIGENC_IS_CODE_ASCII(code); +} + +extern int +onigenc_is_mbc_word(OnigEncoding enc, UChar* s, UChar* end) +{ + return ONIGENC_IS_MBC_WORD(enc, s, end); +} + +extern const char* +onigenc_name(OnigEncoding enc) +{ + return ONIGENC_NAME(enc); +} + +extern int +onigenc_is_allowed_reverse_match(OnigEncoding enc, UChar* s, UChar* end) +{ + return ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc, s, end); +} + +extern int +onigenc_mbc_maxlen(OnigEncoding enc) +{ + return ONIGENC_MBC_MAXLEN(enc); +} + +extern int +onigenc_mbc_minlen(OnigEncoding enc) +{ + return ONIGENC_MBC_MINLEN(enc); +} + +extern int +onigenc_is_mbc_newline(OnigEncoding enc, UChar* p, UChar* end) +{ + return ONIGENC_IS_MBC_NEWLINE(enc, p, end); +} + +extern OnigCodePoint +onigenc_mbc_to_code(OnigEncoding enc, UChar* p, UChar* end) +{ + return ONIGENC_MBC_TO_CODE(enc, p, end); +} + +extern int +onigenc_code_to_mbclen(OnigEncoding enc, OnigCodePoint code) +{ + return ONIGENC_CODE_TO_MBCLEN(enc, code); +} + +extern int +onigenc_code_to_mbc(OnigEncoding enc, OnigCodePoint code, UChar buf[]) +{ + return ONIGENC_CODE_TO_MBC(enc, code, buf); +} + +extern int +onigenc_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) +{ + return ONIGENC_PROPERTY_NAME_TO_CTYPE(enc, p, end); +} + +extern int +onigenc_is_code_ctype(OnigEncoding enc, OnigCodePoint code, int ctype) +{ + return ONIGENC_IS_CODE_CTYPE(enc, code, ctype); +} + extern OnigEncoding onigenc_get_default_encoding(void) { diff --git a/scintilla/oniguruma/src/regenc.h b/scintilla/oniguruma/src/regenc.h index c98399ebb..e2a853b3f 100644 --- a/scintilla/oniguruma/src/regenc.h +++ b/scintilla/oniguruma/src/regenc.h @@ -4,7 +4,7 @@ regenc.h - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2020 K.Kosako + * Copyright (c) 2002-2021 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -149,6 +149,69 @@ struct PropertyNameCtype { #define CASE_FOLD_IS_NOT_ASCII_ONLY(flag) \ (((flag) & ONIGENC_CASE_FOLD_ASCII_ONLY) == 0) + +typedef struct OnigEncodingTypeST { + int (*mbc_enc_len)(const OnigUChar* p); + const char* name; + int max_enc_len; + int min_enc_len; + int (*is_mbc_newline)(const OnigUChar* p, const OnigUChar* end); + OnigCodePoint (*mbc_to_code)(const OnigUChar* p, const OnigUChar* end); + int (*code_to_mbclen)(OnigCodePoint code); + int (*code_to_mbc)(OnigCodePoint code, OnigUChar *buf); + int (*mbc_case_fold)(OnigCaseFoldType flag, const OnigUChar** pp, const OnigUChar* end, OnigUChar* to); + int (*apply_all_case_fold)(OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg); + int (*get_case_fold_codes_by_str)(OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem acs[]); + int (*property_name_to_ctype)(struct OnigEncodingTypeST* enc, OnigUChar* p, OnigUChar* end); + int (*is_code_ctype)(OnigCodePoint code, OnigCtype ctype); + int (*get_ctype_code_range)(OnigCtype ctype, OnigCodePoint* sb_out, const OnigCodePoint* ranges[]); + OnigUChar* (*left_adjust_char_head)(const OnigUChar* start, const OnigUChar* p); + int (*is_allowed_reverse_match)(const OnigUChar* p, const OnigUChar* end); + int (*init)(void); + int (*is_initialized)(void); + int (*is_valid_mbc_string)(const OnigUChar* s, const OnigUChar* end); + unsigned int flag; + OnigCodePoint sb_range; + int index; +} OnigEncodingType; + +#define ONIGENC_IS_UNDEF(enc) ((enc) == ONIG_ENCODING_UNDEF) +#define ONIGENC_IS_SINGLEBYTE(enc) (ONIGENC_MBC_MAXLEN(enc) == 1) +#define ONIGENC_IS_MBC_HEAD(enc,p) (ONIGENC_MBC_ENC_LEN(enc,p) != 1) +#define ONIGENC_IS_MBC_ASCII(p) (*(p) < 128) +#define ONIGENC_IS_CODE_ASCII(code) ((code) < 128) +#define ONIGENC_IS_MBC_WORD(enc,s,end) \ + ONIGENC_IS_CODE_WORD(enc,ONIGENC_MBC_TO_CODE(enc,s,end)) +#define ONIGENC_IS_MBC_WORD_ASCII(enc,s,end) onigenc_is_mbc_word_ascii(enc,s,end) +#define ONIGENC_NAME(enc) ((enc)->name) +#define ONIGENC_MBC_CASE_FOLD(enc,flag,pp,end,buf) \ + (enc)->mbc_case_fold(flag,(const OnigUChar** )pp,end,buf) +#define ONIGENC_IS_ALLOWED_REVERSE_MATCH(enc,s,end) \ + (enc)->is_allowed_reverse_match(s,end) +#define ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc,start,s) \ + (enc)->left_adjust_char_head(start, s) +#define ONIGENC_IS_VALID_MBC_STRING(enc,s,end) \ + (enc)->is_valid_mbc_string(s,end) +#define ONIGENC_APPLY_ALL_CASE_FOLD(enc,case_fold_flag,f,arg) \ + (enc)->apply_all_case_fold(case_fold_flag,f,arg) +#define ONIGENC_GET_CASE_FOLD_CODES_BY_STR(enc,case_fold_flag,p,end,acs) \ + (enc)->get_case_fold_codes_by_str(case_fold_flag,p,end,acs) +#define ONIGENC_STEP_BACK(enc,start,s,n) \ + onigenc_step_back((enc),(start),(s),(n)) +#define ONIGENC_MBC_ENC_LEN(enc,p) (enc)->mbc_enc_len(p) +#define ONIGENC_MBC_MAXLEN(enc) ((enc)->max_enc_len) +#define ONIGENC_MBC_MINLEN(enc) ((enc)->min_enc_len) +#define ONIGENC_IS_MBC_NEWLINE(enc,p,end) (enc)->is_mbc_newline((p),(end)) +#define ONIGENC_MBC_TO_CODE(enc,p,end) (enc)->mbc_to_code((p),(end)) +#define ONIGENC_CODE_TO_MBCLEN(enc,code) (enc)->code_to_mbclen(code) +#define ONIGENC_CODE_TO_MBC(enc,code,buf) (enc)->code_to_mbc(code,buf) +#define ONIGENC_PROPERTY_NAME_TO_CTYPE(enc,p,end) \ + (enc)->property_name_to_ctype(enc,p,end) +#define ONIGENC_IS_CODE_CTYPE(enc,code,ctype) (enc)->is_code_ctype(code,ctype) +#define ONIGENC_GET_CTYPE_CODE_RANGE(enc,ctype,sbout,ranges) \ + (enc)->get_ctype_code_range(ctype,sbout,ranges) + + /* for encoding system implementation (internal) */ extern int onigenc_end(void); extern int onigenc_ascii_apply_all_case_fold P_((OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg)); diff --git a/src/DarkMode/user32-stub/user32-stub.vcxproj b/src/DarkMode/user32-stub/user32-stub.vcxproj index b8ea2d87d..35c25b6a0 100644 --- a/src/DarkMode/user32-stub/user32-stub.vcxproj +++ b/src/DarkMode/user32-stub/user32-stub.vcxproj @@ -254,6 +254,8 @@ WIN32;_DEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -267,6 +269,8 @@ WIN32;_DEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -279,6 +283,8 @@ WIN32;NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -291,6 +297,8 @@ WIN32;NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -303,6 +311,8 @@ WIN32;NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -315,6 +325,8 @@ WIN32;NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -328,6 +340,8 @@ _DEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -341,6 +355,8 @@ _DEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -353,6 +369,8 @@ NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -365,6 +383,8 @@ NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -377,6 +397,8 @@ NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -389,6 +411,8 @@ NDEBUG;USER32STUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows diff --git a/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj b/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj index b8ee01dff..ced37c4b8 100644 --- a/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj +++ b/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj @@ -254,6 +254,8 @@ WIN32;_DEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -267,6 +269,8 @@ WIN32;_DEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -279,6 +283,8 @@ WIN32;NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -291,6 +297,8 @@ WIN32;NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -303,6 +311,8 @@ WIN32;NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -315,6 +325,8 @@ WIN32;NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -328,6 +340,8 @@ _DEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -341,6 +355,8 @@ _DEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None false + stdcpp17 + stdc17 Windows @@ -353,6 +369,8 @@ NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -365,6 +383,8 @@ NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -377,6 +397,8 @@ NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows @@ -389,6 +411,8 @@ NDEBUG;UXTHEMESTUB_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) None + stdcpp17 + stdc17 Windows diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c index 1245a3c06..942aeb3b6 100644 --- a/src/MuiLanguage.c +++ b/src/MuiLanguage.c @@ -221,7 +221,7 @@ MUILANGUAGE MUI_LanguageDLLs[] = { { IDS_MUI_LANG_HU_HU, L"hu-HU", L"Magyar (Magyarország)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_ID_ID, L"id-ID", L"Bahasa Indonesia (Indonesia)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_IT_IT, L"it-IT", L"Italiano (Italia)\t\t\t[%s]", false, false }, - { IDS_MUI_LANG_JP_JP, L"ja-JP", L"日本語 （日本）\t\t\t[%s]", false, false }, + { IDS_MUI_LANG_JP_JP, L"ja-JP", L"日本語 (日本)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_KO_KR, L"ko-KR", L"한국어 (대한민국)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_NL_NL, L"nl-NL", L"Nederlands (Nederland)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_PL_PL, L"pl-PL", L"Polski (Polska)\t\t\t[%s]", false, false }, @@ -232,8 +232,8 @@ MUILANGUAGE MUI_LanguageDLLs[] = { { IDS_MUI_LANG_SV_SE, L"sv-SE", L"Svenska (Sverige)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_TR_TR, L"tr-TR", L"Türkçe (Türkiye)\t\t\t[%s]", false, false }, { IDS_MUI_LANG_VI_VN, L"vi-VN", L"Tiếng Việt (Việt Nam)\t\t\t[%s]", false, false }, - { IDS_MUI_LANG_ZH_CN, L"zh-CN", L"简体中文 （中国）\t\t\t[%s]", false, false }, - { IDS_MUI_LANG_ZH_TW, L"zh-TW", L"繁體中文 （台灣）\t\t\t[%s]", false, false } + { IDS_MUI_LANG_ZH_CN, L"zh-CN", L"简体中文 (中国)\t\t\t[%s]", false, false }, + { IDS_MUI_LANG_ZH_TW, L"zh-TW", L"繁體中文 (台灣)\t\t\t[%s]", false, false } }; //NUM_OF_MUI_LANGUAGES diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index bba4a799c..a37c1d6e4 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -169,6 +169,8 @@ false true + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) @@ -241,6 +243,8 @@ false true + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) @@ -316,6 +320,8 @@ true true false + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) @@ -394,6 +400,8 @@ false + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) @@ -474,6 +482,8 @@ true true false + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) @@ -551,6 +561,8 @@ true false + stdc17 + false ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) diff --git a/src/Version.h b/src/Version.h index 733b50aab..b886d295b 100644 --- a/src/Version.h +++ b/src/Version.h @@ -78,7 +78,7 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1928) #if (_MSC_FULL_VER >= 192829915) - #define VER_CPL MS Visual C++ 2019 v16.9.5 + #define VER_CPL MS Visual C++ 2019 v16.9.(5-6) #elif (_MSC_FULL_VER >= 192829914) #define VER_CPL MS Visual C++ 2019 v16.9.4 #elif (_MSC_FULL_VER >= 192829913)