diff --git a/Build/Changes.txt b/Build/Changes.txt
index 5c7d6fc52..4a9bc76a9 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
-Current BETA Version 5.20.202.(build_#) (2020-02-02)
+Current BETA Version 5.20.204.(build_#) (2020-02-04)
=====================================================
-----------------------------------------------------
@@ -50,6 +50,7 @@ NEW:
-----------------------------------------------------
CHANGES:
-----------------------------------------------------
+- Accelerator key remapping: move line up/down vs. jump folds.
- Separate auto esc'd control chars from "transform backslashes" switch in find/replace dialog.
- Increase encoding detection confidence threshold to 92%.
- Finetuning of Single Byte Char Set (SBCS) detection.
@@ -97,6 +98,7 @@ CHANGES:
-----------------------------------------------------
ENHANCEMENT:
-----------------------------------------------------
+- Menu entries for move line and folding control.
- Multi-line Search Find/Replace.
- Apply Start Case to AutoHotkey Lexer.
- Change to 1-pass (file open/close) to save settings in Notepad3.ini.
@@ -107,6 +109,7 @@ ENHANCEMENT:
-----------------------------------------------------
FIXES:
-----------------------------------------------------
+- Slow indentation (TAB/BACKTAB).
- AutoCompletion box.
- Find/Replace Dialog behavior.
- Transform backslashes while pasting into search/replace box.
diff --git a/Versions/build.txt b/Versions/build.txt
index a93fa9c16..8c816bf83 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2721
+2722
diff --git a/doc/KeyboardShortcuts.txt b/doc/KeyboardShortcuts.txt
index ea5790cb6..69fac26ae 100644
--- a/doc/KeyboardShortcuts.txt
+++ b/doc/KeyboardShortcuts.txt
@@ -56,15 +56,16 @@ Keyboard Shortcuts for Notepad3
Char, Word
Ctrl+Space Select word (or line).
+ Ctrl+ ← Cursor Word Left.
+ Ctrl+ → Cursor Word Right.
Ctrl+Backspace Delete word before/left.
Ctrl+Del Delete word after/right.
Ctrl+Tab Insert tabulator.
Lines
- Ctrl+Shift+Space Select line.
- Ctrl+Shift+Up Move line (block) up.
- Ctrl+Shift+Down Move line (block) down.
+ Alt+ ↑ Move line (block) up.
+ Alt+ ↓ Move line (block) down.
Ctrl+D Duplicate line.
Ctrl+Shift+X Cut line.
Ctrl+Shift+C Copy line.
@@ -176,18 +177,22 @@ Keyboard Shortcuts for Notepad3
Ctrl+Shift+V Toggle visual brace matching.
Ctrl+Shift+I Highlight current line.
Ctrl+Shift+F Toggle all folds.
+ Alt+ + Jump Next Fold.
+ Alt+ – Jump Prev Fold.
+ Alt+ ← Collapse Fold.
+ Alt+ → Expand Fold.
Zoom
- Ctrl++ Zoom in.
- Ctrl+- Zoom out.
+ Ctrl+ + Zoom in.
+ Ctrl+ – Zoom out.
Ctrl+0 Reset zoom.
Settings
Ctrl+T Tab settings.
- Alt++ Increase limit for long lines.
- Alt+- Decrease limit for long lines.
+ Alt+ + Increase limit for long lines.
+ Alt+ – Decrease limit for long lines.
Ctrl+Shift+H Toggle auto close HTML/XML.
Ctrl+Shift+L Reuse Window.
Alt+T Always on top.
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index ef23c20bf..c409ed01b 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "Voltooi &Woord\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Wyser Woord &Links\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Wyser Woord &Regs\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Wyser Woord &Links\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Wyser Woord &Regs\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Verwyder Woord Links\tCtrl+Back", CMD_CTRLBACK
MENUITEM "V&erwyder Woord Regs\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Lyne"
BEGIN
- MENUITEM "Skuif &Op\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Skuif &Af\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Skuif &Op\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Skuif &Af\tCtrl+Shiftt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Lyn &Nommers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Seleksie &Kantlyne\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "Ver&toning"
+ POPUP "&Folding"
BEGIN
MENUITEM "Kode &Vou", IDM_VIEW_FOLDING
MENUITEM "&Wissel Voue\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "Ver&toning"
+ BEGIN
MENUITEM "Gefokusde Aansig\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoring Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rol na Einde Van Die &Lêer", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoem &In\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoem &Uit\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoem &In\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoem &Uit\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Herstel &Zoem\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Posisie"
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index fdad7eed9..75cd2849c 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Скончыць слова\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Курсор на слове з&лева\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Курсор на слове с&права\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Курсор на слове з&лева\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Курсор на слове с&права\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Выдаліць слова злева\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Выдаліць сл&ова справа\tCtrl+Del", CMD_CTRLDEL
END
POPUP "Радкі"
BEGIN
- MENUITEM "Перайсці &вышэй\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Перайсці &ніжэй\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Перайсці &вышэй\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Перайсці &ніжэй\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Выразаць вылучэнне &альбо радок\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Выразаць радкі &з вылучэннем\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Нумары радкоў\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Водступ для в&ылучэння\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "Пра&цоўная прастора"
+ POPUP "&Folding"
BEGIN
MENUITEM "Згорт&ванне блокаў коду", IDM_VIEW_FOLDING
MENUITEM "Згарнуць/ра&згарнуць блок\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "Пра&цоўная прастора"
+ BEGIN
MENUITEM "Факусаваны прагляд\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Назіранне за фа&йлам", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Пракручваць за мяжу апошняга радка", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "Ма&штаб"
BEGIN
- MENUITEM "Па&вялічыць\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Па&меншыць\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Па&вялічыць\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Па&меншыць\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "&Скінуць\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "Па&зіцыя"
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index bab11d329..7cc631679 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -371,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &Hinein\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom &Heraus\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &Hinein\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom &Heraus\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Zoom zurücksetzen\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index 7d04dd1a3..b0bf25d55 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
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 "Cursor Word &Left\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursor Word &Right\tCtrl+ →", 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\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Move Down\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Display"
+ POPUP "&Folding"
BEGIN
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Display"
+ BEGIN
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
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &In\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom &Out\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &In\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom &Out\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Reset &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index 02c419d9b..afdb8d57c 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -371,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &In\tCtrl+ +", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom &Out\tCtrl+ –", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &In\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom &Out\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Reset &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index a76a3dff3..291af81a0 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "Palabra &completa\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Cursor a la izquierda de la pa&labra\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Cu&rsor a la derecha de la palabra\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Cursor a la izquierda de la pa&labra\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cu&rsor a la derecha de la palabra\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Eliminar la palabra a la izquierda\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Eliminar la &palabra a la derecha\tCtrl+Del", CMD_CTRLDEL
END
POPUP "Lí&neas"
BEGIN
- MENUITEM "Mover &hacia arriba\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "&Mover hacia abajo\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mover &hacia arriba\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Mover hacia abajo\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Números de línea\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selección de&l margen\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "Mos&trar"
+ POPUP "&Folding"
BEGIN
MENUITEM "&Código plegable", IDM_VIEW_FOLDING
MENUITEM "&Alternar pliegues\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "Mos&trar"
+ BEGIN
MENUITEM "Vista enfocada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoreo de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Desplazarse después del final de archivo", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &Acercar\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom A&lejar\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &Acercar\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom A&lejar\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Restablecer el &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Posición"
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index dd3f86755..dbbb304ed 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "Mot &complet\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Curseur à &gauche du mot\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Curseur à &droite du mot\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Curseur à &gauche du mot\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Curseur à &droite du mot\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Supprimer le mot à gauche\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Supprimer le &mot à droite\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Lignes"
BEGIN
- MENUITEM "Déplacement vers le &haut\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "&Déplacement vers le bas\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Déplacement vers le &haut\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Déplacement vers le bas\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Couper sélect&ion ou ligne actuelle\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Couper sélection de &ligne(s) entière(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Numéros de ligne\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Sélection de la &marge\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Afficher"
+ POPUP "&Folding"
BEGIN
MENUITEM "&Code Pliages", IDM_VIEW_FOLDING
MENUITEM "&Alterner Pliages\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Afficher"
+ BEGIN
MENUITEM "Vue Focalisée\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Surveillance de Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Défiler après la fin de fichier", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &avant\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom a&rrière\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &avant\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom a&rrière\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Rétablir le &zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index f8fd83724..506cbf4e6 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Szó kiegészítése\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Kurzor egy szónyit &balra\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Kurzor egy szónyit &jobbra\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Kurzor egy szónyit &balra\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Kurzor egy szónyit &jobbra\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "Szó &törlése balra\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Szó t&örlése jobbra\tCtrl+Del", CMD_CTRLDEL
END
POPUP "S&orok"
BEGIN
- MENUITEM "Mozgatás &fel\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Mozgatás l&e\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mozgatás &fel\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Mozgatás l&e\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Sorok s&záma\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Kijelölési mar&gó\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Megjelenítés"
+ POPUP "&Folding"
BEGIN
MENUITEM "&Kódblokk összecsukás", IDM_VIEW_FOLDING
MENUITEM "Kódblokk &váltás\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Megjelenítés"
+ BEGIN
MENUITEM "Fókuszált nézet\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Naplófájl követése", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Görgetés a fájl vége után is", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Nagyítás"
BEGIN
- MENUITEM "&Nagyítás\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "&Kicsinyítés\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "&Nagyítás\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "&Kicsinyítés\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Nagyítás &visszaállítása\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Pozíció"
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 195c30f79..f66dd9cc1 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Parola completa\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Cursore Parola &SX\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Cursore Parola &DX\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Cursore Parola &SX\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursore Parola &DX\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "Cancella Parola &SX\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Cancella Parola &DX\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Righe"
BEGIN
- MENUITEM "Sposta &su\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Sposta &giù\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Sposta &su\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Sposta &giù\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Numeri di riga\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margine di selezione\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Mostra"
+ POPUP "&Folding"
BEGIN
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Attiva/Disattiva Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Display"
+ BEGIN
MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Scorri oltre la fine del file (EOF)", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "&Zoom avanti\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "&Zoom indietro\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "&Zoom avanti\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "&Zoom indietro\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Reimposta &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Posizione"
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 0ba8692b3..1f023844d 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "単語補完(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "カーソルを単語の左へ(&L)\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "カーソルを単語の右へ(&R)\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "カーソルを単語の左へ(&L)\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "カーソルを単語の右へ(&R)\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "カーソル左の単語を削除(&D)\tCtrl+Back", CMD_CTRLBACK
MENUITEM "カーソル右の単語を削除(&W)\tCtrl+Del", CMD_CTRLDEL
END
POPUP "行(&L)"
BEGIN
- MENUITEM "上へ移動(&U)\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "下へ移動(&M)\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "上へ移動(&U)\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "下へ移動(&M)\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "切り取り/選択範囲か行(&I)\tCtrl+X", IDM_EDIT_CUT
MENUITEM "切り取り/選択範囲の行全体(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "行番号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "行番号の余白(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "折りたたみや表示(&D)"
+ POPUP "&Folding"
BEGIN
MENUITEM "コード折りたたみを表示(&F)", IDM_VIEW_FOLDING
MENUITEM "すべて折りたたみ(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "折りたたみや表示(&D)"
+ BEGIN
MENUITEM "単語一望モード\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "編集制限モード(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "文書の終端以降へスクロール(&S)", IDM_VIEW_SCROLLPASTEOF
@@ -355,15 +364,15 @@ BEGIN
BEGIN
MENUITEM "メニューバーを表示(&M)", IDM_VIEW_MENUBAR
MENUITEM "ツールバーを表示(&T)", IDM_VIEW_TOOLBAR
- MENUITEM "アイコン大小の切替(&G)", IDM_VIEW_TOGGLETB
+ MENUITEM "アイコン大小の切替(&G)", IDM_VIEW_TOGGLETB
MENUITEM "ツールバーの編集(&C)...", IDM_VIEW_CUSTOMIZETB
- MENUITEM "独自アイコンを設定(&L)...", IDM_VIEW_LOADTHEMETB
- MENUITEM "ステータスバーを表示(&S)", IDM_VIEW_STATUSBAR
+ MENUITEM "独自アイコンを設定(&L)...", IDM_VIEW_LOADTHEMETB
+ MENUITEM "ステータスバーを表示(&S)", IDM_VIEW_STATUSBAR
END
POPUP "拡大縮小(&Z)"
BEGIN
- MENUITEM "拡大(&I)\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "縮小(&O)\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "拡大(&I)\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "縮小(&O)\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "拡大縮小リセット(&Z)\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "ウィンドウ位置(&P)"
@@ -373,7 +382,7 @@ BEGIN
MENUITEM "初期化位置として記憶", CMD_SAVEASDEFWINPOS
MENUITEM "記憶した初期化位置を消去", CMD_CLEARSAVEDWINPOS
MENUITEM "最初の位置へ移動\tCtrl+F11", CMD_INITIALWINPOS
- MENUITEM "全画面表示の切替\tF11", CMD_FULLSCRWINPOS
+ MENUITEM "全画面表示の切替\tF11", CMD_FULLSCRWINPOS
MENUITEM "ウィンドウ位置の固定(&P)", IDM_VIEW_STICKYWINPOS
END
END
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index a4e399c4d..0fc7d1329 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "단어 자동 완성(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "단어 왼쪽으로 커서 이동(&L)\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "단어 오른쪽으로 커서 이동(&R)\tCtrl+Right", CMD_CTRLRIGHT
- MENUITEM "왼쪽 단어 삭제(&D)\tCtrl+Back", CMD_CTRLBACK
+ MENUITEM "단어 왼쪽으로 커서 이동(&L)\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "단어 오른쪽으로 커서 이동(&R)\tCtrl+ →", CMD_CTRLRIGHT
+ MENUITEM "왼쪽 단어 삭제(&D)\tCtrl+Back", CMD_CTRLBACK
MENUITEM "오른쪽 단어 삭제(&W)\tCtrl+Del", CMD_CTRLDEL
END
POPUP "줄(&I)"
BEGIN
- MENUITEM "위로 옮김(&U)\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "아래로 옮김(&M)\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "위로 옮김(&U)\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "아래로 옮김(&M)\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "줄 번호(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "선택 영역 여백(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "전시(&D)"
+ POPUP "&Folding"
BEGIN
MENUITEM "코드 접기(&F)", IDM_VIEW_FOLDING
MENUITEM "모든 접기 전환(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "전시(&D)"
+ BEGIN
MENUITEM "집중\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "열람(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "파일 끝 스크롤(&S)", IDM_VIEW_SCROLLPASTEOF
@@ -362,19 +371,19 @@ BEGIN
END
POPUP "확대/축소(&Z)"
BEGIN
- MENUITEM "확대(&I)\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "축소(&O)\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "확대(&I)\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "축소(&O)\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "확대/축소 재설정(&Z)\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "위치(&P)"
BEGIN
- MENUITEM "창 위치 복사\tCtrl+Shift+K", CMD_COPYWINPOS
- MENUITEM "기본 위치에 맞추기\tCtrl+Shift+P", CMD_DEFAULTWINPOS
+ MENUITEM "창 위치 복사\tCtrl+Shift+K", CMD_COPYWINPOS
+ MENUITEM "기본 위치에 맞추기\tCtrl+Shift+P", CMD_DEFAULTWINPOS
MENUITEM "기본 위치로 저장", CMD_SAVEASDEFWINPOS
- MENUITEM "저장된 기본 위치 지우기", CMD_CLEARSAVEDWINPOS
+ MENUITEM "저장된 기본 위치 지우기", CMD_CLEARSAVEDWINPOS
MENUITEM "처음 위치에 맞추기\tCtrl+F11", CMD_INITIALWINPOS
MENUITEM "전체 영역 위치 전환\tF11", CMD_FULLSCRWINPOS
- MENUITEM "창 위치 고정(&P)", IDM_VIEW_STICKYWINPOS
+ MENUITEM "창 위치 고정(&P)", IDM_VIEW_STICKYWINPOS
END
END
POPUP "모양(&P)"
@@ -385,12 +394,12 @@ BEGIN
MENUITEM "&2nd 기본 구성\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM SEPARATOR
MENUITEM "전체 기본 글꼴(&D)...\tAlt+F12", IDM_VIEW_FONT
- MENUITEM "현재 스키마 기본 글꼴(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
+ MENUITEM "현재 스키마 기본 글꼴(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
POPUP "설정(&S)"
BEGIN
MENUITEM "탭을 공백으로 삽입(&S)", IDM_VIEW_TABSASSPACES
- MENUITEM "탭 설정(&T)...\tCtrl+T", IDM_VIEW_TABSETTINGS
+ MENUITEM "탭 설정(&T)...\tCtrl+T", IDM_VIEW_TABSETTINGS
MENUITEM "워드 랩 설정(&W)...", IDM_VIEW_WORDWRAPSETTINGS
MENUITEM "긴 줄 표시 설정(&L)...", IDM_VIEW_LONGLINESETTINGS
MENUITEM "자동 들여쓰기(&D)", IDM_VIEW_AUTOINDENTTEXT
@@ -398,11 +407,11 @@ BEGIN
MENUITEM "자동 단어 완성(&U)", IDM_VIEW_AUTOCOMPLETEWORDS
MENUITEM "Lexer-Key-Words 자동 완성(&K)", IDM_VIEW_AUTOCLEXKEYWORDS
MENUITEM "단어 탐색 가속(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV
- MENUITEM "Enable Line &Comment Block Edit", IDM_VIEW_EDIT_LINECOMMENT
+ MENUITEM "Enable Line &Comment Block Edit", IDM_VIEW_EDIT_LINECOMMENT
MENUITEM SEPARATOR
- MENUITEM "단일 파일 인스턴스(&F)", IDM_VIEW_SINGLEFILEINSTANCE
+ MENUITEM "단일 파일 인스턴스(&F)", IDM_VIEW_SINGLEFILEINSTANCE
MENUITEM "파일 변경 알림(&C)...\tAlt+F5", IDM_VIEW_CHANGENOTIFY
- MENUITEM "메시지 비프음 소거(&B)", IDM_VIEW_MUTE_MESSAGEBEEP
+ MENUITEM "메시지 비프음 소거(&B)", IDM_VIEW_MUTE_MESSAGEBEEP
POPUP "ESC 키 기능(&K)"
BEGIN
MENUITEM "동작 없음(&N)", IDM_VIEW_NOESCFUNC
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 189a7c196..dd5adbc57 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Compleet woord\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Cursor woord &links\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Cursor woord &rechts\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Cursor woord &links\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursor woord &rechts\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Verwijderen woord links\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Verwijderen &woord rechts\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Lijnen"
BEGIN
- MENUITEM "Naar &boven verplaatsen\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "&Naar beneden verplaatsen\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Naar &boven verplaatsen\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Naar beneden verplaatsen\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Lijn &nummers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selectie &marge\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Tonen"
+ POPUP "&Folding"
BEGIN
MENUITEM "Sectie &samenvouwen", IDM_VIEW_FOLDING
MENUITEM "&Toggle vouwen\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Tonen"
+ BEGIN
MENUITEM "Gefocust zicht\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Log &Monitoren", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Scrollen na einde van bes&tand", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "&Inzoomen\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Uitz&oomen\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "&Inzoomen\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Uitz&oomen\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Resetten &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Positie"
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index d691b9f64..0f7e8cf87 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Uzupełnij wyraz\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Kursor przed wyrazem\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Kursor za wyrazem\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Kursor przed wyrazem\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Kursor za wyrazem\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Usuń wyrazy przed kursorem\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Usuń wyrazy za kursorem\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Wiersze"
BEGIN
- MENUITEM "Przenieś w górę\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "&Przenieś w dół\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Przenieś w górę\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Przenieś w dół\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Numery wierszy\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Margines\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Pokaż"
+ POPUP "&Folding"
BEGIN
MENUITEM "Składanie kodu", IDM_VIEW_FOLDING
MENUITEM "&Przełącz składanie kodu\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Pokaż"
+ BEGIN
MENUITEM "Widok skupiony\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Dziennik &monitorowania", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rozszerzony widok końca dokumentu", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Powiększenie"
BEGIN
- MENUITEM "Powiększ\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Pomniejsz\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Powiększ\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Pomniejsz\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Resetuj...\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Położenie"
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 0910cc5dd..18233729d 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "Palavra &Completa\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Cursor a &Esquerda da Palavra\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Cursor a &Direita da Palavra\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Cursor a &Esquerda da Palavra\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursor a &Direita da Palavra\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Apagar Palavra a Esquerda\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Apagar &Palavra a Direita\tCtrl+Del", CMD_CTRLDEL
END
POPUP "&Linhas"
BEGIN
- MENUITEM "Mover para &Cima\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "&Mover para Baixo\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Mover para &Cima\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Mover para Baixo\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Números das Linhas\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "&Margem de Seleção\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Exibir"
+ POPUP "&Folding"
BEGIN
MENUITEM "&Agrupador de Código", IDM_VIEW_FOLDING
MENUITEM "&Alternar Códigos Agrupados\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Exibir"
+ BEGIN
MENUITEM "Visão Focada\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Log de &Monitoramento", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "&Rolagem Passa do Fim do Arquivo", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "&Mais Zoom\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "&Menos Zoom\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "&Mais Zoom\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "&Menos Zoom\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "&Zoom Padrão\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Posição"
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 6589dfdfd..efd298631 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "&Завершить слово\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Курсор на слове &левее\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Курсор на слове &правее\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Курсор на слове &левее\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Курсор на слове &правее\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "&Удалить слово слева\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Удалить слово &справа\tCtrl+Del", CMD_CTRLDEL
END
POPUP "Строки"
BEGIN
- MENUITEM "Перейти &выше\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Перейти &ниже\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Перейти &выше\tCtrl+Shift ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Перейти &ниже\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Вырезать в&ыделение или строку\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Вырезать &строки с выделением\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "&Номера строк\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Отступ в&ыделения\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "Рабо&чая область"
+ POPUP "Р&Folding"
BEGIN
MENUITEM "Свора&чивание блоков кода", IDM_VIEW_FOLDING
MENUITEM "Свернуть/ра&звернуть блок\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Рабо&чая область"
+ BEGIN
MENUITEM "Фокусировка просмотра\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Слежение за фа&йлом", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "Мас&штаб"
BEGIN
- MENUITEM "&Увеличить\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "У&меньшить\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "&Увеличить\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "У&меньшить\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "&Сбросить\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "Поло&жение"
diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc
index f1edefeb2..8e56229eb 100644
--- a/language/np3_sk_sk/menu_sk_sk.rc
+++ b/language/np3_sk_sk/menu_sk_sk.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
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 "Cursor Word &Left\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursor Word &Right\tCtrl+ →", 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\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Move Down\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Display"
+ POPUP "&Folding"
BEGIN
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Display"
+ BEGIN
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
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &In\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom &Out\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &In\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom &Out\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Reset &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc
index 4caceeeeb..b70d13aac 100644
--- a/language/np3_sv_se/menu_sv_se.rc
+++ b/language/np3_sv_se/menu_sv_se.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "Komplettera ord\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "Markör till ord till vänster\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "Markör till ord till höger\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "Markör till ord till vänster\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Markör till ord till höger\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "Radera ord till vänster\tCtrl+Back", CMD_CTRLBACK
MENUITEM "Radera ord till höger\tCtrl+Del", CMD_CTRLDEL
END
POPUP "Rader"
BEGIN
- MENUITEM "Flytta upp\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "Flytta ner\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "Flytta upp\tCtrl+Shift+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "Flytta ner\tCtrl+Shift+ ↓", 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
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Radnummer\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Markeringsmarginal\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "Visa"
+ POPUP "&Folding"
BEGIN
MENUITEM "Ihopvikning av kodsegment", IDM_VIEW_FOLDING
MENUITEM "Växla ihopvikning\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "Visa"
+ BEGIN
MENUITEM "Fokuserad vy\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Rulla förbi slutet av filen", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "Förstoring"
BEGIN
- MENUITEM "Förstora\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Förminska\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Förstora\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Förminska\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Nollställ förstoring\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "Position"
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 8a5e8df3c..91882f83e 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
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 "Cursor Word &Left\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "Cursor Word &Right\tCtrl+ →", 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\tAlt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "&Move Down\tAlt+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "Cut Select&ion or Current Line\tCtrl+X", IDM_EDIT_CUT
MENUITEM "Cut Selection Whole &Line(s)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "Line &Numbers\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "Selection &Margin\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "&Display"
+ POPUP "&Folding"
BEGIN
MENUITEM "Code &Folding", IDM_VIEW_FOLDING
MENUITEM "&Toggle Folds\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "&Display"
+ BEGIN
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
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "&Zoom"
BEGIN
- MENUITEM "Zoom &In\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "Zoom &Out\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "Zoom &In\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "Zoom &Out\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "Reset &Zoom\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "&Position"
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index 57bdad367..481a5e20e 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -160,15 +160,15 @@ BEGIN
BEGIN
MENUITEM "补全单词(&C)\tCtrl+Alt+Enter", IDM_EDIT_COMPLETEWORD
MENUITEM SEPARATOR
- MENUITEM "光标向左跳过一个单词(&L)\tCtrl+Left", CMD_CTRLLEFT
- MENUITEM "光标向右跳过一个单词(&R)\tCtrl+Right", CMD_CTRLRIGHT
+ MENUITEM "光标向左跳过一个单词(&L)\tCtrl+ ←", CMD_CTRLLEFT
+ MENUITEM "光标向右跳过一个单词(&R)\tCtrl+ →", CMD_CTRLRIGHT
MENUITEM "删除光标左边的单词(&D)\tCtrl+Back", CMD_CTRLBACK
MENUITEM "删除光标右边的单词(&W)\tCtrl+Del", CMD_CTRLDEL
END
POPUP "行(&L)"
BEGIN
- MENUITEM "上移行(&U)\tCtrl+Shift+Up", IDM_EDIT_MOVELINEUP
- MENUITEM "下移行(&M)\tCtrl+Shift+Down", IDM_EDIT_MOVELINEDOWN
+ MENUITEM "上移行(&U)\tCtrl+Alt+ ↑", IDM_EDIT_MOVELINEUP
+ MENUITEM "下移行(&M)\tCtrl+Shift+ ↓", IDM_EDIT_MOVELINEDOWN
MENUITEM SEPARATOR
MENUITEM "剪切选区或当前行(&I)\tCtrl+X", IDM_EDIT_CUT
MENUITEM "剪切选区所在整行或当前行(&L)\tCtrl+Shift+X", IDM_EDIT_CUTLINE
@@ -342,10 +342,19 @@ BEGIN
MENUITEM "行号(&N)\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS
MENUITEM "显示边界(&M)\tCtrl+Shift+M", IDM_VIEW_MARGIN
MENUITEM SEPARATOR
- POPUP "显示(&D)"
+ POPUP "&Folding"
BEGIN
MENUITEM "代码折叠(&F)", IDM_VIEW_FOLDING
MENUITEM "切换折叠(&T)\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS
+ MENUITEM SEPARATOR
+ MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN
+ MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP
+ MENUITEM SEPARATOR
+ MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE
+ MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND
+ END
+ POPUP "显示(&D)"
+ BEGIN
MENUITEM "切换聚焦\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "日志监控(&M)", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "允许滚动超过文件尾(&S)", IDM_VIEW_SCROLLPASTEOF
@@ -362,8 +371,8 @@ BEGIN
END
POPUP "缩放(&Z)"
BEGIN
- MENUITEM "放大(&I)\tCtrl++", IDM_VIEW_ZOOMIN
- MENUITEM "缩小(&O)\tCtrl+-", IDM_VIEW_ZOOMOUT
+ MENUITEM "放大(&I)\tCtrl+ +", IDM_VIEW_ZOOMIN
+ MENUITEM "缩小(&O)\tCtrl+ –", IDM_VIEW_ZOOMOUT
MENUITEM "重置缩放(&Z)\tCtrl+0", IDM_VIEW_RESETZOOM
END
POPUP "窗口位置(&P)"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 1f7f14d91..cfde1fe5d 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 BETA
diff --git a/src/EncodingDetection.cpp b/src/EncodingDetection.cpp
index a7f4539ac..2d0c851e8 100644
--- a/src/EncodingDetection.cpp
+++ b/src/EncodingDetection.cpp
@@ -929,7 +929,7 @@ static void _SetEncodingTitleInfo(const char* encodingUCD, cpi_enc_t encUCD, flo
//~}
int const relThreshold = float2int(Settings2.AnalyzeReliableConfidenceLevel * 100.0f);
- const char* rel_fmt = (ucd_conf_perc >= relThreshold) ? " (reliable (%i%%))" : " (NOT reliable(%i%%))";
+ const char* rel_fmt = (ucd_conf_perc >= relThreshold) ? " (reliable (%i%%))" : " (NOT reliable (%i%%))";
StringCchPrintfA(tmpBuf, ARRAYSIZE(tmpBuf), rel_fmt, relThreshold);
StringCchCatA(chEncodingInfo, ARRAYSIZE(chEncodingInfo), tmpBuf);
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 8f1a9658b..bcf34550e 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
-#define VERSION_REV 202
-#define VERSION_BUILD 2721
+#define VERSION_REV 204
+#define VERSION_BUILD 2722
#define SCINTILLA_VER 430
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27