diff --git a/Build/Changes.txt b/Build/Changes.txt index e8cc0e756..ed6521681 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -40,6 +40,7 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- +- Support Compiler version (VC v1921) 192127702 - VS2019 v16.1.(0-2) - New top-level menu "Appearance" holding Themes and Schemes stuff - Rearranging the Language and Themes menus - Rearranging the" Encoding" menu @@ -106,7 +107,6 @@ CHANGES: - Make Custom.Schemes and Find/Replace dialog resizable - BOOKMARK (margin flag) style changed to vertical flavor - Auto-Save after elevating user right -- Support Compiler version (VC v1921) 192127702 - VS2019 v16.1.(0-1) - Rework Chinese encoding (GBK,GB2312,GB18030) detection and selection - Make international language menu (language independent) - Start dual encoding detectors in (thread) parallel for large files diff --git a/Versions/build.txt b/Versions/build.txt index 137c70ae4..aa886adb3 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2239 +2244 diff --git a/crypto/crypto.c b/crypto/crypto.c index e6161a5b5..5a3883ce9 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -36,7 +36,6 @@ see ecryption-doc.txt for details #define WKEY_LEN 256 #define KEY_LEN 512 -#define PAD_SLOP 16 bool useFileKey = false; // file should be encrypted char fileKey[KEY_LEN] = { 0 }; // ascii passphrase for the file key @@ -476,7 +475,7 @@ bool EncryptAndWriteFile(HWND hwnd, HANDLE hFile, BYTE *data, DWORD size, DWORD static int sequence = 1; // sequence counter so each time is unique srand(sequence++ ^ (unsigned int)time(NULL)); { - int i; for (i = 0; i < AES_MAX_IV_SIZE; i++) { + for (int i = 0; i < AES_MAX_IV_SIZE; i++) { precodedata[PREAMBLE_SIZE + i] = 0;//rand(); } } @@ -513,7 +512,7 @@ bool EncryptAndWriteFile(HWND hwnd, HANDLE hFile, BYTE *data, DWORD size, DWORD AES_bin_setup(&masterencode, AES_DIR_ENCRYPT, KEY_BYTES * 8, binMasterKey); {// generate another IV for the master key - int i; for (i = 0; i < sizeof(masterFileIV); i++) { masterFileIV[i] = (BYTE)(rand() & BYTE_MAX); } + for (int i = 0; i < sizeof(masterFileIV); i++) { masterFileIV[i] = (BYTE)(rand() & BYTE_MAX); } } AES_bin_cipherInit(&mastercypher, AES_MODE_CBC, masterFileIV); @@ -542,10 +541,11 @@ bool EncryptAndWriteFile(HWND hwnd, HANDLE hFile, BYTE *data, DWORD size, DWORD DWORD enclen = 0; bool bWriteRes = false; - BYTE* encdata = (BYTE*)HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, size + PAD_SLOP); // add slop to the end for padding - if (!encdata) - return bWriteRes; + BYTE* encdata = (BYTE*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + PAD_SLOP); // add slop to the end for padding + if (!encdata) { + return bWriteRes; + } if (size > PAD_SLOP) { enclen += AES_blockEncrypt(&fileCypher, &fileEncode, data, size - PAD_SLOP, encdata); } enclen += AES_padEncrypt(&fileCypher, &fileEncode, data + enclen, size - enclen, encdata + enclen); diff --git a/crypto/crypto.h b/crypto/crypto.h index 6766aa6da..f53673161 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -3,13 +3,19 @@ #define __CRYPTO_H__ #include +#ifdef _DEBUG #define BUG1(a,b) { perror("a"); } #define BUG(a) { perror("a"); } +#else +#define BUG1(a,b) ((void)0); +#define BUG(a) ((void)0); +#endif -#define PREAMBLE_SIZE 8 // 4 byte signature + 4 byte subfile type -#define KEY_BYTES 32 // 32 bytes = 256 bits of key +#define PREAMBLE_SIZE 8 // 4 byte signature + 4 byte subfile type +#define PAD_SLOP 16 // padding for block chain +#define KEY_BYTES 32 // 32 bytes = 256 bits of key #define PREAMBLE 0x01020304 // first 4 bytes of the file -#define FILEKEY_FORMAT 1 // next 4 bytes determine version/format +#define FILEKEY_FORMAT 1 // next 4 bytes determine version/format #define MASTERKEY_FORMAT 2 // format with master key #define MASTER_KEY_OFFSET (PREAMBLE_SIZE+AES_MAX_IV_SIZE) #define UNUSED(expr) (void)(expr) diff --git a/crypto/rijndael-api-fst.c b/crypto/rijndael-api-fst.c index acc9df84b..96be327e1 100644 --- a/crypto/rijndael-api-fst.c +++ b/crypto/rijndael-api-fst.c @@ -96,7 +96,6 @@ int AES_setup char *keyMat; u8 cipherKey[MAXKB]; - if (TheKey != NULL) { //strncpy(key->TheKey, TheKey, keyLen/4); memcpy_s(key->TheKey, AES_MAX_KEY_SIZE, TheKey, keyLen / 4); @@ -245,8 +244,8 @@ int AES_blockEncrypt int inputLen, // @parm the size of the input data BYTE *outBuffer) //@parm a buffer to receive the encrypted data { - int i, k, t, numBlocks; - u8 block[16], *iv; + u8 block[16]; + u8* iv; if (cipher == NULL || key == NULL || @@ -257,11 +256,11 @@ int AES_blockEncrypt return 0; /* nothing to do */ } - numBlocks = inputLen / 16; + unsigned int const numBlocks = inputLen / 16; switch (cipher->mode) { case AES_MODE_ECB: - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { rijndaelEncrypt(key->rk, key->Nr, input, outBuffer); input += 16; outBuffer += 16; @@ -270,7 +269,7 @@ int AES_blockEncrypt case AES_MODE_CBC: iv = cipher->IV; - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { ((u32*)block)[0] = ((u32*)input)[0] ^ ((u32*)iv)[0]; ((u32*)block)[1] = ((u32*)input)[1] ^ ((u32*)iv)[1]; ((u32*)block)[2] = ((u32*)input)[2] ^ ((u32*)iv)[2]; @@ -287,12 +286,12 @@ int AES_blockEncrypt case AES_MODE_CFB1: iv = cipher->IV; - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { memcpy(outBuffer, input, 16); - for (k = 0; k < 128; k++) { + for (unsigned int k = 0; k < 128; k++) { rijndaelEncrypt(key->ek, key->Nr, iv, block); outBuffer[k >> 3] ^= (block[0] & 0x80U) >> (k & 7); - for (t = 0; t < 15; t++) { + for (unsigned int t = 0; t < 15; t++) { iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7); } iv[15] = (iv[15] << 1) | ((outBuffer[k >> 3] >> (7 - (k & 7))) & 1); @@ -330,8 +329,8 @@ int AES_padEncrypt int inputOctets, // @parm the size of the input data BYTE *outBuffer) //@parm a buffer to receive the encrypted data { - int i, numBlocks, padLen; - u8 block[16], *iv; + u8 block[16]; + u8* iv; if (cipher == NULL || key == NULL || @@ -342,50 +341,57 @@ int AES_padEncrypt return 0; /* nothing to do */ } - numBlocks = inputOctets / 16; + unsigned int const numBlocks = inputOctets / 16; switch (cipher->mode) { case AES_MODE_ECB: - for (i = numBlocks; i > 0; i--) { - rijndaelEncrypt(key->rk, key->Nr, input, outBuffer); - input += 16; - outBuffer += 16; - } - padLen = 16 - (inputOctets - 16 * numBlocks); - if ((padLen <= 0) || (padLen > 16)) { - BUG1("Padding must be 1-16, is %d", padLen); - } - memcpy(block, input, 16 - padLen); - memset(block + 16 - padLen, padLen, padLen); - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - break; + { + for (unsigned int i = numBlocks; i > 0; i--) { + rijndaelEncrypt(key->rk, key->Nr, input, outBuffer); + input += 16; + outBuffer += 16; + } + unsigned int const padLen = 16 - (inputOctets - 16 * numBlocks); + if ((padLen <= 0) || (padLen > 16)) { + BUG1("Padding must be 1-16, is %d", padLen); + return 16 * numBlocks; + } + memcpy(block, input, 16 - padLen); + memset(block + 16 - padLen, padLen, padLen); + rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); + } + break; case AES_MODE_CBC: - iv = cipher->IV; - for (i = numBlocks; i > 0; i--) { - ((u32*)block)[0] = ((u32*)input)[0] ^ ((u32*)iv)[0]; - ((u32*)block)[1] = ((u32*)input)[1] ^ ((u32*)iv)[1]; - ((u32*)block)[2] = ((u32*)input)[2] ^ ((u32*)iv)[2]; - ((u32*)block)[3] = ((u32*)input)[3] ^ ((u32*)iv)[3]; - rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - iv = outBuffer; - input += 16; - outBuffer += 16; - } - padLen = 16 - (inputOctets - 16 * numBlocks); - if ((padLen <= 0) || (padLen > 16)) { - BUG1("Padding must be 1-16, is %d", padLen); - } - for (i = 0; i < 16 - padLen; i++) { - block[i] = input[i] ^ iv[i]; - } - for (i = 16 - padLen; (0 <= i) && (i < 16); i++) { - block[i] = (BYTE)padLen ^ iv[i]; - } + { + iv = cipher->IV; + for (unsigned int i = numBlocks; i > 0; i--) { + ((u32*)block)[0] = ((u32*)input)[0] ^ ((u32*)iv)[0]; + ((u32*)block)[1] = ((u32*)input)[1] ^ ((u32*)iv)[1]; + ((u32*)block)[2] = ((u32*)input)[2] ^ ((u32*)iv)[2]; + ((u32*)block)[3] = ((u32*)input)[3] ^ ((u32*)iv)[3]; rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); - // set for chaining to the next block, even though there will normally not be one - memcpy(cipher->IV, outBuffer, AES_MAX_IV_SIZE); - break; + iv = outBuffer; + input += 16; + outBuffer += 16; + } + unsigned int const padLen = 16 - (inputOctets - 16 * numBlocks); + if ((padLen <= 0) || (padLen > 16)) { + BUG1("Padding must be 1-16, is %d", padLen); + return 16 * numBlocks; + } + for (unsigned int i = 0; i < 16 - padLen; i++) { + block[i] = input[i] ^ iv[i]; + } + BYTE const plen = (BYTE)(padLen & 0xFF); + for (unsigned int i = 16 - padLen; (i < 16); i++) { + block[i] = plen ^ iv[i]; + } + rijndaelEncrypt(key->rk, key->Nr, block, outBuffer); + // set for chaining to the next block, even though there will normally not be one + memcpy(cipher->IV, outBuffer, AES_MAX_IV_SIZE); + } + break; default: return BAD_CIPHER_STATE; @@ -409,8 +415,8 @@ int AES_blockDecrypt BYTE *outBuffer) //@parm a buffer to receive the decrypted buffer { //int lim = 32; - int i, k, t, numBlocks; - u8 block[16], *iv; + u8 block[16]; + u8* iv; if (cipher == NULL || key == NULL || @@ -421,11 +427,11 @@ int AES_blockDecrypt return 0; /* nothing to do */ } - numBlocks = inputLen / 16; + unsigned int const numBlocks = inputLen / 16; switch (cipher->mode) { case AES_MODE_ECB: - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { rijndaelDecrypt(key->rk, key->Nr, input, outBuffer); input += 16; outBuffer += 16; @@ -434,7 +440,7 @@ int AES_blockDecrypt case AES_MODE_CBC: iv = cipher->IV; - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { rijndaelDecrypt(key->rk, key->Nr, input, block); ((u32*)block)[0] ^= ((u32*)iv)[0]; ((u32*)block)[1] ^= ((u32*)iv)[1]; @@ -449,11 +455,11 @@ int AES_blockDecrypt case AES_MODE_CFB1: iv = cipher->IV; - for (i = numBlocks; i > 0; i--) { + for (unsigned int i = numBlocks; i > 0; i--) { memcpy(outBuffer, input, 16); - for (k = 0; k < 128; k++) { + for (unsigned int k = 0; k < 128; k++) { rijndaelEncrypt(key->ek, key->Nr, iv, block); - for (t = 0; t < 15; t++) { + for (unsigned int t = 0; t < 15; t++) { iv[t] = (iv[t] << 1) | (iv[t + 1] >> 7); } iv[15] = (iv[15] << 1) | ((input[k >> 3] >> (7 - (k & 7))) & 1); @@ -487,8 +493,8 @@ int AES_padDecrypt int inputOctets, //@parm the size of the input BYTE *outBuffer) //@parm a buffer to receive the decrypted buffer { - int i, numBlocks, padLen; u8 block[16]; + unsigned int padLen; if (cipher == NULL || key == NULL || @@ -502,12 +508,12 @@ int AES_padDecrypt return BAD_DATA; } - numBlocks = inputOctets / 16; + unsigned int const numBlocks = inputOctets / 16; switch (cipher->mode) { case AES_MODE_ECB: /* all blocks but last */ - for (i = numBlocks - 1; i > 0; i--) { + for (unsigned int i = numBlocks - 1; i > 0; i--) { rijndaelDecrypt(key->rk, key->Nr, input, outBuffer); input += 16; outBuffer += 16; @@ -518,7 +524,7 @@ int AES_padDecrypt if (padLen >= 16) { return BAD_DATA; } - for (i = 16 - padLen; i < 16; i++) { + for (unsigned int i = 16 - padLen; i < 16; i++) { if (block[i] != padLen) { return BAD_DATA; } @@ -528,7 +534,7 @@ int AES_padDecrypt case AES_MODE_CBC: /* all blocks but last */ - for (i = numBlocks - 1; i > 0; i--) { + for (unsigned int i = numBlocks - 1; i > 0; i--) { rijndaelDecrypt(key->rk, key->Nr, input, block); ((u32*)block)[0] ^= ((u32*)cipher->IV)[0]; ((u32*)block)[1] ^= ((u32*)cipher->IV)[1]; @@ -550,7 +556,7 @@ int AES_padDecrypt if (padLen <= 0 || padLen > 16) { return BAD_DATA; } - for (i = 16 - padLen; i < 16; i++) { + for (unsigned int i = 16 - padLen; i < 16; i++) { if (block[i] != padLen) { return BAD_DATA; } diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index e97c3d6cc..c80bb4c57 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Hercodeer na &Standaard\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Hercodeer na &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Hercodeer na &Standaard\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Hercodeer na &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Hercodeer na &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Hercodeer na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Hercodeer na UCHARDET-analise", CMD_RELOADFORCEDETECTION diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index c0da17f8c..7396e82d3 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 ç BO&M", IDM_ENCODING_UTF8SIGN MENUITEM "ß&ř÷ý...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Ďĺđŕŕäęđűöü ó ďđŕäâűçíŕ÷ŕíŕé ęŕ&äî˘öű\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Ďĺđŕŕäęđűöü ó A&NSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Ďĺđŕŕäęđűöü ó ďđŕäâűçíŕ÷ŕíŕé ęŕ&äî˘öű\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Ďĺđŕŕäęđűöü ó A&NSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Ďĺđŕŕäęđűöü ó &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Ďĺđŕŕäęđűöü ó &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Ďĺđŕŕäęđűöü ç &UCHARDET ŕíŕëłçŕě", CMD_RELOADFORCEDETECTION diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 060909b7e..794e319c8 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 mit &Signatur", IDM_ENCODING_UTF8SIGN MENUITEM "&Mehr Codierungen...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Recodiere als &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recodiere als &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recodiere als &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Recodiere als &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Recodiere als &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recodiere als &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Recodiere wie UCHARDET Analyse", CMD_RELOADFORCEDETECTION diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 56d3b4c4e..24fe6eb96 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION @@ -310,7 +310,7 @@ BEGIN MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME END - POPUP "Mar&k Occurrences" + POPUP "Mark &Occurrences" BEGIN MENUITEM "&Active\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF MENUITEM SEPARATOR @@ -337,7 +337,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "T&oolbar" + POPUP "&Toolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 54c32e58e..317468e11 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION @@ -310,7 +310,7 @@ BEGIN MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME END - POPUP "Mar&k Occurrences" + POPUP "Mark &Occurrences" BEGIN MENUITEM "&Active\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF MENUITEM SEPARATOR @@ -337,7 +337,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "T&oolbar" + POPUP "&Toolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 936568887..be246fd5c 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 con &signatura", IDM_ENCODING_UTF8SIGN MENUITEM "&Más...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Recodificar a &Defecto\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recodificar a &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recodificar a &Defecto\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Recodificar a &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Recodificar a &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recodificar a &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Recodificar a análisis UCHARDET", CMD_RELOADFORCEDETECTION diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index f67032efb..47ee8079f 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 avec &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Plus...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Réencoder vers &Défaut\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Réencoder vers &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Réencoder vers &Défaut\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Réencoder vers &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Réencoder vers &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Réencoder vers &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Réencoder vers analyse UCHARDET", CMD_RELOADFORCEDETECTION diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index 08a7a0c16..d4a33a66b 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -84,19 +84,19 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS CAPTION "Keresés" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Szöve&g keresése:",IDC_STATIC,7,7,46,8 + LTEXT "Szöve&g keresése:",IDC_STATIC,7,7,66,8 COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "&Kisbetű/nagybetű számít",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10 + CONTROL "&Kisbetű/nagybetű számít",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,89,10 CONTROL "E&gész szavakra egyezés",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10 - CONTROL "Szó ele&jére egyezés",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 - CONTROL "&Visszaperjel átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,85,10 - CONTROL "R&eguláris kifejezéssel",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 - CONTROL "Pont &mindenre egyezik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,65,10 + CONTROL "Szókez&detre egyezés",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 + CONTROL "&Visszaperjel átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,89,10 + CONTROL "R&eguláris kifejezés keresése",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,97,10 + CONTROL "Pont &mindenre egyezik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,85,10 CONTROL "&Ne menjen körbe",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 - CONTROL "Ta&lálat után bezárás",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,65,10 - CONTROL "Találat&ok jelölése",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,73,10 + CONTROL "Cseré&lés után bezár",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,80,10 + CONTROL "Elő&fordulások jelölése",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,75,10 CONTROL "&Joker kar. keresés",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,63,10 - CONTROL "Átlátszó mód, ha nincs fókuszban ",IDC_TRANSPARENT, + CONTROL "Átlátszó mód, ha nincs fókuszban",IDC_TRANSPARENT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,118,124,10 DEFPUSHBUTTON "&Köv. keresése",IDOK,211,7,55,14 PUSHBUTTON "&Előző keresése",IDC_FINDPREV,211,24,55,14 @@ -116,31 +116,31 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS CAPTION "Szöveg cseréje" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Keresési szöve&g:",IDC_STATIC,7,7,46,8 + LTEXT "Keresési szöve&g:",IDC_STATIC,7,7,66,8 COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Cserélés &erre:",IDC_STATIC,7,36,44,8 COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "Kis/nagybetű eg&yezés",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,53,10 + CONTROL "Kisbetű/nagybetű számít",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,89,10 CONTROL "Egés&z szavakra egyezés",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10 CONTROL "Szókez&detre egyezés",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 - CONTROL "&Backslash-ek átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 + CONTROL "&Visszaperjel átalakítása",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 CONTROL "R&eguláris kifejezés keresése",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10 - CONTROL "Pont &mindenre illeszkedik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10 - CONTROL "Ne keressen kör&ben",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 - CONTROL "Cseré&lés után bezár",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,77,10 - CONTROL "Találat&ok kiemelése",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,73,10 - CONTROL "&Joker karakteres keresés",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,63,10 - CONTROL "Fókuszvesztéskor átlátszó",IDC_TRANSPARENT, + CONTROL "Pont &mindenre egyezik",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,85,10 + CONTROL "&Ne menjen körbe",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 + CONTROL "Cseré&lés után bezár",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,80,10 + CONTROL "Elő&fordulások jelölése",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,75,10 + CONTROL "&Joker kar. keresés",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,63,10 + CONTROL "Átlátszó mód, ha nincs fókuszban",IDC_TRANSPARENT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,144,124,10 DEFPUSHBUTTON "K&öv. keresése",IDOK,211,7,55,14 PUSHBUTTON "Előző keresése",IDC_FINDPREV,211,23,55,14 PUSHBUTTON "&Csere",IDC_REPLACE,211,43,55,14 - PUSHBUTTON "C&sak a kijelölésben",IDC_REPLACEINSEL,211,59,55,14 + PUSHBUTTON "A &kijelölésben",IDC_REPLACEINSEL,211,59,55,14 PUSHBUTTON "&Összes cseréje",IDC_REPLACEALL,211,75,55,14 PUSHBUTTON "Felcserélés",IDC_SWAPSTRG,150,32,49,12 PUSHBUTTON "Bezárás",IDCANCEL,211,126,55,14 CONTROL "Ugrás a keresésre (Ctrl+F)",IDC_TOGGLEFINDREPLACE, - "SysLink",0x0,125,130,74,10 + "SysLink",0x0,125,130,84,10 CONTROL "(?)",IDC_BACKSLASHHELP,"SysLink",0x0,107,102,14,10 CONTROL "(?)",IDC_REGEXPHELP,"SysLink",0x0,107,114,14,10 CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 @@ -186,13 +186,13 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,38,155,10 GROUPBOX "Kódolás detektálás: ",IDC_STATIC,7,58,183,88,0,WS_EX_TRANSPARENT CONTROL "Nyissa meg a 7-bit &ASCII fájlokat UTF-8 módban.",IDC_ASCIIASUTF8, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,136,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,70,160,10 CONTROL "Csak megbízható detektálási e&redmények használata.",IDC_RELIABLE_DETECTION_RES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,122,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,82,170,10 CONTROL "A 8-bit *.&nfo/diz fájlok megnyitása DOS-437 módban.",IDC_NFOASOEM, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,155,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,94,170,10 CONTROL "Ne dolgozza fel a kódolási f&ájlok címkéit.",IDC_ENCODINGFROMFILEVARS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,126,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,155,10 CONTROL "&ANSI kódlap detektálás kihagyása.",IDC_NOANSICPDETECTION, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,118,122,10 CONTROL "&UNICODE detektálás kihagyása.",IDC_NOUNICODEDETECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,130,122,10 @@ -222,13 +222,13 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Inkonzisztens sorvégek" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Inkonzisztens sorvégek vannak e fájlban::",IDC_STATIC,7,7,180,8 + LTEXT "Inkonzisztens sorvégek vannak e fájlban:",IDC_STATIC,7,7,180,8 LTEXT "CR+LF:",IDC_STATIC,10,18,34,8,SS_RIGHT LTEXT "CR:",IDC_STATIC,10,28,34,8,SS_RIGHT LTEXT "LF:",IDC_STATIC,10,38,34,8,SS_RIGHT - LTEXT "%s line(s).",IDC_EOL_SUM_CRLF,48,18,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_CR,48,28,136,8 - LTEXT "%s line(s).",IDC_EOL_SUM_LF,48,38,136,8 + LTEXT "%s sor(ok).",IDC_EOL_SUM_CRLF,48,18,136,8 + LTEXT "%s sor(ok).",IDC_EOL_SUM_CR,48,28,136,8 + LTEXT "%s sor(ok).",IDC_EOL_SUM_LF,48,38,136,8 LTEXT "&Szeretné rendbetenni a sorvégeket?",IDC_STATIC,7,52,180,8 COMBOBOX IDC_EOLMODELIST,7,64,118,81,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "I&gen",IDOK,138,63,50,14 @@ -257,7 +257,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,255,97 CONTROL "K&urzor helye megmarad.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,96,10 - CONTROL "&Fájl előzménylista mentése kilépéskor.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10 + CONTROL "&Fájl előzménylista mentése kilépéskor.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,125,10 CONTROL "&Keresési minta megjegyzése.",IDC_REMEMBERSEARCHPATTERN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,96,10 PUSHBUTTON "Kihagyás",IDC_REMOVE,212,107,50,14,WS_DISABLED @@ -266,17 +266,17 @@ BEGIN SCROLLBAR IDC_RESIZEGRIP,7,143,10,10 END -IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65 +IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 194, 65 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Értesítés fájl módosulásáról" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "&Nincs.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10 - CONTROL "&Üzenet megjelenítése.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10 - CONTROL "&Automatikus újratöltés (módosítatlan).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10 - CONTROL "&Újrakezdés, ha új fájl lett megnyitva.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10 - DEFPUSHBUTTON "OK",IDOK,127,7,50,14 - PUSHBUTTON "Mégsem",IDCANCEL,127,24,50,14 + CONTROL "&Üzenet megjelenítése.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,80,10 + CONTROL "&Automatikus újratöltés (módosítatlan).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,125,10 + CONTROL "&Újrakezdés, ha új fájl lett megnyitva.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,120,10 + DEFPUSHBUTTON "OK",IDOK,137,7,50,14 + PUSHBUTTON "Mégsem",IDCANCEL,137,24,50,14 END IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 @@ -286,7 +286,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 CONTROL "E színkiemelés beállítás &alapértelmezetté.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,135,10 CONTROL "Fájlnév &kit. alapján automatikusan.",IDC_AUTOSELECT, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED @@ -327,10 +327,10 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Tabulátor beállítások" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Tabulátor szélesség:",IDC_STATIC,7,10,54,8 - EDITTEXT IDC_TAB_WIDTH,67,7,30,14,ES_AUTOHSCROLL - LTEXT "&Behúzás mérete:",IDC_STATIC,7,30,55,8 - EDITTEXT IDC_INDENT_DEPTH,67,27,30,14,ES_AUTOHSCROLL + LTEXT "&Tabulátor szélesség:",IDC_STATIC,7,10,60,8 + EDITTEXT IDC_TAB_WIDTH,70,7,30,14,ES_AUTOHSCROLL + LTEXT "&Behúzás mérete:",IDC_STATIC,7,30,60,8 + EDITTEXT IDC_INDENT_DEPTH,70,27,30,14,ES_AUTOHSCROLL CONTROL "&Szóközök Tab helyett.",IDC_TAB_AS_SPC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,47,150,10 CONTROL "Tab &gomb újraformázza a behúzásokat.",IDC_TAB_INDENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,150,10 CONTROL "&Backspace újraformázza a behúzásokat.",IDC_BACKTAB_INDENTS, @@ -349,17 +349,17 @@ CAPTION "Inkonzisztens beh FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Statistika: ",IDC_STATIC,7,7,182,48,WS_GROUP - LTEXT "Tabulátorok[%i]:",IDC_INDENT_WIDTH_TAB,54,18,30,8,SS_LEFT - LTEXT "Üres karakterek[%i]:",IDC_INDENT_WIDTH_SPC,54,30,30,8,SS_LEFT - LTEXT "Vegyes[x]:",IDC_STATIC,54,42,30,8,SS_LEFT - LTEXT "%s sor",IDC_INDENT_SUM_SPC,84,30,52,8,SS_RIGHT - LTEXT "%s sor",IDC_INDENT_SUM_TAB,84,18,52,8,SS_RIGHT - LTEXT "%s sor",IDC_INDENT_SUM_MIX,84,42,52,8,SS_RIGHT + LTEXT "Tabulátorok[%i]:",IDC_INDENT_WIDTH_TAB,34,18,50,8,SS_LEFT + LTEXT "Üres karakterek[%i]:",IDC_INDENT_WIDTH_SPC,34,30,60,8,SS_LEFT + LTEXT "Vegyes[x]:",IDC_STATIC,34,42,30,8,SS_LEFT + LTEXT "%s sor(ok)",IDC_INDENT_SUM_SPC,104,30,52,8,SS_RIGHT + LTEXT "%s sor(ok)",IDC_INDENT_SUM_TAB,104,18,52,8,SS_RIGHT + LTEXT "%s sor(ok)",IDC_INDENT_SUM_MIX,104,42,52,8,SS_RIGHT GROUPBOX "Minden újrarendezése ? ",IDC_STATIC,7,60,182,56,WS_GROUP - CONTROL "&Tab-ok",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,25,10 - CONTROL "&Üres karakterek",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,25,10 - LTEXT "%s sor helytelen behúzással",IDC_INDENT_TAB_MODX,40,72,124,8,SS_RIGHT - LTEXT "%s sorIgenlytelen behúzással",IDC_INDENT_SPC_MODX,40,84,124,8,SS_RIGHT + CONTROL "&Tab-ok",IDC_INDENT_BY_TABS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,72,35,10 + CONTROL "&Üres karakt.",IDC_INDENT_BY_SPCS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,84,44,10 + LTEXT "%s sor(ok) helytelen behúzással",IDC_INDENT_TAB_MODX,60,72,124,8,SS_RIGHT + LTEXT "%s sor(ok) helytelen behúzással",IDC_INDENT_SPC_MODX,60,84,124,8,SS_RIGHT PUSHBUTTON "&Igen",IDOK,80,98,50,14 PUSHBUTTON "&Nem",IDCANCEL,134,98,50,14 CONTROL "&Ez az ablak mindig megjelenik.", IDC_WARN_INCONSISTENT_INDENTS, @@ -471,14 +471,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,245,98,50,14 PUSHBUTTON "Mégsem",IDCANCEL,184,98,50,14 - CONTROL "Új mester kulcs megadása",IDC_PWD_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,60,84,10 + CONTROL "Új mester kulcs megadása",IDC_PWD_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,60,95,10 EDITTEXT IDC_PWD_EDIT1,17,35,276,12,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_PWD_EDIT2,17,74,277,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "Nem kötelező mester kulcs:",IDC_STATIC,17,61,72,10,NOT WS_GROUP - CONTROL "Kódolás jelmondat segítségével",IDC_PWD_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,98,10 + LTEXT "Nem kötelező mester kulcs:",IDC_STATIC,17,61,88,10,NOT WS_GROUP + CONTROL "Kódolás jelmondat segítségével",IDC_PWD_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,21,128,10 CONTROL "Mester kulcs újrafelhasználása",IDC_PWD_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,60,76,10 GROUPBOX "Jelmondat",IDC_STATIC,7,7,297,108 - CONTROL "Jelmondatok megjelenítése",IDC_PWD_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,97,75,10 + CONTROL "Jelmondatok megjelenítése",IDC_PWD_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,97,98,10 END IDD_MUI_READPW DIALOGEX 0, 0, 299, 81 @@ -489,10 +489,10 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,233,58,50,14 PUSHBUTTON "Mégsem",IDCANCEL,175,58,50,14 EDITTEXT IDC_PWD_EDIT3,16,23,267,12,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP - CONTROL "visszafejtés a mester kulcs segítségével",IDC_PWD_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,40,117,10 - LTEXT "E fájlnak van egy mester kulcsa",IDC_PWD_STATMPW,16,41,89,11,NOT WS_GROUP + CONTROL "visszafejtés a mester kulcs segítségével",IDC_PWD_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,40,138,10 + LTEXT "E fájlnak van egy mester kulcsa",IDC_PWD_STATMPW,16,41,105,11,NOT WS_GROUP GROUPBOX "Jelmondat",IDC_STATIC,8,6,283,69 - CONTROL "jelmondat megjelenítése",IDC_PWD_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,60,75,10 + CONTROL "jelmondat megjelenítése",IDC_PWD_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,60,98,10 END IDD_MUI_COLUMNWRAP DIALOGEX 0, 0, 130, 47 @@ -519,7 +519,7 @@ BEGIN PUSHBUTTON "Mégsem",IDCANCEL,125,24,50,14 LTEXT "$(L)",200,7,72,14,8 LTEXT "$(0L)",201,30,72,18,8 - LTEXT "Dokumentum sorok száma.",IDC_STATIC,57,72,74,8 + LTEXT "Dokumentum sorok száma.",IDC_STATIC,57,72,94,8 LTEXT "$(N)",202,7,82,15,8 LTEXT "$(0N)",203,30,82,19,8 LTEXT "Folytatólagos szám.",IDC_STATIC,57,82,66,8 @@ -599,15 +599,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "&Emelkedő rendezés.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,66,10 CONTROL "&Csökkenő rendezés.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,70,10 - CONTROL "Sorok &összekeverése.",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,57,10 + CONTROL "Sorok &összekeverése.",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,85,10 CONTROL "&Dupla sorok összevonása.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,85,10 CONTROL "D&upla sorok törlése.",104,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,62,91,10 CONTROL "E&gyedi sorok törlése.",105,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,74,84,10 CONTROL "&Üres sorok törlése.",106,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,86,104,10 - CONTROL "Üre&s karaktereket tartalmazó sorok törlése",107,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,104,10 - CONTROL "Kisbetű/Nag&ybetű nem számít.",108,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,115,70,10 - CONTROL "Szá&mok logikai összehasonlítása.",109,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,104,10 - CONTROL "&Oszlopos rendezés (függőleges kijelölés).",110,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,131,10 + CONTROL "Üre&s karaktereket tartalmazó sorok törlése.",107,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,98,144,10 + CONTROL "Kisbetű/Nag&ybetű nem számít.",108,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,115,120,10 + CONTROL "Szá&mok logikai összehasonlítása.",109,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,110,10 + CONTROL "&Oszlopos rendezés (függőleges kijelölés).",110,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,144,10 DEFPUSHBUTTON "OK",IDOK,128,7,50,14 PUSHBUTTON "Mégsem",IDCANCEL,128,24,50,14 END @@ -617,7 +617,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Újrakódolás" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "&Válasszon forrás kódolást a fájl újratöltéséhez:",IDC_STATIC,7,7,119,8 + LTEXT "&Válasszon forrás kódolást a fájl újratöltéséhez:",IDC_STATIC,7,7,145,8 CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Mégsem",IDCANCEL,108,114,50,14 @@ -629,7 +629,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Kódolás" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "&Válasszon kódolást a jelenlegi fájlhoz:",IDC_STATIC,7,7,90,8 + LTEXT "&Válasszon kódolást a jelenlegi fájlhoz:",IDC_STATIC,7,7,120,8 CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Mégsem",IDCANCEL,108,114,50,14 diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 5293d8c6e..c1f2893dd 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Továbbiak...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Újrakódolás az ala&pért.-re\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Újrakódolás A&NSI-ra\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Újrakódolás az ala&pért.-re\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Újrakódolás A&NSI-ra\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Újrakódolás &OEM-re\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Újrakódolás &GB18030-ra\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Újrakódolás UCHARDET elemzéshez", CMD_RELOADFORCEDETECTION diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 438bde628..ef1d0d74b 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -117,7 +117,7 @@ BEGIN IDS_MUI_OPENWITH "Válassza ki a mappát, ahol a kedvenc alkamazásaira mutató parancsikonok vannak." IDS_MUI_FAVORITES "Válassza ki a mappát, ahol a kedvenc fájljaira mutató parancsikonok vannak." IDS_MUI_BACKSLASHHELP "Backslash átalakítások\n\n\\a\tFigyelmeztetés (BEL, Ascii 7)\n\\b\tBackspace (BS, Ascii 8)\n\\f\tLapdobás (FF, Ascii 12)\n\\n\tÚj sor (LF, Ascii 10)\n\\r\tKocsi vissza (CR, Ascii 13)\n\\t\tVízszintes Tab (HT, Ascii 9)\n\\v\tFüggőleges Tab (VT, Ascii 11)\n\\0oo\tOktális érték\n\\u####\tHexadecimális érték\n\\xhh\tHexadecimal Value\n\\\\\tBackslash" - IDS_MUI_REGEXPHELP "RegExp illeszkedés szintaktika (többsoros)\n\n.\tBármilyen karakterre illeszkedik\n^\tÜres szöveg rögtön új sor után\n$\tÜres szöveg közvetlenül a sorvége előtt\n\\<\tSzó kezdete\n\\>\tSzó vége\n\\b\tSzó határa\n[...]\tKarakterek halmaza ([abc]) vagy intervalluma ([a-z])\n[^...]\tKarakterek, amik NINCSENEK a készletben vagy az intervallumban\n\\d\t10-es számrendszeri szám\n\\D\tNem szám kar.\n\\s\tÜres hely karakterek\n\\S\tNEM üres hely karakter\n\\w\t""szó"" karakterek\n\\W\t""nem-szó"" karakter\n\\x\tEscape karakter egyébként speciális jelentéssel\n\\xHH\tKarakter HH Hexa kóddal\n?\tElőzőre illeszkedik 0-szor vagy 1-szer\n*\tElőzőre illeszkedik 0-szor vagy többször\n+\tElőzőre illeszkedik egyszer vagy többször\n*? or +?\tIsmétlések illeszkedése lomhán ""?"" and ""+""\n(\tRégió kezdete\n)\tRégió vége\n\\n\tCserénél egy régióra hivatkozik (n = 1-9)\n" + IDS_MUI_REGEXPHELP "RegExp illeszkedés szintaktika (többsoros)\n\n.\tBármilyen karakterre illeszkedik\n^\tÜres szöveg rögtön új sor után\n$\tÜres szöveg közvetlenül a sorvége előtt\n\\<\tSzó kezdete\n\\>\tSzó vége\n\\b\tSzó határa\n[...]\tKarakterek halmaza ([abc]) vagy intervalluma ([a-z])\n[^...]\tKarakterek, amik NINCSENEK a készletben vagy\n\taz intervallumban\n\\d\t10-es számrendszeri szám\n\\D\tNem szám kar.\n\\s\tÜres hely karakterek\n\\S\tNEM üres hely karakter\n\\w\t""szó"" karakterek\n\\W\t""nem-szó"" karakter\n\\x\tEscape karakter egyébként speciális jelentéssel\n\\xHH\tKarakter HH Hexa kóddal\n?\tElőzőre illeszkedik 0-szor vagy 1-szer\n*\tElőzőre illeszkedik 0-szor vagy többször\n+\tElőzőre illeszkedik egyszer vagy többször\n*? or +?\tIsmétlések illeszkedése lomhán ""?"" and ""+""\n(\tRégió kezdete\n)\tRégió vége\n\\n\tCserénél egy régióra hivatkozik (n = 1-9)\n" IDS_MUI_WILDCARDHELP "Joker keresés\n\n*\tNulla vagy több karakterre illeszkedik.\n?\tPontosan egy karakterre illeszkedik. " END diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index d7bbe0c35..1504abd55 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&Altri...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Ricodifica con Encoding di &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Ricodifica come &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Ricodifica con Encoding di &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Ricodifica come &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Ricodifica come &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Ricodifica come &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Ricodifica a UCHARDET Analysis", CMD_RELOADFORCEDETECTION diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index f85130e0b..89203d7cb 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 BOM (&S)", IDM_ENCODING_UTF8SIGN MENUITEM "‚ť‚Ě‘ź‚Ě•śŽšƒR[ƒh‚đŽw’č(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "ƒfƒtƒHƒ‹ƒg‚Ĺ“Ç‚Ý’ź‚ľ(&D)\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "ANSI‚Ĺ“Ç‚Ý’ź‚ľ(&A)\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "ƒfƒtƒHƒ‹ƒg‚Ĺ“Ç‚Ý’ź‚ľ(&D)\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "ANSI‚Ĺ“Ç‚Ý’ź‚ľ(&A)\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "OEM‚Ĺ“Ç‚Ý’ź‚ľ(&O)\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "GB18030‚Ĺ“Ç‚Ý’ź‚ľ(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "UCHARDET‰đÍ‚Ĺ“Ç‚Ý’ź‚ľ", CMD_RELOADFORCEDETECTION diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index de005f41c..f533f6a97 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "ź­¸í ŔÖ´Â UTF-8(&S)", IDM_ENCODING_UTF8SIGN MENUITEM "ąâŸ(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "ąâşť°ŞŔ¸ˇÎ ÇĽ˝Ă(&F)\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "ANSIˇÎ ÇĽ˝Ă(&N)\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "ąâşť°ŞŔ¸ˇÎ ÇĽ˝Ă(&F)\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "ANSIˇÎ ÇĽ˝Ă(&N)\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "OEMŔ¸ˇÎ ÇĽ˝Ă(&O)\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "GB18030Ŕ¸ˇÎ ÇĽ˝Ă(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "UCHARDET şĐźŽŔ¸ˇÎ Ŕç ÄÚľů", CMD_RELOADFORCEDETECTION @@ -359,11 +359,11 @@ BEGIN MENUITEM "â Ŕ§ÄĄ °íÁ¤(&P)", IDM_VIEW_STICKYWINPOS END END - POPUP "Appearance(&P)" + POPUP "¸đžç(&P)" BEGIN MENUITEM "˝şĹ°¸ś ĆíÁý(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG MENUITEM SEPARATOR - MENUITEM "Select Syntax Scheme(&X)...\tF12", IDM_VIEW_SCHEME + MENUITEM "ą¸šŽ ˝şĹ°¸ś źąĹĂ(&X)...\tF12", IDM_VIEW_SCHEME MENUITEM "&2nd ąâşť ˝şĹ°¸ś\tShift+F12", IDM_VIEW_USE2NDDEFAULT MENUITEM SEPARATOR MENUITEM "ŔüĂź ąâşť ąŰ˛Ă(&D)...\tAlt+F12", IDM_VIEW_FONT diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 0b2ccd4d1..a1613ba52 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "łŞśó¸ť(&L)" - IDS_MUI_MENU_THEMES "Scheme Collection(&S)" + IDS_MUI_MENU_THEMES "˝şĹ°¸ś ¸đŔ˝(&S)" IDM_THEMES_DEFAULT "ĂĘąâČ­" IDM_THEMES_FILE_ITEM "ÇĽÁŘ źłÁ¤" END diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index b9cbfe3ae..e999fc868 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 met &signatuur", IDM_ENCODING_UTF8SIGN MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Hercoderen naar &Standaard\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Hercoderen naar &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Hercoderen naar &Standaard\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Hercoderen naar &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Hercoderen naar &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Hercoderen naar &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Hercoderen naar UCHARDET-analyse", CMD_RELOADFORCEDETECTION diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index a97d289b1..43a869a89 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 z &sygnaturš", IDM_ENCODING_UTF8SIGN MENUITEM "&Więcej...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Przekoduj na domyœlny &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Przekoduj na &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Przekoduj na domyœlny &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Przekoduj na &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Przekoduj na &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Przekoduj na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Przekoduj na analizy UCHARDET", CMD_RELOADFORCEDETECTION diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index e1141232a..e11864b29 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Recode to &Default\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Recode to &ANSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Recode to UCHARDET Analysis", CMD_RELOADFORCEDETECTION @@ -310,7 +310,7 @@ BEGIN MENUITEM "Background &Color", IDM_VIEW_HILITCURLN_BACK MENUITEM "Outline &Frame", IDM_VIEW_HILITCURLN_FRAME END - POPUP "Mar&k Occurrences" + POPUP "Mark &Occurrences" BEGIN MENUITEM "&Active\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF MENUITEM SEPARATOR @@ -337,7 +337,7 @@ BEGIN MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP END - POPUP "T&oolbar" + POPUP "&Toolbar" BEGIN MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 2f0243841..b7878280e 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 ń BO&M", IDM_ENCODING_UTF8SIGN MENUITEM "Ĺ&ů¸...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Ďĺđĺîňęđűňü â ęî&äčđîâęĺ ďî óěîë÷ŕíčţ\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "Ďĺđĺîňęđűňü â A&NSI\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "Ďĺđĺîňęđűňü â ęî&äčđîâęĺ ďî óěîë÷ŕíčţ\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "Ďĺđĺîňęđűňü â A&NSI\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "Ďĺđĺîňęđűňü â &OEM\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "Ďĺđĺîňęđűňü â &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "Ďĺđĺîňęđűňü ń &UCHARDET ŕíŕëčçîě", CMD_RELOADFORCEDETECTION diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index c47ec30cb..0a7c8bcca 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -90,8 +90,8 @@ BEGIN MENUITEM "UTF-8 ´řÇŠĂű(&S)", IDM_ENCODING_UTF8SIGN MENUITEM "¸üśŕąŕÂë(&M)...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "ÖŘĐÂąŕÂëÎŞÄŹČĎ(&E)\tCtrl-Alt-F", CMD_RECODEDEFAULT - MENUITEM "ÖŘĐÂąŕÂëÎŞ ANSI(&A)\tCtrl-Shift+A", CMD_RECODEANSI + MENUITEM "ÖŘĐÂąŕÂëÎŞÄŹČĎ(&E)\tCtrl+Alt+F", CMD_RECODEDEFAULT + MENUITEM "ÖŘĐÂąŕÂëÎŞ ANSI(&A)\tCtrl+Shift+A", CMD_RECODEANSI MENUITEM "ÖŘĐÂąŕÂëÎŞ OEM(&O)\tCtrl+Shift+O", CMD_RECODEOEM MENUITEM "ÖŘĐÂąŕÂëÎŞ GB18030(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030 MENUITEM "ÖŘĐÂąŕÂëÎŞ UCHARDET ˇÖÎö", CMD_RELOADFORCEDETECTION diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index ee8e9ff95..86270fbf1 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,8 +3,8 @@ - Notepad3 ONIGURUMA + Notepad3 RC2 diff --git a/src/Edit.c b/src/Edit.c index 83d6ef501..2113abe5f 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -1316,8 +1316,6 @@ bool EditSaveFile( // get text cbData = (DWORD)SciCall_GetTextLength(); - lpData = AllocMem(cbData + 4, HEAP_ZERO_MEMORY); //fix: +bom - SciCall_GetText((DocPos)SizeOfMem(lpData), lpData); if (cbData == 0) { bWriteSuccess = SetEndOfFile(hFile); @@ -1325,7 +1323,10 @@ bool EditSaveFile( } else { - // FIXME: move checks in front of disk file access + lpData = AllocMem(cbData + 4 + PAD_SLOP, HEAP_ZERO_MEMORY); //fix: +bom + SciCall_GetText((DocPos)cbData+1, lpData); + + // FIXME: move checks in front of disk file access // Msg if file tag encoding does not correspond to BOM /*if ((g_Encodings[iEncoding].uFlags & NCP_UNICODE) == 0 && (g_Encodings[iEncoding].uFlags & NCP_UTF8_SIGN) == 0) { bool bEncodingMismatch = true; @@ -1352,7 +1353,7 @@ bool EditSaveFile( { SetEndOfFile(hFile); - LPWSTR lpDataWide = AllocMem(cbData * 2 + 16, HEAP_ZERO_MEMORY); + LPWSTR lpDataWide = AllocMem(cbData * 2 + PAD_SLOP, HEAP_ZERO_MEMORY); int bomoffset = 0; if (Encoding_IsUNICODE_BOM(status->iEncoding)) { const char* bom = "\xFF\xFE"; @@ -1378,7 +1379,7 @@ bool EditSaveFile( if (Encoding_IsUTF8_SIGN(status->iEncoding)) { const char* bom = "\xEF\xBB\xBF"; - DWORD bomoffset = 3; + DWORD const bomoffset = 3; MoveMemory(&lpData[bomoffset], lpData, cbData); CopyMemory(lpData, bom, bomoffset); cbData += bomoffset; @@ -1395,7 +1396,7 @@ bool EditSaveFile( BOOL bCancelDataLoss = FALSE; UINT uCodePage = Encoding_GetCodePage(status->iEncoding); - LPWSTR lpDataWide = AllocMem(cbData * 2 + 16, HEAP_ZERO_MEMORY); + LPWSTR lpDataWide = AllocMem(cbData * 2 + PAD_SLOP, HEAP_ZERO_MEMORY); int cbDataWide = MultiByteToWideChar(Encoding_SciCP,0,lpData,cbData, lpDataWide,(MBWC_DocPos_Cast)(SizeOfMem(lpDataWide)/sizeof(WCHAR))); diff --git a/src/Version.h b/src/Version.h index 586d504b1..9426d2d95 100644 --- a/src/Version.h +++ b/src/Version.h @@ -68,7 +68,7 @@ #if defined(_MSC_VER) #if (_MSC_VER >= 1920) #if(_MSC_FULL_VER >= 192127702) - #define VER_CPL MS Visual C++ 2019 v16.1.(0-1) + #define VER_CPL MS Visual C++ 2019 v16.1.(0-2) #elif(_MSC_FULL_VER >= 192027508) #define VER_CPL MS Visual C++ 2019 v16.0.(0-4) #elif(_MSC_FULL_VER >= 192027027) diff --git a/src/VersionEx.h b/src/VersionEx.h index e5980a607..0f22b0367 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 602 -#define VERSION_BUILD 2239 +#define VERSION_REV 605 +#define VERSION_BUILD 2244 #define SCINTILLA_VER 415+ -#define ONIGURUMA_REGEX_VER 6.9.2 -#define VERSION_PATCH ONIGURUMA +#define ONIGMO_REGEX_VER 6.2.0 +#define VERSION_PATCH RC2