diff --git a/Build/Changes.txt b/Build/Changes.txt
index 2f05d2dd2..e2124febb 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
========================================================
-Current BETA/RC Version 5.21.924.(build_#) (2021-09-24)
+Current BETA/RC Version 5.21.925.(build_#) (2021-09-25)
========================================================
--------------------------------------------------------
@@ -65,6 +65,7 @@ CHANGES Versions in Tools or Libraries:
FIXES:
--------------------------------------------------------
[.###.#]- .
+[.925.1]- Correction of some wrong keyboard shortcut (Alt+ Up, Alt+ Down).
[.924.1]- Translucency (alpha) settings for white-space indicator.
[.915.1]- Dark mode aware auto-completion-list-box.
[.915.1]- Goto-Dialog: digit grouping of line/column numbers.
diff --git a/Versions/day.txt b/Versions/day.txt
index 0dac14917..ced7b1ba5 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-924
+925
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 9443c689e..4c4f6b2b7 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -178,12 +178,12 @@ BEGIN
END
POPUP "&Lyne"
BEGIN
- MENUITEM "Skuif &Op\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Skuif &Af\tCtrl+Shiftt+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Skuif &Op\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Skuif &Af\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
- MENUITEM "Sny Seleks&ie of Huidige Lyn\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "Sny Seleksie Hele &Lyn(e)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
- MENUITEM "&Kopieer Seleksie of Huidige Lyn\tCtrl+C", IDM_EDIT_COPY
+ MENUITEM "Sny Seleks&ie of Huidige Lyn\tCtrl+X", IDM_EDIT_CUT
+ MENUITEM "Sny Seleksie Hele &Lyn(e)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "&Kopieer Seleksie of Huidige Lyn\tCtrl+C", IDM_EDIT_COPY
MENUITEM "Kopiee&r Seleksie Hele Lyn(e)\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
MENUITEM "&Dupliseer Lyn/Selection\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index fda13a4eb..64a55c8b7 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "Радкі"
BEGIN
- MENUITEM "Перайсці &вышэй\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Перайсці &ніжэй\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Перайсці &вышэй\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Перайсці &ніжэй\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Выразаць вылучэнне &альбо радок\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Выразаць радкі &з вылучэннем\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 3c7afbdd5..aebe25a38 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -182,7 +182,7 @@ BEGIN
MENUITEM "&Runter schieben\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Selekt&ion oder aktuelle Zeile ausschneiden\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "Ganze &Zeilen ausschneiden\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "Ganze &Zeilen ausschneiden\tCtrl+Shift+X", IDM_EDIT_CUTLINE
MENUITEM "&Kopiere Selektion oder aktuelle Zeile\tCtrl+C", IDM_EDIT_COPY
MENUITEM "Kopiere &ganze Zeilen\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
diff --git a/language/np3_es_419/menu_es_419.rc b/language/np3_es_419/menu_es_419.rc
index 17172b91e..b2ddd7b87 100644
--- a/language/np3_es_419/menu_es_419.rc
+++ b/language/np3_es_419/menu_es_419.rc
@@ -169,7 +169,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "P&alabras"
BEGIN
- MENUITEM "&Completar palabra\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
+ MENUITEM "&Completar palabra\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
MENUITEM "Cursor a la izquierda de la pa&labra\tCtrl+ ←", CMD_CTRLLEFT
MENUITEM "Cu&rsor a la derecha de la palabra\tCtrl+ →", CMD_CTRLRIGHT
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "Lí&neas"
BEGIN
- MENUITEM "Mover &hacia arriba\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "&Mover hacia abajo\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mover &hacia arriba\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Mover hacia abajo\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cortar selecc&ión o línea actual\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cortar selección de &línea(s) completa(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -191,7 +191,7 @@ BEGIN
MENUITEM "&Eliminar la línea\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR
MENUITEM "Eliminar la línea a la izquierda\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT
- MENUITEM "Eliminar la línea a la derecha\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
+ MENUITEM "Eliminar la línea a la derecha\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
MENUITEM SEPARATOR
MENUITEM "Columna &ajustada...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP
MENUITEM "Corta&r las líneas\tCtrl+I", IDM_EDIT_SPLITLINES
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index 6b35f2def..fff69ab04 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -169,7 +169,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "P&alabras"
BEGIN
- MENUITEM "&Completar palabra\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
+ MENUITEM "&Completar palabra\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
MENUITEM "Cursor a la izquierda de la pa&labra\tCtrl+ ←", CMD_CTRLLEFT
MENUITEM "Cu&rsor a la derecha de la palabra\tCtrl+ →", CMD_CTRLRIGHT
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "Lí&neas"
BEGIN
- MENUITEM "Mover &hacia arriba\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "&Mover hacia abajo\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mover &hacia arriba\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Mover hacia abajo\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cortar selecc&ión o línea actual\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cortar selección de &línea(s) completa(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -191,7 +191,7 @@ BEGIN
MENUITEM "&Eliminar la línea\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR
MENUITEM "Eliminar la línea a la izquierda\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT
- MENUITEM "Eliminar la línea a la derecha\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
+ MENUITEM "Eliminar la línea a la derecha\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
MENUITEM SEPARATOR
MENUITEM "Columna &ajustada...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP
MENUITEM "Corta&r las líneas\tCtrl+I", IDM_EDIT_SPLITLINES
diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc
index ace6abc79..0a7a445fd 100644
--- a/language/np3_hi_in/menu_hi_in.rc
+++ b/language/np3_hi_in/menu_hi_in.rc
@@ -171,27 +171,27 @@ BEGIN
BEGIN
MENUITEM "पूरा शब्द (&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "कर्सर को शब्द के बाएं ले जाएं (&L)\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "कर्सर को शब्द के बाएं ले जाएं (&L)\tCtrl+ ←", CMD_CTRLLEFT
MENUITEM "कर्सर को शब्द के दाएं ले जाएं (&R)\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "बायाँ शब्द मिटाएं (&D)\tCtrl+Back", CMD_CTRLBACK
- MENUITEM "दायाँ शब्द मिटाएं (&W)\tCtrl+Del", CMD_CTRLDEL
+ MENUITEM "दायाँ शब्द मिटाएं (&W)\tCtrl+Del", CMD_CTRLDEL
END
POPUP "रेखाएं (&L)"
BEGIN
MENUITEM "ऊपर लाएं (&U)\tAlt+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "नीचे लाएं (&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "नीचे लाएं (&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "चुना हुआ या चालू रेखा काटें (&I)\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "चुनी हुई पूरी रेखाएं काटें (&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "चुनी हुई पूरी रेखाएं काटें (&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
MENUITEM "चुना हुआ या चालू रेखा कॉपी करें (&C)\tCtrl+C", IDM_EDIT_COPY
MENUITEM "चुनी हुई सारी रेखाएं कॉपी करें (&Y)\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
- MENUITEM "रेखा/चुनाव की प्रतिलिपि (&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
- MENUITEM "रेखाओं के क्रम की अदला बदली करें (&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE
- MENUITEM "रेखा हटाएं (&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE
+ MENUITEM "रेखा/चुनाव की प्रतिलिपि (&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
+ MENUITEM "रेखाओं के क्रम की अदला बदली करें (&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE
+ MENUITEM "रेखा हटाएं (&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR
MENUITEM "बाईं रेखा मिटाएं (&N)\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT
- MENUITEM "दाईं रेखा मिटाएं (&H)\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
+ MENUITEM "दाईं रेखा मिटाएं (&H)\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
MENUITEM SEPARATOR
MENUITEM "स्तम्भ लपेटें (&W)...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP
MENUITEM "रेखाएं तोड़ें (&S)\tCtrl+I", IDM_EDIT_SPLITLINES
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 905e1d879..7872f4cf3 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "S&orok"
BEGIN
- MENUITEM "Mozgatás &fel\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Mozgatás l&e\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mozgatás &fel\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Mozgatás l&e\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Kijelölés vagy a&ktuális sor kivágása\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Kijelölés &sorainak kivágása\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index cc4bfa34f..b396dcd07 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -178,13 +178,13 @@ BEGIN
END
POPUP "&Righe"
BEGIN
- MENUITEM "Sposta &su\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Sposta &giù\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Sposta &su\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Sposta &giù\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
- MENUITEM "&Taglia selezione o riga corrente\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "Taglia righe intere\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "&Taglia selezione o riga corrente\tCtrl+X", IDM_EDIT_CUT
+ MENUITEM "Taglia righe intere\tCtrl+Shift+X", IDM_EDIT_CUTLINE
MENUITEM "&Copia selezione o riga corrente\tCtrl+C", IDM_EDIT_COPY
- MENUITEM "Copia righe intere\tCtrl+Shift+C", IDM_EDIT_COPYLINE
+ MENUITEM "Copia righe intere\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
MENUITEM "&Duplica riga/selezione\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
MENUITEM "&Trasponi righe\tAlt+D", IDM_EDIT_LINETRANSPOSE
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 62b037bf9..ad024c4fa 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -169,7 +169,7 @@ BEGIN
MENUITEM SEPARATOR
POPUP "単語(&O)"
BEGIN
- MENUITEM "単語補完(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
+ MENUITEM "単語補完(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
MENUITEM "カーソルを単語の左へ(&L)\tCtrl+ ←", CMD_CTRLLEFT
MENUITEM "カーソルを単語の右へ(&R)\tCtrl+ →", CMD_CTRLRIGHT
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "行(&L)"
BEGIN
- MENUITEM "上へ移動(&U)\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "下へ移動(&M)\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "上へ移動(&U)\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "下へ移動(&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "切り取り/選択範囲か行(&I)\tCtrl+X", IDM_EDIT_CUT
MENUITEM "切り取り/選択範囲の行全体(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index db437175a..e1e366ff0 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -173,25 +173,25 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "단어 왼쪽으로 커서 이동(&L)\tCtrl+ ←", CMD_CTRLLEFT
MENUITEM "단어 오른쪽으로 커서 이동(&R)\tCtrl+ →", CMD_CTRLRIGHT
- MENUITEM "왼쪽 단어 삭제(&D)\tCtrl+Back", CMD_CTRLBACK
- MENUITEM "오른쪽 단어 삭제(&W)\tCtrl+Del", CMD_CTRLDEL
+ MENUITEM "왼쪽 단어 삭제(&D)\tCtrl+Back", CMD_CTRLBACK
+ MENUITEM "오른쪽 단어 삭제(&W)\tCtrl+Del", CMD_CTRLDEL
END
POPUP "줄(&I)"
BEGIN
- MENUITEM "위로 이동(&U)\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "아래로 이동(&M)\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "위로 이동(&U)\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "아래로 이동(&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
- MENUITEM "선택 또는 현재 줄 잘라내기(&I)\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "전체 선택 줄 잘라내기(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
- MENUITEM "선택 또는 현재 줄 복사(&C)\tCtrl+C", IDM_EDIT_COPY
- MENUITEM "선택 전체 줄 복사(&W)\tCtrl+Shift+C", IDM_EDIT_COPYLINE
+ MENUITEM "선택 또는 현재 줄 잘라내기(&I)\tCtrl+X", IDM_EDIT_CUT
+ MENUITEM "전체 선택 줄 잘라내기(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "선택 또는 현재 줄 복사(&C)\tCtrl+C", IDM_EDIT_COPY
+ MENUITEM "선택 전체 줄 복사(&W)\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
MENUITEM "줄/선택 복제(&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
- MENUITEM "줄 바꾸기(&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE
- MENUITEM "줄 삭제(&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE
+ MENUITEM "줄 바꾸기(&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE
+ MENUITEM "줄 삭제(&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR
MENUITEM "왼쪽 줄 삭제(&N)\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT
- MENUITEM "오른쪽 줄 삭제(&H)\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
+ MENUITEM "오른쪽 줄 삭제(&H)\tCtrl+Shift+Del", IDM_EDIT_DELETELINERIGHT
MENUITEM SEPARATOR
MENUITEM "열 바꿈(&W)...\tCtrl+Shift+W", IDM_EDIT_COLUMNWRAP
MENUITEM "줄 분할(&S)\tCtrl+I", IDM_EDIT_SPLITLINES
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index d3545d2c1..f81522d0b 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "&Lijnen"
BEGIN
- MENUITEM "Naar &boven verplaatsen\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "&Naar beneden verplaatsen\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Naar &boven verplaatsen\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Naar beneden verplaatsen\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Knipen select&ie of huidige lijn\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Knipen de hele &lijn(en)selectie\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 6b206d70d..4d2cfb72a 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "&Wiersze"
BEGIN
- MENUITEM "Przenieś w górę\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "&Przenieś w dół\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Przenieś w górę\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Przenieś w dół\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Wytnij wybór lub bieżący wiersz\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Wytnij cały wiersz wyboru\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 6cbf00e99..fbc418364 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "&Linhas"
BEGIN
- MENUITEM "Mover para &Cima\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "&Mover para Baixo\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mover para &Cima\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Mover para Baixo\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Recortar Seleç&ão ou Linha Atual\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Recortar Seleção da(s) &Linha(s) Inteira(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index dc5844b15..6b3107360 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "Строки"
BEGIN
- MENUITEM "Перейти &выше\tCtrl+Shift ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Перейти &ниже\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Перейти &выше\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Перейти &ниже\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Вырезать в&ыделение или строку\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Вырезать &строки с выделением\tCtrl+Shift+X", IDM_EDIT_CUTLINE
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 84a645942..9f54ff33d 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "Rader"
BEGIN
- MENUITEM "Flytta upp\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
- MENUITEM "Flytta ner\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Flytta upp\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Flytta ner\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Klipp ut markering eller rad\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Klipp ut markering eller hela rader\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -246,7 +246,7 @@ BEGIN
MENUITEM "Sortera rader...\tAlt+O", IDM_EDIT_SORTLINES
MENUITEM SEPARATOR
MENUITEM "Hoppa till början av markeringen\tCtrl+,", CMD_JUMP2SELSTART
- MENUITEM "Hoppa till slutet av markeringen\tCtrl+,", CMD_JUMP2SELEND
+ MENUITEM "Hoppa till slutet av markeringen\tCtrl+.", CMD_JUMP2SELEND
END
POPUP "Konvertera"
BEGIN
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 6aa6decaf..5b74a6861 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -162,7 +162,7 @@ BEGIN
MENUITEM "Tümünü &Kopyala\tAlt+C", IDM_EDIT_COPYALL
MENUITEM "Tümü&nü Yapıştır\tCtrl+E", IDM_EDIT_COPYADD
MENUITEM "&Yapıştır\tCtrl+V", IDM_EDIT_PASTE
- MENUITEM "D&eğiştir\tCtrl+K", IDM_EDIT_SWAP
+ MENUITEM "D&eğiştir\tCtrl+K", IDM_EDIT_SWAP
MENUITEM "&Sil\tDel", IDM_EDIT_CLEAR
MENUITEM "&Panoyu Temizle", IDM_EDIT_CLEARCLIPBOARD
MENUITEM "&Tümünü Seç\tCtrl+A", IDM_EDIT_SELECTALL
@@ -181,13 +181,13 @@ BEGIN
MENUITEM "Yukarı &Taşı\tAlt+ ↑", IDM_EDIT_MOVELINEUP
MENUITEM "&Ağaşı Taşı\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
- MENUITEM "Seçimi yada Geçerli Satırı K&es\tCtrl+X", IDM_EDIT_CUT
- MENUITEM "T&üm Satır(ları) Kes\tCtrl+Shift+X", IDM_EDIT_CUTLINE
- MENUITEM "&Seçimi veya Geçerli Satırı Kopyala\tCtrl+C", IDM_EDIT_COPY
- MENUITEM "Seçili Olan Tüm Satırları &Kopyala\tCtrl+Shift+C", IDM_EDIT_COPYLINE
+ MENUITEM "Seçimi yada Geçerli Satırı K&es\tCtrl+X", IDM_EDIT_CUT
+ MENUITEM "T&üm Satır(ları) Kes\tCtrl+Shift+X", IDM_EDIT_CUTLINE
+ MENUITEM "&Seçimi veya Geçerli Satırı Kopyala\tCtrl+C", IDM_EDIT_COPY
+ MENUITEM "Seçili Olan Tüm Satırları &Kopyala\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
- MENUITEM "Seçimi/Satırı &Çoğalt\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
- MENUITEM "Satırları &Değiştir\tAlt+D", IDM_EDIT_LINETRANSPOSE
+ MENUITEM "Seçimi/Satırı &Çoğalt\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
+ MENUITEM "Satırları &Değiştir\tAlt+D", IDM_EDIT_LINETRANSPOSE
MENUITEM "Satırı S&il\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR
MENUITEM "İmlecin Sol Tarafını Sil\tCtrl+Shift+Back", IDM_EDIT_DELETELINELEFT
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 200ccc61c..ed85db67b 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "行(&L)"
BEGIN
- MENUITEM "上移行(&U)\tAlt+↑", IDM_EDIT_MOVELINEUP
- MENUITEM "下移行(&M)\tAlt+↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "上移行(&U)\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "下移行(&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "剪切选区或当前行(&I)\tCtrl+X", IDM_EDIT_CUT
MENUITEM "剪切选区所在整行或当前行(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -388,11 +388,11 @@ BEGIN
MENUITEM "启用折叠(&F)", IDM_VIEW_FOLDING
MENUITEM "切换折叠(&T)\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM SEPARATOR
- MENUITEM "跳转到下一折叠点(&N)\tAlt++", CMD_FOLDJUMPDOWN
- MENUITEM "跳转到上一折叠点(&P)\tAlt+-", CMD_FOLDJUMPUP
+ MENUITEM "跳转到下一折叠点(&N)\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "跳转到上一折叠点(&P)\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
- MENUITEM "折叠(&C)\tAlt+←", CMD_FOLDCOLLAPSE
- MENUITEM "展开(&E)\tAlt+→", CMD_FOLDEXPAND
+ MENUITEM "折叠(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "展开(&E)\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "显示(&D)"
BEGIN
diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc
index a8307f22b..05a6268d0 100644
--- a/language/np3_zh_tw/menu_zh_tw.rc
+++ b/language/np3_zh_tw/menu_zh_tw.rc
@@ -178,8 +178,8 @@ BEGIN
END
POPUP "行(&L)"
BEGIN
- MENUITEM "上移一行(&U)\tAlt+↑", IDM_EDIT_MOVELINEUP
- MENUITEM "下移一行(&M)\tAlt+↓", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "上移一行(&U)\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "下移一行(&M)\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "剪下選取區域或目前行(&I)\tCtrl+X", IDM_EDIT_CUT
MENUITEM "剪下選取區域所在整行或目前行(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -388,11 +388,11 @@ BEGIN
MENUITEM "啟用摺疊(&F)", IDM_VIEW_FOLDING
MENUITEM "切換摺疊(&T)\tCtrl+Alt+F", IDM_VIEW_TOGGLEFOLDS
MENUITEM SEPARATOR
- MENUITEM "跳到下一折疊點(&N)\tAlt++", CMD_FOLDJUMPDOWN
- MENUITEM "跳到上一折疊點(&P)\tAlt+-", CMD_FOLDJUMPUP
+ MENUITEM "跳到下一折疊點(&N)\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "跳到上一折疊點(&P)\tAlt+ –", CMD_FOLDJUMPUP
MENUITEM SEPARATOR
- MENUITEM "摺疊(&C)\tAlt+←", CMD_FOLDCOLLAPSE
- MENUITEM "展開(&E)\tAlt+→", CMD_FOLDEXPAND
+ MENUITEM "摺疊(&C)\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "展開(&E)\tAlt+ →", CMD_FOLDEXPAND
END
POPUP "顯示(&D)"
BEGIN
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index b8f9a3e92..a72d2e7f1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 beta
diff --git a/src/VersionEx.h b/src/VersionEx.h
index f53ba6fac..b09f019ad 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 924
+#define VERSION_REV 925
#define VERSION_BUILD 1
#define SCINTILLA_VER 511
#define LEXILLA_VER 511