Skip to content

Commit 52b5efa

Browse files
authored
Merge pull request #5819 from RaiKoHoff/dev_master
feat: matching braces (Ctrl+B and with selection Ctrl+Shift+B) inside blocks
2 parents 143e383 + a63ae71 commit 52b5efa

32 files changed

Lines changed: 194 additions & 5 deletions

File tree

language/common_res.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@
267267
#define IDS_MUI_URL_DIR_EXISTS 15065
268268
#define IDS_MUI_URL_FILE_EXISTS 15066
269269
#define IDS_MUI_URL_PATH_NOT_FOUND 15067
270+
#define IDS_MUI_UNMATCHED_BRACE 15068
271+
#define IDS_MUI_NO_ENCLOSING_BRACE 15069
270272

271273
#define IDS_MUI_SB_MARK_ALL_OCC 15500
272274
#define IDS_MUI_SB_TOGGLE_VIEW 15501

language/np3_af_za/strings_af_za.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"URL gespesifiseerde pad nie gevind nie!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Klik om die lêer oop te maak"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klik om skakel in leser oop te maak"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Die behoud van die oorspronklike tydstempel vir lêerveranderings is geaktiveer\nHierdie opsie bly vir hierdie sessie!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Die optredemarkers raak op (Bookmerk/Merk)!"

language/np3_be_by/strings_be_by.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"Азначаны ва URL шлях не знойдзены!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Click, каб адкрыць файл"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click, каб адкрыць спасылку ў браўзеры"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Захоўванне зыходняй часаадзнакі змянення файла ўключана\nГэта опцыя застанецца ўключанай для гэтай сесіі!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Маркеры ўваходжанняў (закладка/падсвечванне) на зыходзе!"

language/np3_de_de/strings_de_de.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"URL spezifizierter Pfad nicht gefunden!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Click um die Datei zu öffnen"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click um die URL im Browser zu öffnen"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Die Speicherung mit originalem Zeitstempel wurde aktiviert\nDiese Option gilt nun für die gesamte Sitzung (Datei)!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Es stehen keine weiteren Fundstellen Markierungen/Lesezeichen mehr zur Verfügung!"

language/np3_el_gr/strings_el_gr.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"Η καθορισμένη διαδρομή URL δεν βρέθηκε!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Κλικ για άνοιγμα του αρχείου"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Κλικ για άνοιγμα του συνδέσμου στον περιηγητή"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Η διατήρηση της αρχικής χρονοσήμανσης μεταβολής του αρχείου είναι ενεργοποιημένη\nΑυτή η επιλογή θα παραμείνει για αυτή την σύνοδο!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Δεν υπάρχουν άλλοι δείκτες εμφάνισης (Σελιδοδείκτης/Επισήμανση)!"

language/np3_en_gb/strings_en_gb.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"URL specified path not found!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Click to open the file"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Preserving original File Modification Timestamp enabled\nThis option will stay for this session!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highlight)!"

language/np3_en_us/strings_en_us.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"URL specified path not found!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Click to open the file"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Preserving original File Modification Timestamp enabled\nThis option will stay for this session!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highlight)!"

language/np3_es_es/strings_es_es.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"¡Ruta especificada por URL no encontrada!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Cliquear para abrir el archivo"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Cliquear para abrir el enlace en navegador"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Conservar la marca de tiempo de modificación del archivo original habilitada\n¡Esta opción permanecerá para esta sesión!"
213215
IDS_MUI_OUT_OFF_OCCMRK "¡No hay más marcadores de ocurrencia (Marcador/Resaltar)!"

language/np3_fi_fi/strings_fi_fi.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"URL määriteltyä polkua ei löydy!"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Avaa tiedosto klikkaamalla"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Avaa linkki selaimessa klikkaamalla"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Alkuperäisen tiedoston muokkausaikaleiman säilyttäminen käytössä\nVaihtoehto säilyy tämän istunnon ajan!"
213215
IDS_MUI_OUT_OFF_OCCMRK "Esiintymämerkit loppumassa (kirjanmerkki/korostus)!"

language/np3_fr_fr/strings_fr_fr.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ BEGIN
208208
"Chemin spécifié par l'URL introuvable !"
209209
IDS_MUI_URL_OPEN_FILE "\nAlt + Clic pour ouvrir le fichier"
210210
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Clic pour ouvrir le lien dans le navigateur"
211+
IDS_MUI_UNMATCHED_BRACE "Unmatched Brace"
212+
IDS_MUI_NO_ENCLOSING_BRACE "No Enclosing Brace"
211213
IDS_MUI_INF_PRSVFILEMODTM
212214
"Préservation de l'horodatage de modification original du fichier activée\nCette option restera active pour cette session !"
213215
IDS_MUI_OUT_OFF_OCCMRK "Il n'y a pas d'autres marqueurs d'occurrence (Signet/Surlignage) !"

0 commit comments

Comments
 (0)