From 95cfc58d318919add4508a1af67627e6dcd03224 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 14 May 2019 22:45:56 +0200 Subject: [PATCH] MUI - Translation of "Always On Top" (copy text from "menu_xx_yy.rc") --- Build/Changes.txt | 7 +- language/np3_af_za/strings_af_za.rc | 2 +- language/np3_be_by/strings_be_by.rc | 2 +- language/np3_es_es/strings_es_es.rc | 7 +- language/np3_fr_fr/strings_fr_fr.rc | 2 +- language/np3_hu_hu/menu_hu_hu.rc | 1 - language/np3_hu_hu/strings_hu_hu.rc | 2 +- language/np3_it_it/strings_it_it.rc | 2 +- language/np3_ja_jp/strings_ja_jp.rc | 7 +- language/np3_ko_kr/strings_ko_kr.rc | 5 +- language/np3_nl_nl/strings_nl_nl.rc | 2 +- language/np3_pl_pl/strings_pl_pl.rc | 2 +- language/np3_pt_br/menu_pt_br.rc | 318 ++++++++++++++-------------- language/np3_pt_br/strings_pt_br.rc | 8 +- language/np3_ru_ru/strings_ru_ru.rc | 2 +- language/np3_zh_cn/strings_zh_cn.rc | 5 +- src/Version.h | 2 +- 17 files changed, 189 insertions(+), 187 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 2d09f7e68..3420502be 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -30,7 +30,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current Version 5.19.510.build (2019-May 10) +Current Version 5.19.514.build (2019-May 14) ================================================== -------------------------------------------------- @@ -58,6 +58,9 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- +- Enable Undo on FileRevert / AutoReload +- Adapt warning dialog according to new FileRevert / AutoReload undo/redo history +- Add an "Always On Top" toolbar button - Rename "Doc Tail Chasing" => "Monitoring Log" - Optimized FileWatching interval for "Chasing Tail" mode @@ -77,7 +80,7 @@ CHANGES: - Train Africaans (CP-1252) for UCD language detection models - Word-wrap-symbol show/hide accelerator-key -> "Ctrl+Shift+7 - Menu Languange Selector to Dynamic Language Selector -- Up-to-Date SCI (GitHub Mirror 2019-Apr-17) +- Up-to-Date SCI (GitHub Mirror 2019-May-10) - Update of CED (2019-Feb-01) - SpeedUp of RegEx Replace (in case of const replace pattern) - Update of Onigmo RegEx engine (2019-Jan-24) diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 0dc7c367d..8ec060f9a 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Voer Dokument Uit" IDT_VIEW_TOGGLE_VIEW "Gefokusde Aansig" IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Altyd Bo-op" END STRINGTABLE diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 8f996da64..b24dc8f04 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH " " IDT_VIEW_TOGGLE_VIEW " " IDT_VIEW_CHASING_DOCTAIL " " - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP " " END STRINGTABLE diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index bc012e47c..941cb1abf 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -87,9 +87,10 @@ END STRINGTABLE BEGIN - IDT_FILE_LAUNCH "Ejecutar Documento" - IDT_VIEW_TOGGLE_VIEW "Vista enfocada" - IDT_VIEW_CHASING_DOCTAIL"Monitoreo de Log" + IDT_FILE_LAUNCH "Ejecutar Documento" + IDT_VIEW_TOGGLE_VIEW "Vista enfocada" + IDT_VIEW_CHASING_DOCTAIL "Monitoreo de Log" + IDT_VIEW_PIN_ON_TOP "Siempre visible" END STRINGTABLE diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 46c913d2e..e35d2fb99 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Excuter Document" IDT_VIEW_TOGGLE_VIEW "Vue Focalise" IDT_VIEW_CHASING_DOCTAIL "Surveillance de Log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Toujours visible" END STRINGTABLE diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 33fb4afbc..8f6db762c 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -342,7 +342,6 @@ BEGIN MENUITEM "Fkuszlt n&zet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW MENUITEM "&Naplfjl kvetse", IDM_VIEW_CHASING_DOCTAIL MENUITEM "Grgets a fjl vge &utn is", IDM_VIEW_SCROLLPASTEOF - END POPUP "&Eszkztr" BEGIN diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 532f95139..08fb16ad5 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Futatts" IDT_VIEW_TOGGLE_VIEW "Fkuszlt nzet" IDT_VIEW_CHASING_DOCTAIL "Naplfjl kvetse" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Mindig fell" END STRINGTABLE diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index 247214330..4a33a0c35 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Esegui documento" IDT_VIEW_TOGGLE_VIEW "Vista focalizzata" IDT_VIEW_CHASING_DOCTAIL "Monitoraggio log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Sempre in primo piano" END STRINGTABLE diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 60a879c9a..02b24af9f 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "JĂ镶s" IDT_VIEW_TOGGLE_VIEW "P][h" IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "ɎOɕ\" END STRINGTABLE @@ -133,6 +133,8 @@ BEGIN IDS_MUI_ERR_ENCODINGNA "̃Rs[^ł́AIR[hp̃R[hy[Wϊe[upł܂B" IDS_MUI_ERR_UNICODE "Unicodeւ̕ϊɃG[܂B\nt@Cۑƃf[^邩܂B" IDS_MUI_ERR_BITMAP "rbg}bvt@C̓ǂݍ݃G[: %s\nKvȐ@: %i x %i ( >= %i x )." + IDS_MUI_ERR_ELEVATED_RIGHTS + "Error elevating user rights!" END STRINGTABLE @@ -184,8 +186,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE """%s"" ̕ҏWۑ܂H" - //IDS_MUI_ASK_REVERT "Ōɕۑꂽeōēǂݍ݂܂Bȍ~̕ύXe͎܂낵łH" - IDS_MUI_ASK_REVERT "Revert file to last saved state?" + IDS_MUI_ASK_REVERT "Ōɕۑꂽeōēǂݍ݂܂H" IDS_MUI_ASK_RECODE "ǂݒ̓t@Cēǂݍ݂邽߁AύXe͎܂B" IDS_MUI_ASK_CREATE """%s""͂܂B\ñt@C쐬܂H" IDS_MUI_PRINT_HEADER "t@C, ݂̓tƎ|t@C, ݂̓t|t@C|󗓂Ƃ" diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 7bb6e4f91..3021ee681 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH " " IDT_VIEW_TOGGLE_VIEW "" IDT_VIEW_CHASING_DOCTAIL "&Monitoring Log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "׻ " END STRINGTABLE @@ -186,8 +186,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE """%s"" Ͻðڽϱ?" - //IDS_MUI_ASK_REVERT " · ðڽϱ? Ұ ˴ϴ!" - IDS_MUI_ASK_REVERT "Revert file to last saved state?" + IDS_MUI_ASK_REVERT " · ðڽϱ?" IDS_MUI_ASK_RECODE "ڵ ٽ ε ؾ ϸ, Ұ ˴ϴ!" IDS_MUI_ASK_CREATE """%s"" ʽϴ.\n Ͻðڽϱ?" IDS_MUI_PRINT_HEADER " ̸, ¥ ð| ̸, ¥| ̸| α" diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 82c55f1c1..27df4339f 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Uitvoeren Document" IDT_VIEW_TOGGLE_VIEW "Gefocust zicht" IDT_VIEW_CHASING_DOCTAIL "Log Monitoren" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Altijd bovenop" END STRINGTABLE diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 498b5038f..6d209e397 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "Ten Document" IDT_VIEW_TOGGLE_VIEW "Focused View" IDT_VIEW_CHASING_DOCTAIL "Monitoring Log" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "Zawsze na wierzchu" END STRINGTABLE diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 1b13ce97e..96194bce8 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -56,15 +56,15 @@ IDR_MUI_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "&New\tCtrl+N", IDM_FILE_NEW - MENUITEM "&Open...\tCtrl+O", IDM_FILE_OPEN - MENUITEM "Re&vert\tF5", IDM_FILE_REVERT - MENUITEM "&Save\tCtrl+S", IDM_FILE_SAVE - MENUITEM "Save &As...\tF6", IDM_FILE_SAVEAS - MENUITEM "Save &Copy...\tCtrl+F6", IDM_FILE_SAVECOPY - MENUITEM "&Read Only", IDM_FILE_READONLY + MENUITEM "&New\tCtrl+N", IDM_FILE_NEW + MENUITEM "&Open...\tCtrl+O", IDM_FILE_OPEN + MENUITEM "Re&vert\tF5", IDM_FILE_REVERT + MENUITEM "&Save\tCtrl+S", IDM_FILE_SAVE + MENUITEM "Save &As...\tF6", IDM_FILE_SAVEAS + MENUITEM "Save &Copy...\tCtrl+F6", IDM_FILE_SAVECOPY + MENUITEM "&Read Only", IDM_FILE_READONLY MENUITEM SEPARATOR - MENUITEM "Set Encr&yption Passphrase...", IDM_SETPASS + MENUITEM "Set Encr&yption Passphrase...", IDM_SETPASS MENUITEM SEPARATOR POPUP "&Launch" BEGIN @@ -77,31 +77,31 @@ BEGIN MENUITEM "&Open with...\tAlt+L", IDM_FILE_OPENWITH MENUITEM "&Command...\tCtrl+R", IDM_FILE_RUN MENUITEM SEPARATOR - MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1 - MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2 + MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1 + MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2 END MENUITEM SEPARATOR POPUP "&Encoding" BEGIN - MENUITEM "&ANSI", IDM_ENCODING_ANSI - MENUITEM "&Unicode", IDM_ENCODING_UNICODE - MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV - MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8 - MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN - MENUITEM "&More...\tF9", IDM_ENCODING_SELECT + MENUITEM "&ANSI", IDM_ENCODING_ANSI + MENUITEM "&Unicode", IDM_ENCODING_UNICODE + MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV + MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8 + MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN + MENUITEM "&More...\tF9", IDM_ENCODING_SELECT MENUITEM SEPARATOR - MENUITEM "Force Encoding Detection", CMD_RELOADFORCEDETECTION + MENUITEM "Force Encoding Detection", CMD_RELOADFORCEDETECTION MENUITEM SEPARATOR - 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 &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 SEPARATOR - MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 - MENUITEM "Ignore Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS - MENUITEM "&Recode...\tF8", IDM_ENCODING_RECODE + MENUITEM "ASCII as UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8 + MENUITEM "Ignore Encoding &Tags\tAlt+F8", CMD_RELOADNOFILEVARS + MENUITEM "&Recode...\tF8", IDM_ENCODING_RECODE MENUITEM SEPARATOR - MENUITEM "Set &Default...", IDM_ENCODING_SETDEFAULT + MENUITEM "Set &Default...", IDM_ENCODING_SETDEFAULT END POPUP "Line Endin&gs" BEGIN @@ -112,24 +112,24 @@ BEGIN MENUITEM "&Default...", IDM_LINEENDINGS_SETDEFAULT END MENUITEM SEPARATOR - MENUITEM "Check &Indentation...", CMD_CHECK_INDENTATION + MENUITEM "Check &Indentation...", CMD_CHECK_INDENTATION MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", IDM_FILE_PAGESETUP - MENUITEM "&Print...\tCtrl+P", IDM_FILE_PRINT + MENUITEM "Page Se&tup...", IDM_FILE_PAGESETUP + MENUITEM "&Print...\tCtrl+P", IDM_FILE_PRINT MENUITEM SEPARATOR - MENUITEM "Propert&ies...", IDM_FILE_PROPERTIES - MENUITEM "Create &Desktop Link", IDM_FILE_CREATELINK + MENUITEM "Propert&ies...", IDM_FILE_PROPERTIES + MENUITEM "Create &Desktop Link", IDM_FILE_CREATELINK MENUITEM SEPARATOR - MENUITEM "&Browse...\tCtrl+M", IDM_FILE_BROWSE + MENUITEM "&Browse...\tCtrl+M", IDM_FILE_BROWSE POPUP "&Favourites" BEGIN - MENUITEM "&Open Favourites...\tAlt+I", IDM_FILE_OPENFAV - MENUITEM "&Add Current File...\tAlt+K", IDM_FILE_ADDTOFAV - MENUITEM "&Manage...\tAlt+F9", IDM_FILE_MANAGEFAV + MENUITEM "&Open Favourites...\tAlt+I", IDM_FILE_OPENFAV + MENUITEM "&Add Current File...\tAlt+K", IDM_FILE_ADDTOFAV + MENUITEM "&Manage...\tAlt+F9", IDM_FILE_MANAGEFAV END - MENUITEM "Recent (&History)...\tCtrl+Alt+H", IDM_FILE_RECENT + MENUITEM "Recent (&History)...\tCtrl+Alt+H", IDM_FILE_RECENT MENUITEM SEPARATOR - MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT + MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT END POPUP "&Edit" BEGIN @@ -148,123 +148,123 @@ BEGIN MENUITEM SEPARATOR POPUP "W&ords" BEGIN - MENUITEM "&Complete Word\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD + MENUITEM "&Complete Word\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD MENUITEM SEPARATOR - MENUITEM "Cursor Word &Left\tCtrl+Left", CMD_CTRLLEFT - MENUITEM "Cursor Word &Right\tCtrl+Right", CMD_CTRLRIGHT - MENUITEM "&Delete Word Left\tCtrl+Back", CMD_CTRLBACK - MENUITEM "Delete &Word Right\tCtrl+Del", CMD_CTRLDEL + MENUITEM "Cursor Word &Left\tCtrl+Left", CMD_CTRLLEFT + MENUITEM "Cursor Word &Right\tCtrl+Right", CMD_CTRLRIGHT + MENUITEM "&Delete Word Left\tCtrl+Back", CMD_CTRLBACK + MENUITEM "Delete &Word Right\tCtrl+Del", CMD_CTRLDEL END POPUP "&Lines" BEGIN - MENUITEM "Move &Up\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP - MENUITEM "&Move Down\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN + MENUITEM "Move &Up\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP + MENUITEM "&Move Down\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN MENUITEM SEPARATOR - MENUITEM "Cut &Line\tCtrl[+Shift]+X", IDM_EDIT_CUTLINE - MENUITEM "&Copy Line\tCtrl[+Shift]+C", IDM_EDIT_COPYLINE - MENUITEM "&Duplicate Line/Selection\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION - MENUITEM "&Transpose Lines\tAlt+D", IDM_EDIT_LINETRANSPOSE - MENUITEM "D&elete Line\tCtrl+Shift+D", IDM_EDIT_DELETELINE + MENUITEM "Cut &Line\tCtrl[+Shift]+X", IDM_EDIT_CUTLINE + MENUITEM "&Copy Line\tCtrl[+Shift]+C", IDM_EDIT_COPYLINE + MENUITEM "&Duplicate Line/Selection\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION + MENUITEM "&Transpose Lines\tAlt+D", IDM_EDIT_LINETRANSPOSE + MENUITEM "D&elete Line\tCtrl+Shift+D", IDM_EDIT_DELETELINE MENUITEM SEPARATOR - MENUITEM "Delete Line Left\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT - MENUITEM "Delete Line Right\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT + MENUITEM "Delete Line Left\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT + MENUITEM "Delete Line Right\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT MENUITEM SEPARATOR - MENUITEM "Column &Wrap...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP - MENUITEM "&Split Lines\tCtrl+I", IDM_EDIT_SPLITLINES - MENUITEM "&Join Lines\tCtrl+J", IDM_EDIT_JOINLINES - MENUITEM "&Fuse Lines\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP - MENUITEM "&Preserve Paragraphs\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA + MENUITEM "Column &Wrap...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP + MENUITEM "&Split Lines\tCtrl+I", IDM_EDIT_SPLITLINES + MENUITEM "&Join Lines\tCtrl+J", IDM_EDIT_JOINLINES + MENUITEM "&Fuse Lines\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP + MENUITEM "&Preserve Paragraphs\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA MENUITEM SEPARATOR - MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES - MENUITEM "Merge Blank Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES - MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES - MENUITEM "Remove Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES + MENUITEM "Mer&ge Empty Lines\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES + MENUITEM "Merge Blank Lines\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES + MENUITEM "&Remove Empty Lines\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES + MENUITEM "Remove Blank Lines\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES MENUITEM "Rem&ove Duplicate Lines\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES END POPUP "&Selection" BEGIN - MENUITEM "&Indent", IDM_EDIT_INDENT - MENUITEM "&Unindent", IDM_EDIT_UNINDENT + MENUITEM "&Indent", IDM_EDIT_INDENT + MENUITEM "&Unindent", IDM_EDIT_UNINDENT MENUITEM SEPARATOR POPUP "&Enclose Selection" BEGIN - MENUITEM "&Single Quotes\tCtrl+1", CMD_STRINGIFY - MENUITEM "&Double Quotes\tCtrl+2", CMD_STRINGIFY2 + MENUITEM "&Single Quotes\tCtrl+1", CMD_STRINGIFY + MENUITEM "&Double Quotes\tCtrl+2", CMD_STRINGIFY2 MENUITEM SEPARATOR - MENUITEM "( )\tCtrl+3", CMD_EMBRACE - MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2 - MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3 + MENUITEM "( )\tCtrl+3", CMD_EMBRACE + MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2 + MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3 MENUITEM SEPARATOR - MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4 + MENUITEM "&Backticks\tCtrl+6", CMD_EMBRACE4 MENUITEM SEPARATOR - MENUITEM "&With...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION + MENUITEM "&With...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION END MENUITEM "&Duplicate Selection/Line\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION MENUITEM SEPARATOR - MENUITEM "&Pad With Blanks\tAlt+B", IDM_EDIT_PADWITHSPACES - MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR - MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR - MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES - MENUITEM "Compress &Blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS + MENUITEM "&Pad With Blanks\tAlt+B", IDM_EDIT_PADWITHSPACES + MENUITEM "Strip &First Character\tAlt+Z", IDM_EDIT_STRIP1STCHAR + MENUITEM "Strip &Last Character\tAlt+U", IDM_EDIT_STRIPLASTCHAR + MENUITEM "Strip &Trailing Blanks\tAlt+W", IDM_EDIT_TRIMLINES + MENUITEM "Compress &Blanks\tAlt+P", IDM_EDIT_COMPRESS_BLANKS MENUITEM SEPARATOR - MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES - MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN - MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES + MENUITEM "&Modify Lines...\tAlt+M", IDM_EDIT_MODIFYLINES + MENUITEM "&Align Lines...\tAlt+J", IDM_EDIT_ALIGN + MENUITEM "&Sort Lines...\tAlt+O", IDM_EDIT_SORTLINES END POPUP "Co&nvert" BEGIN - MENUITEM "&Uppercase\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE - MENUITEM "&Lowercase\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE + MENUITEM "&Uppercase\tCtrl+Shift+U", IDM_EDIT_CONVERTUPPERCASE + MENUITEM "&Lowercase\tCtrl+U", IDM_EDIT_CONVERTLOWERCASE MENUITEM SEPARATOR - MENUITEM "&Invert Case\tCtrl+Alt+U", IDM_EDIT_INVERTCASE - MENUITEM "Title &Case\tCtrl+Alt+I", IDM_EDIT_TITLECASE - MENUITEM "&Sentence Case\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE + MENUITEM "&Invert Case\tCtrl+Alt+U", IDM_EDIT_INVERTCASE + MENUITEM "Title &Case\tCtrl+Alt+I", IDM_EDIT_TITLECASE + MENUITEM "&Sentence Case\tCtrl+Alt+O", IDM_EDIT_SENTENCECASE MENUITEM SEPARATOR - MENUITEM "&Tabify Selection\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES + MENUITEM "&Tabify Selection\tCtrl+Shift+T", IDM_EDIT_CONVERTSPACES MENUITEM "U&ntabify Selection\tCtrl+Shift+S", IDM_EDIT_CONVERTTABS MENUITEM SEPARATOR - MENUITEM "Ta&bify Indent\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 - MENUITEM "Untabi&fy Indent\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2 + MENUITEM "Ta&bify Indent\tCtrl+Alt+T", IDM_EDIT_CONVERTSPACES2 + MENUITEM "Untabi&fy Indent\tCtrl+Alt+S", IDM_EDIT_CONVERTTABS2 END POPUP "&Insert" BEGIN - MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER + MENUITEM "&New Line Above\tCtrl+Enter", CMD_CTRLENTER MENUITEM SEPARATOR - MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG + MENUITEM "&HTML/XML Tag...\tAlt+X", IDM_EDIT_INSERT_TAG MENUITEM SEPARATOR - MENUITEM "&Encoding Identifier\tCtrl+F8", IDM_EDIT_INSERT_ENCODING + MENUITEM "&Encoding Identifier\tCtrl+F8", IDM_EDIT_INSERT_ENCODING MENUITEM SEPARATOR - MENUITEM "&Time/Date (Short Form)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE + MENUITEM "&Time/Date (Short Form)\tCtrl+F5", IDM_EDIT_INSERT_SHORTDATE MENUITEM "Time/Date (&Long Form)\tCtrl+Shift+F5", IDM_EDIT_INSERT_LONGDATE - MENUITEM "&Update Timestamps\tShift+F5", CMD_TIMESTAMPS + MENUITEM "&Update Timestamps\tShift+F5", CMD_TIMESTAMPS MENUITEM SEPARATOR - MENUITEM "&Filename\tCtrl+F9", IDM_EDIT_INSERT_FILENAME - MENUITEM "&Path and Filename\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME + MENUITEM "&Filename\tCtrl+F9", IDM_EDIT_INSERT_FILENAME + MENUITEM "&Path and Filename\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME MENUITEM SEPARATOR - MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID + MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID END POPUP "&Miscellaneous" BEGIN MENUITEM "&Line Comment (Toggle)\tCtrl+Q", IDM_EDIT_LINECOMMENT - MENUITEM "&Stream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT + MENUITEM "&Stream Comment\tCtrl+Shift+Q", IDM_EDIT_STREAMCOMMENT MENUITEM SEPARATOR - MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE - MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE + MENUITEM "&URL Encode\tCtrl+Shift+E", IDM_EDIT_URLENCODE + MENUITEM "URL &Decode\tCtrl+Shift+R", IDM_EDIT_URLDECODE MENUITEM SEPARATOR - MENUITEM "&Escape C Chars\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS - MENUITEM "&Unescape C Chars\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS + MENUITEM "&Escape C Chars\tCtrl+Alt+E", IDM_EDIT_ESCAPECCHARS + MENUITEM "&Unescape C Chars\tCtrl+Alt+R", IDM_EDIT_UNESCAPECCHARS MENUITEM SEPARATOR - MENUITEM "&Char To Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX - MENUITEM "&Hex To Char\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR + MENUITEM "&Char To Hex\tCtrl+Alt+X", IDM_EDIT_CHAR2HEX + MENUITEM "&Hex To Char\tCtrl+Alt+C", IDM_EDIT_HEX2CHAR MENUITEM SEPARATOR - MENUITEM "Increase Number\tCtrl+Alt+NK+", CMD_INCREASENUM - MENUITEM "Decrease Number\tCtrl+Alt+NK-", CMD_DECREASENUM + MENUITEM "Increase Number\tCtrl+Alt+NK+", CMD_INCREASENUM + MENUITEM "Decrease Number\tCtrl+Alt+NK-", CMD_DECREASENUM MENUITEM SEPARATOR - MENUITEM "&Find Matching Brace\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE + MENUITEM "&Find Matching Brace\tCtrl+B", IDM_EDIT_FINDMATCHINGBRACE MENUITEM "Select To &Matching Brace\tCtrl+Shift+B", IDM_EDIT_SELTOMATCHINGBRACE MENUITEM SEPARATOR - MENUITEM "Select To &Next\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT - MENUITEM "Select To &Previous\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV + MENUITEM "Select To &Next\tCtrl+Alt+F2", IDM_EDIT_SELTONEXT + MENUITEM "Select To &Previous\tCtrl+Alt+Shift+F2", IDM_EDIT_SELTOPREV END MENUITEM SEPARATOR POPUP "Boo&kmarks" @@ -279,37 +279,37 @@ BEGIN MENUITEM SEPARATOR POPUP "&Search" BEGIN - MENUITEM "&Find...\tCtrl+F", IDM_EDIT_FIND - MENUITEM "Save Find Text\tAlt+F3", IDM_EDIT_SAVEFIND - MENUITEM "Find Ne&xt\tF3", IDM_EDIT_FINDNEXT - MENUITEM "Find Pre&vious\tShift+F3", IDM_EDIT_FINDPREV - MENUITEM "Find Next Selected\tCtrl+F3", CMD_FINDNEXTSEL + MENUITEM "&Find...\tCtrl+F", IDM_EDIT_FIND + MENUITEM "Save Find Text\tAlt+F3", IDM_EDIT_SAVEFIND + MENUITEM "Find Ne&xt\tF3", IDM_EDIT_FINDNEXT + MENUITEM "Find Pre&vious\tShift+F3", IDM_EDIT_FINDPREV + MENUITEM "Find Next Selected\tCtrl+F3", CMD_FINDNEXTSEL MENUITEM "Find Previous Selected\tCtrl+Shift+F3", CMD_FINDPREVSEL - MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE - MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT - MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE + MENUITEM "&Replace...\tCtrl+H", IDM_EDIT_REPLACE + MENUITEM "Replace Ne&xt\tF4", IDM_EDIT_REPLACENEXT + MENUITEM "&Goto...\tCtrl+G", IDM_EDIT_GOTOLINE END END POPUP "&View" BEGIN POPUP "&Scheme" BEGIN - MENUITEM "Synta&x Scheme...\tF12", IDM_VIEW_SCHEME - MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG - MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT + MENUITEM "Synta&x Scheme...\tF12", IDM_VIEW_SCHEME + MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT + MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END MENUITEM SEPARATOR - MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP - MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER - MENUITEM "Indent&ation Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES + MENUITEM "Word W&rap\tCtrl+W", IDM_VIEW_WORDWRAP + MENUITEM "&Long Line Marker\tCtrl+Shift+L", IDM_VIEW_LONGLINEMARKER + MENUITEM "Indent&ation Guides\tCtrl+Shift+G", IDM_VIEW_SHOWINDENTGUIDES MENUITEM SEPARATOR - MENUITEM "Show Wra&p Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS - MENUITEM "Show &Blanks\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS - MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS + MENUITEM "Show Wra&p Symbols\tCtrl+Shift+7", IDM_VIEW_WORDWRAPSYMBOLS + MENUITEM "Show &Blanks\tCtrl+Shift+8", IDM_VIEW_SHOWBLANKS + MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS MENUITEM SEPARATOR - MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS + MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES POPUP "Highlight C&urrent Line\tCtrl+Shift+I" BEGIN @@ -332,16 +332,16 @@ BEGIN END END MENUITEM SEPARATOR - MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS - MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN + MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS + MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN MENUITEM SEPARATOR POPUP "&Display" BEGIN MENUITEM "Code &Folding\tCtrl+Shift+Alt+F", IDM_VIEW_FOLDING - MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS - MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW - MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL - MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF + MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS + MENUITEM "Focused View\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW + MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL + MENUITEM "Scroll Past End of &File", IDM_VIEW_SCROLLPASTEOF END POPUP "&Toolbar" BEGIN @@ -359,37 +359,37 @@ BEGIN END POPUP "&Position" BEGIN - MENUITEM "Copy Position Args\tCtrl+Shift+K", CMD_COPYWINPOS + MENUITEM "Copy Position Args\tCtrl+Shift+K", CMD_COPYWINPOS MENUITEM "Snap to Default Position\tCtrl+Shift+P", CMD_DEFAULTWINPOS - MENUITEM "Save as Default Position", CMD_SAVEASDEFWINPOS - MENUITEM "Clear saved Default Position", CMD_CLEARSAVEDWINPOS - MENUITEM "Snap to Initial Position\tCtrl+F11", CMD_INITIALWINPOS - MENUITEM "Toggle Full Area Position\tF11", CMD_FULLSCRWINPOS - MENUITEM "Sticky Window &Position", IDM_VIEW_STICKYWINPOS + MENUITEM "Save as Default Position", CMD_SAVEASDEFWINPOS + MENUITEM "Clear saved Default Position", CMD_CLEARSAVEDWINPOS + MENUITEM "Snap to Initial Position\tCtrl+F11", CMD_INITIALWINPOS + MENUITEM "Toggle Full Area Position\tF11", CMD_FULLSCRWINPOS + MENUITEM "Sticky Window &Position", IDM_VIEW_STICKYWINPOS END END POPUP "&Settings" BEGIN - MENUITEM "Insert Tabs as &Spaces", IDM_VIEW_TABSASSPACES - MENUITEM "&Tab Settings...\tCtrl+T", IDM_VIEW_TABSETTINGS - MENUITEM "&Word Wrap Settings...", IDM_VIEW_WORDWRAPSETTINGS - MENUITEM "&Long Line Settings...", IDM_VIEW_LONGLINESETTINGS - MENUITEM "Auto In&dent Text", IDM_VIEW_AUTOINDENTTEXT - MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS - MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS - MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS + MENUITEM "Insert Tabs as &Spaces", IDM_VIEW_TABSASSPACES + MENUITEM "&Tab Settings...\tCtrl+T", IDM_VIEW_TABSETTINGS + MENUITEM "&Word Wrap Settings...", IDM_VIEW_WORDWRAPSETTINGS + MENUITEM "&Long Line Settings...", IDM_VIEW_LONGLINESETTINGS + MENUITEM "Auto In&dent Text", IDM_VIEW_AUTOINDENTTEXT + MENUITEM "Auto Close &HTML/XML\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS + MENUITEM "A&uto Complete Words", IDM_VIEW_AUTOCOMPLETEWORDS + MENUITEM "Auto Complete Lexer-&Key-Words", IDM_VIEW_AUTOCLEXKEYWORDS MENUITEM "Accelerated Word Navi&gation\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM SEPARATOR - MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE - MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY - MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP + MENUITEM "Single &File Instance", IDM_VIEW_SINGLEFILEINSTANCE + MENUITEM "File &Change Notification...\tAlt+F5", IDM_VIEW_CHANGENOTIFY + MENUITEM "Mute Message &Beeps", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Esc &Key Function" BEGIN MENUITEM "&None", IDM_VIEW_NOESCFUNC MENUITEM "&Minimise Notepad3", IDM_VIEW_ESCMINIMIZE MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END - MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -406,10 +406,10 @@ BEGIN MENUITEM "Full &Pathname", IDM_VIEW_SHOWFULLPATH MENUITEM "&Text Excerpt\tCtrl+9", IDM_VIEW_SHOWEXCERPT END - MENUITEM "&Reuse Window", IDM_VIEW_REUSEWINDOW - MENUITEM "&Always On Top\tAlt+T", IDM_VIEW_ALWAYSONTOP - MENUITEM "Minimi&se To Tray", IDM_VIEW_MINTOTRAY - MENUITEM "Transparent &Mode\tAlt+G", IDM_VIEW_TRANSPARENT + MENUITEM "&Reuse Window", IDM_VIEW_REUSEWINDOW + MENUITEM "&Always On Top\tAlt+T", IDM_VIEW_ALWAYSONTOP + MENUITEM "Minimi&se To Tray", IDM_VIEW_MINTOTRAY + MENUITEM "Transparent &Mode\tAlt+G", IDM_VIEW_TRANSPARENT END POPUP "&Technology" BEGIN @@ -429,20 +429,20 @@ BEGIN END POPUP "&Advanced Configuration" BEGIN - MENUITEM "Save Settings On E&xit", IDM_VIEW_SAVESETTINGS - MENUITEM "Save Settings &Now\tF7", IDM_VIEW_SAVESETTINGSNOW - MENUITEM "&Open Settings File\tCtrl+F7", CMD_OPENINIFILE + MENUITEM "Save Settings On E&xit", IDM_VIEW_SAVESETTINGS + MENUITEM "Save Settings &Now\tF7", IDM_VIEW_SAVESETTINGSNOW + MENUITEM "&Open Settings File\tCtrl+F7", CMD_OPENINIFILE END END POPUP "&Help" BEGIN - MENUITEM "&Online Documentation\tF1", IDM_HELP_ONLINEDOCUMENTATION + MENUITEM "&Online Documentation\tF1", IDM_HELP_ONLINEDOCUMENTATION MENUITEM SEPARATOR - MENUITEM "Launch Administration &Tool...", IDM_HELP_ADMINEXE - MENUITEM "Check &Website for Update", IDM_HELP_UPDATEWEBSITE + MENUITEM "Launch Administration &Tool...", IDM_HELP_ADMINEXE + MENUITEM "Check &Website for Update", IDM_HELP_UPDATEWEBSITE MENUITEM SEPARATOR - MENUITEM "&Command Line Help...", IDM_HELP_CMD - MENUITEM "&About...\tShift+F1", IDM_HELP_ABOUT + MENUITEM "&Command Line Help...", IDM_HELP_CMD + MENUITEM "&About...\tShift+F1", IDM_HELP_ABOUT END END diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index 33af7f09d..28ee59b85 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -148,10 +148,10 @@ BEGIN "Are you sure you want to open this large file?" IDS_MUI_WARN_UNKNOWN_EXT "Unknown file name extension (%s) !\nLoading data anyway ?" - IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" - IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" - IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" - IDS_MUI_EOLMODENAME_CR "Old Mac (CR)" + IDS_MUI_INDENT_CONSISTENT "The file has a consistent indentation!" + IDS_MUI_EOLMODENAME_CRLF "Windows (CR+LF)" + IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)" + IDS_MUI_EOLMODENAME_CR "Old Mac (CR)" END STRINGTABLE diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 532f9cb35..d6b99d1b4 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH " " IDT_VIEW_TOGGLE_VIEW " " IDT_VIEW_CHASING_DOCTAIL " " - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP " " END STRINGTABLE diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index 5487392c7..d54ee10ed 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -90,7 +90,7 @@ BEGIN IDT_FILE_LAUNCH "еǰĵ" IDT_VIEW_TOGGLE_VIEW "ʾƥ" IDT_VIEW_CHASING_DOCTAIL "־" - IDT_VIEW_PIN_ON_TOP "Always On Top" + IDT_VIEW_PIN_ON_TOP "ö" END STRINGTABLE @@ -186,8 +186,7 @@ END STRINGTABLE BEGIN IDS_MUI_ASK_SAVE "޸ı浽%s" - //IDS_MUI_ASK_REVERT "ԭļϴα״̬\n\n棺δ޸Ľʧ" - IDS_MUI_ASK_REVERT "Revert file to last saved state?" + IDS_MUI_ASK_REVERT "ԭļϴα״̬" IDS_MUI_ASK_RECODE "ı벢¼\n\n棺δ޸Ľʧ" IDS_MUI_ASK_CREATE "ļ%sδҵǷ񴴽һµļ" IDS_MUI_PRINT_HEADER "ļǰںʱ|ļǰ|ļ|" diff --git a/src/Version.h b/src/Version.h index 5d182ee54..630ac9e4d 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 >= 192027508) - #define VER_CPL MS Visual C++ 2019 v16.0.(0-3) + #define VER_CPL MS Visual C++ 2019 v16.0.(0-4) #elif(_MSC_FULL_VER >= 192027027) #define VER_CPL MS Visual C++ 2019 v16.0.Prev(1-4) #endif