diff --git a/Build/Changes.txt b/Build/Changes.txt
index 78a0be243..04d70c605 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,7 +32,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
-Current BETA/RC Version 5.21.309.(build_#) (2021-03-09)
+Current BETA/RC Version 5.21.310.(build_#) (2021-03-10)
========================================================
--------------------------------------------------------
diff --git a/Build/Docs/KeyboardShortcuts.txt b/Build/Docs/KeyboardShortcuts.txt
index 6567a1871..19a9ea324 100644
--- a/Build/Docs/KeyboardShortcuts.txt
+++ b/Build/Docs/KeyboardShortcuts.txt
@@ -8,7 +8,7 @@
================================================================================
-*** Keyboard Shortcuts for Notepad3 *** date: 2020/09/29
+*** Keyboard Shortcuts for Notepad3 *** date: 2021/03/09
---------------------------------------------------------------------
@@ -178,6 +178,7 @@
Ctrl+Space Select Word or Lines.
Ctrl+Shift+Space Multi-Select All Matches.
Alt+Shift+Arrows Rectangular Selection.
+ Alt+Shift+Left Mouse Rectangular Selection.
Ctrl+F9 Copy Filename Only to Clipboard.
Ctrl+Shift+F9 Copy Full Path to Clipboard.
diff --git a/Versions/day.txt b/Versions/day.txt
index 7536e3d32..54ea97e96 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-309
+310
diff --git a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
index 980acd583..9a293f558 100644
--- a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
+++ b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
@@ -216,7 +216,7 @@ msgstr "Ext"
#. Resource IDs: (1039)
msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude"
-msgstr "Nomes de Arquivo correspondentes:\nuse '|' para separar vários padrões de textos correspondentes, prece&der com '-' para excluir"
+msgstr "Arquivos correspondentes:\nuse '|' para separar vários padrões de textos correspondentes, prece&der com '-' para excluir"
#. Resource IDs: (1059)
msgid "Files"
@@ -353,7 +353,7 @@ msgstr "Testar Regex"
#. Resource IDs: (1046)
msgid "Regex match"
-msgstr "Corresponder regex"
+msgstr "Regex corresp."
#. Resource IDs: (65535)
msgid "Regex replace string:"
@@ -397,7 +397,7 @@ msgstr "Localizar &por:"
#. Resource IDs: (1042)
msgid "Search case-sensitive"
-msgstr "Diferenciar maiúsculas/minúsculas"
+msgstr "Diferenciar Maiúsc./Minúsc."
#. Resource IDs: (1015)
msgid "Search in"
diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc
index ab0f0003d..6243e41d7 100644
--- a/language/np3_pt_br/dialogs_pt_br.rc
+++ b/language/np3_pt_br/dialogs_pt_br.rc
@@ -91,7 +91,7 @@ BEGIN
LTEXT "Procurar Strin&g:",IDC_STATIC,7,7,50,8
CONTROL "Esc Ctrl Caract.", IDC_FINDESCCTRLCHR, "SysLink", 0x0, 70, 7, 60, 10
COMBOBOX IDC_FINDTEXT,7,17,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Diferenciar Maiús&culas/Minúsculas",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,92,10
+ CONTROL "Diferenciar Maiúsc./Minúsc.",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,92,10
CONTROL "Coincidir &palavras inteiras",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10
CONTROL "Coincidir &prefixo",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10
CONTROL "&Transformar barras invertidas",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,96,10
@@ -101,7 +101,7 @@ BEGIN
CONTROL "&Não voltar ao início",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,49,75,10
CONTROL "F&echar após encontrar",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,61,77,10
CONTROL "Marcar &Ocorrências",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,85,73,10
- CONTROL "Busca com caracteres cor&inga",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,63,10
+ CONTROL "Com cor&inga",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,97,63,10
CONTROL "Modo transparente ao sair do foco",IDC_TRANSPARENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,124,10
DEFPUSHBUTTON "&Local. Próximo",IDOK,211,7,55,14
@@ -126,7 +126,7 @@ BEGIN
LTEXT "Trocar co&m:",IDC_STATIC2,7,36,46,8
CONTROL "Esc Ctrl Caract.", IDC_REPLESCCTRLCHR, "SysLink", 0x0, 70, 36, 60, 10
COMBOBOX IDC_REPLACETEXT,7,47,192,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Diferenciar Maiús&culas/Minúsculas",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,92,10
+ CONTROL "Diferenciar Maiúsc./Minúsc.",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,92,10
CONTROL "Coincidir &palavras inteiras",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10
CONTROL "Coincidir &prefixo",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10
CONTROL "&Transformar barras invertidas",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,96,10
@@ -136,7 +136,7 @@ BEGIN
CONTROL "&Não voltar ao início",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,75,10
CONTROL "F&echar após trocar",IDC_FINDCLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,77,10
CONTROL "Marcar &Ocorrências",IDC_ALL_OCCURRENCES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,73,10
- CONTROL "Busca com caracteres cor&inga",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,63,10
+ CONTROL "Com cor&inga",IDC_WILDCARDSEARCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,63,10
CONTROL "Modo transparente ao perder foco",IDC_TRANSPARENT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,156,124,10
DEFPUSHBUTTON "&Local. Próximo",IDOK,211,7,55,14
@@ -277,10 +277,10 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Notificação de Mudança de Arquivo"
FONT 9, "Segoe UI", 0, 0, 0x0
BEGIN
- CONTROL "&Nenhuma.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,40,10
+ CONTROL "&Nenhuma.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,50,10
CONTROL "&Mostrar mensagem.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
- CONTROL "Recarregar &automat. (não modificado).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,115,10
- CONTROL "&Redefinir se novo arquivo for aberto.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,115,10
+ CONTROL "Recarregar &automat. (não modific.).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,118,10
+ CONTROL "&Redefinir se novo arquivo for aberto.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,125,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14
END
@@ -312,7 +312,7 @@ BEGIN
PUSHBUTTON "&Começo...",IDC_STYLEFORE,181,201,46,14
PUSHBUTTON "&Término...",IDC_STYLEBACK,232,201,46,14
PUSHBUTTON "&Fonte...",IDC_STYLEFONT,283,201,42,14
- PUSHBUTTON "&Pré-visualizar",IDC_PREVIEW,330,201,42,14
+ PUSHBUTTON "&Pré-visualizar",IDC_PREVIEW,329,201,44,14
PUSHBUTTON "&Redefinir",IDC_STYLEDEFAULT,377,201,42,14
PUSHBUTTON "",IDC_PREVSTYLE,426,201,15,14,BS_BITMAP
PUSHBUTTON "",IDC_NEXTSTYLE,445,201,15,14,BS_BITMAP
@@ -340,7 +340,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,71,150,10
CONTROL "&Alerta nas indentações inconsistentes.",IDC_WARN_INCONSISTENT_INDENTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,83,150,10
- CONTROL "&Detecção automática de Tabulações ou indentações por Espaços.",IDC_AUTO_DETECT_INDENTS,
+ CONTROL "&Detecção automát. de Tabulações ou indent. por espaços.",IDC_AUTO_DETECT_INDENTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,182,10
DEFPUSHBUTTON "OK",IDOK,137,7,50,14
PUSHBUTTON "Cancelar",IDCANCEL,137,27,50,14
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index f95ea709d..405fc8728 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -317,7 +317,7 @@ use \\; para definir um nome de arquivo que corresponda ao padrão:\r\n\
Formato de estilo:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\
-As propriedades do estilo podem ser copiada usando copiar e colar ou arrastar e soltar.\
+Propriedades do estilo podem ser copiadas usando copiar/colar ou arrastar/soltar.\
"
END
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4ff3bfd2f..e8a37aad1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta
diff --git a/src/Version.h b/src/Version.h
index d56051847..a8d8999a2 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -74,7 +74,9 @@
#if defined(_MSC_VER)
#if (_MSC_VER == 1928)
- #if (_MSC_FULL_VER >= 192829910)
+ #if (_MSC_FULL_VER >= 192829912)
+ #define VER_CPL MS Visual C++ 2019 v16.9.1
+ #elif (_MSC_FULL_VER >= 192829910)
#define VER_CPL MS Visual C++ 2019 v16.9.0
#elif (_MSC_FULL_VER >= 192829337)
#define VER_CPL MS Visual C++ 2019 v16.8.(5-6)
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 28e2240fa..c824d48c2 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 21
-#define VERSION_REV 309
+#define VERSION_REV 310
#define VERSION_BUILD 1
#define SCINTILLA_VER 446
#define ONIGURUMA_REGEX_VER 6.9.7