CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-06-02 07:37:38 +02:00
commit e23e8a4877
35 changed files with 115 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Build/Changes.txt
View File

@ -30,7 +30,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
==================================================
Current Version 5.19.529.build RC2 (29 May 2019)
Current Version 5.19.601.build RC2 (1 Juni 2019)
==================================================
--------------------------------------------------
@ -40,6 +40,7 @@ NEW:
--------------------------------------------------
CHANGES:
--------------------------------------------------
- MUI - Rearranging the Language and Themes menus
--------------------------------------------------
ENHANCEMENT:

8
language/np3_af_za/menu_af_za.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Aansig"
BEGIN
POPUP "&Skema"
POPUP "&Temas"
BEGIN
MENUITEM "&Pas Skemas Aan...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Sintakseskema...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2de Verstek Skema\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Pas Skemas Aan...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Globale Standaard Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Huidige Skema se Verstek Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "Nu&tsbalk"
BEGIN
MENUITEM "Wys Nuts&balk", IDM_VIEW_TOOLBAR
MENUITEM "Wys &Nutsbalk", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle Nutsbalk", IDM_VIEW_TOGGLETB
MENUITEM "Pas&maak Nutsbalk...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Laai Toolbar Tema...", IDM_VIEW_LOADTHEMETB

6
language/np3_af_za/strings_af_za.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Kon nie hierdie Unicode-lêer omskakel nie. \nData sal verlore wees as die lêer gestoor word!"
IDS_MUI_ERR_BITMAP "Kon nie bitmap ""%s"" laai nie.\nBenodig afmetings: %i x %i (width >= %i x height)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Fout tydens die verhoging van gebruikersregte!"
"Fout die verhoging van gebruikersregte!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Taal"
IDS_MUI_MENU_THEMES "T&emas"
IDS_MUI_MENU_THEMES "&Skakel Tema"
IDM_THEMES_DEFAULT "Fabriek Verstek"
IDM_THEMES_FILE_ITEM "Standaard Instellings"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Lêernaam uitbreidings moet geskei word deur ;\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
gebruik \\<regex>; om 'n lêernaampasvorm te definieer:\r\n\
\\xyz$; => lêername(basisnaam+ext) met 'xyz' vir laaste karakters\r\n\r\n\
Stylformaat:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

6
language/np3_be_by/menu_be_by.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Âûãëÿä"
BEGIN
POPUP "Ñ&õåìà"
POPUP "&òýìû"
BEGIN
MENUITEM "&Íàëàäû ñòûëÿ¢...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Cõåìà ñ³íòàêñ³ñó...\tF12", IDM_VIEW_SCHEME
MENUITEM "&Äðóãàÿ ïðàäâûçíà÷àíàÿ ñõåìà\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Íàëàäû ñòûëÿ¢...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Àãóëüíû ïðàäâûçíà÷àíû &øðûôò...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "&Ïðàäâûçíà÷àíû øðûôò äëÿ âûáðàíàé ñõåìû...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

4
language/np3_be_by/strings_be_by.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Ìîâà"
IDS_MUI_MENU_THEMES "&Òýìû"
IDS_MUI_MENU_THEMES "&Ïåðàìûêà÷ Òýìû"
IDM_THEMES_DEFAULT "Çàâàäñê³ÿ íàëàäû"
IDM_THEMES_FILE_ITEM "Ñòàíäàðòíûÿ íàëàäû"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Ïàøûðýíí³ ôàéëࢠïàâ³ííû áûöü ïàäçåëåíû ñ³ìâàëàì ;\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
âûêàðûñòî¢âàéöå \\<regex>; êàá âûçíà÷ûöü øàáëîí ³ìÿ ôàéëà:\r\n\
\\xyz$; => ³ìÿ ôàéëà (basename+ext) ç 'xyz' íà êàíöû.\r\n\r\n\
Ôàðìàò ñòûëþ:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

6
language/np3_de_de/menu_de_de.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Ansicht"
BEGIN
POPUP "&Schema"
POPUP "&Themen"
BEGIN
MENUITEM "&Syntax Schemata anpassen...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Standard Synta&x Schema...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2tes Standard Schema\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Syntax Schemata anpassen...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Globaler &Standard Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Aktueller Schema Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

4
language/np3_de_de/strings_de_de.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Sprache"
IDS_MUI_MENU_THEMES "&Farbschema"
IDS_MUI_MENU_THEMES "&Thema Wechseln"
IDM_THEMES_DEFAULT "Fabrik-Vorgaben"
IDM_THEMES_FILE_ITEM "Standard Einstellungen"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Trennung von Dateinamen-Erweiterungen mittels ';'.\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
nutze \\<regex>; um ein Regular Expression für Dateinamen zu definieren:\r\n\
\\xyz$; => Dateinamen(basename+ext) mit 'xyz' am Ende.\r\n\r\n\
Stil-Format:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

8
language/np3_en_gb/menu_en_gb.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&View"
BEGIN
POPUP "&Scheme"
POPUP "&Themes"
BEGIN
MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
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 SEPARATOR
MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB

4
language/np3_en_gb/strings_en_gb.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Error converting this Unicode file.\nData will be lost if the file is saved!"
IDS_MUI_ERR_BITMAP "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Error while elevating user rights!"
"Error elevating user rights!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Language"
IDS_MUI_MENU_THEMES "&Themes"
IDS_MUI_MENU_THEMES "&Switch Theme"
IDM_THEMES_DEFAULT "Factory Default"
IDM_THEMES_FILE_ITEM "Standard Settings"
END

6
language/np3_en_us/menu_en_us.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&View"
BEGIN
POPUP "&Scheme"
POPUP "&Themes"
BEGIN
MENUITEM "&Customize Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Synta&x Scheme...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2nd Default Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Customize Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

2
language/np3_en_us/strings_en_us.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Language"
IDS_MUI_MENU_THEMES "&Themes"
IDS_MUI_MENU_THEMES "&Switch Theme"
IDM_THEMES_DEFAULT "Factory Default"
IDM_THEMES_FILE_ITEM "Standard Settings"
END

6
language/np3_es_es/menu_es_es.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Vista"
BEGIN
POPUP "&Esquema"
POPUP "&Temas"
BEGIN
MENUITEM "&Personalizar Esquemas...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Sintaxis Esquema...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2º Esquema por defecto\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Personalizar Esquemas...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Fuente global por defecto...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Fuente del Esquema &actual por defecto...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

2
language/np3_es_es/strings_es_es.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Idioma"
IDS_MUI_MENU_THEMES "&Temas"
IDS_MUI_MENU_THEMES "&Cambiar tema"
IDM_THEMES_DEFAULT "Defecto de fábrica"
IDM_THEMES_FILE_ITEM "Ajustes estándar"
END

8
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Affichage"
BEGIN
POPUP "&Schème"
POPUP "&Thèmes"
BEGIN
MENUITEM "&Personnaliser les Schèmes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Schème Synta&xe...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2ème Défaut Schème\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Personnaliser les Schèmes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Globale &Défaut Police...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Actuel Sc&hème Défaut Police...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Barre à outils"
BEGIN
MENUITEM "A&fficher la barre à outils", IDM_VIEW_TOOLBAR
MENUITEM "&Afficher la barre à outils", IDM_VIEW_TOOLBAR
MENUITEM "Al&terner la barre à outils", IDM_VIEW_TOGGLETB
MENUITEM "Gérer la barre à outils...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Charger un thème d'outils...", IDM_VIEW_LOADTHEMETB

4
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Erreur lors de la conversion de ce fichier Unicode.\nLes données seront perdues si le fichier est sauvegardé!"
IDS_MUI_ERR_BITMAP "Erreur chargement bitmap ""%s"".\nDimensions nécessaires: %i x %i (largeur >= %i x hauteur)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Erreur lors de l'élévation des droits de l'utilisateur!"
"Erreur d'élévation des droits de l'utilisateur!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Langue"
IDS_MUI_MENU_THEMES "&Thèmes"
IDS_MUI_MENU_THEMES "&Changer de thème"
IDM_THEMES_DEFAULT "Défaut de fabrication"
IDM_THEMES_FILE_ITEM "Paramètres standard"
END

6
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Nézet"
BEGIN
POPUP "&Színkiemelés"
POPUP "&Témák"
BEGIN
MENUITEM "Sa&blonok testreszabása...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Színkiemelési sablon...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2. színkiem. sablon\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "Sa&blonok testreszabása...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Általános betûtí&pus...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "&Jelenlegi sablon alap betûtípusa...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

4
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "N&yelv"
IDS_MUI_MENU_THEMES "&Témák"
IDS_MUI_MENU_THEMES "Téma &váltása"
IDM_THEMES_DEFAULT "Gyári érték"
IDM_THEMES_FILE_ITEM "Standard beállítások"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Fájlnév kiterjesztéseket ';'-vel kell elválasztani\r\n\
Használja a \\<reg.kif.>; fájlnév minta megadásához:\r\n\
használja a \\<regex>; fájlnév minta megadásához:\r\n\
\\xyz$; => fájlnevek (névtõ és kiterjesztés) ahol 'xyz' a vége.\r\n\r\n\
Stílus formátum:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

8
language/np3_it_it/menu_it_it.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Visualizza"
BEGIN
POPUP "&Schema"
POPUP "&Temi"
BEGIN
MENUITEM "&Personalizza Schemi...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Schema Sintassi...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2° Schema di Default\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Personalizza Schemi...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Font Globale di &Default...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Font di Default dello Schema corrente...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Toolbar"
BEGIN
MENUITEM "Mostra Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "Mostra &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "Ca&mbia Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "&Personalizza Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Carica Tema Toolbar...", IDM_VIEW_LOADTHEMETB

6
language/np3_it_it/strings_it_it.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Errore nella conversione di questo file Unicode.\nCi sarà una perdita di dati se salvi il file!"
IDS_MUI_ERR_BITMAP "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Errore durante l'aumento dei diritti utente!"
"Errore di elevazione dei diritti utente!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Lingua"
IDS_MUI_MENU_THEMES "&Temi"
IDS_MUI_MENU_THEMES "&Cambia tema"
IDM_THEMES_DEFAULT "Impostazioni di fabbrica"
IDM_THEMES_FILE_ITEM "Impostazioni standard"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Le estensioni devono essere separate con ';'\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
Usa il backslash (\\) per definire un pattern di riconoscimento filename:\r\n\
\\xyz$; => filenames(basename+ext) with 'xyz' as last chars.\r\n\r\n\
Formato Stile:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

10
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "表示(&V)"
BEGIN
POPUP "配色(&S)"
POPUP "テーマ(&T)"
BEGIN
MENUITEM "配色の編集(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "文書の種類を選択(&X)...\tF12", IDM_VIEW_SCHEME
MENUITEM "標準配色2で表示(&2)\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "配色の編集(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "フォント設定/共通(&D)...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "フォント設定/適用中(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,8 +351,8 @@ BEGIN
END
POPUP "ツールバー(&T)"
BEGIN
MENUITEM "ツールバーを表示(&B)", IDM_VIEW_TOOLBAR
MENUITEM "アイコン大小の切り替え(&G)", IDM_VIEW_TOGGLETB
MENUITEM "ツールバーを表示(&T)", IDM_VIEW_TOOLBAR
MENUITEM "アイコン大小の切り替え(&G)", IDM_VIEW_TOGGLETB
MENUITEM "ツールバーの編集(&C)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "ツールバー用独自アイコンを設定(&L)...", IDM_VIEW_LOADTHEMETB
MENUITEM "ステータスバーを表示(&S)", IDM_VIEW_STATUSBAR

4
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Unicodeへの変換中にエラーが発生しました。\nファイルを保存するとデータが失われるかもしれません。"
IDS_MUI_ERR_BITMAP "ビットマップファイルの読み込みエラー: %s\n必要な寸法: %i x %i (横幅 >= %i x 高さ)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Error elevating user rights!"
"ユーザー権限の昇格エラー。"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "言語(&L)"
IDS_MUI_MENU_THEMES "テーマ(&T)"
IDS_MUI_MENU_THEMES "テーマを切り替える(&S)"
IDM_THEMES_DEFAULT "初期設定"
IDM_THEMES_FILE_ITEM "標準設定"
END

8
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "보기(&V)"
BEGIN
POPUP "스키마(&S)"
POPUP "테마(&T)"
BEGIN
MENUITEM "스키마 편집(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "구문 스키마(&X)...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2nd 기본 스키마\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "스키마 편집(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "전체 기본 글꼴(&D)...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "현재 스키마 기본 글꼴(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "도구 모음(&T)"
BEGIN
MENUITEM "도구 모음 보이기(&B)", IDM_VIEW_TOOLBAR
MENUITEM "도구 모음 보이기(&T)", IDM_VIEW_TOOLBAR
MENUITEM "도구 모음 전환(&G)", IDM_VIEW_TOGGLETB
MENUITEM "도구 모음 사용자 지정(&U)...", IDM_VIEW_CUSTOMIZETB
MENUITEM "도구 모음 테마 변경(&L)...", IDM_VIEW_LOADTHEMETB

2
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "나라말(&L)"
IDS_MUI_MENU_THEMES "테마(&T)"
IDS_MUI_MENU_THEMES "테마 전환(&S)"
IDM_THEMES_DEFAULT "초기화"
IDM_THEMES_FILE_ITEM "표준 설정"
END

8
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "Beel&d"
BEGIN
POPUP "&Scheme"
POPUP "&Thema's"
BEGIN
MENUITEM "&Aanpassen Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Synta&xis Scheme...\tF12", IDM_VIEW_SCHEME
MENUITEM "&2de Standaard Scheme\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Aanpassen Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Globaal Stan&daard Lettertype...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Actueel Sc&heme Standaard Lettertype...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Werkbalk"
BEGIN
MENUITEM "Werk&balk tonen", IDM_VIEW_TOOLBAR
MENUITEM "&Werkbalk tonen", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle werkbalk", IDM_VIEW_TOGGLETB
MENUITEM "Werkbal&k aanpassen...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Laden een werkbalk thema...", IDM_VIEW_LOADTHEMETB

4
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Fout bij het converteren van dit Unicode bestand.\nGegevens gaan verloren als het bestand wordt opgeslagen!"
IDS_MUI_ERR_BITMAP "Fout bij laden van bitmap ""%s"".\nDimensies nodig: %i x %i (breedte >= %i x hoogte)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Fout tijdens het verhogen van gebruikersrechten!"
"Fout bij het verhogen van gebruikersrechten!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Taal"
IDS_MUI_MENU_THEMES "The&ma's"
IDS_MUI_MENU_THEMES "&Wissel van thema"
IDM_THEMES_DEFAULT "Fabrieksinstelling"
IDM_THEMES_FILE_ITEM "Standaard instellingen"
END

8
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Widok"
BEGIN
POPUP "&Schemat"
POPUP "&Tematy"
BEGIN
MENUITEM "&Dostosuj schematy...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Schemat składni...\tF12", IDM_VIEW_SCHEME
MENUITEM "&Alternatywny schemat składni\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Dostosuj schematy...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Domyślna czcionka...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Domyślna czcionka bieżącego schematu...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Pasek narzędzi"
BEGIN
MENUITEM "Poka¿ pasek narzêdzi", IDM_VIEW_TOOLBAR
MENUITEM "&Poka¿ pasek narzêdzi", IDM_VIEW_TOOLBAR
MENUITEM "Przełącz pasek narzędzi", IDM_VIEW_TOGGLETB
MENUITEM "Dostosuj pasek narzędzi...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Załaduj motyw paska narzędzi...", IDM_VIEW_LOADTHEMETB

6
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "B³¹d podczas kodowania pliku Unicode.\nDane zostan¹ utracone jeœli plik zapisano!"
IDS_MUI_ERR_BITMAP "B³¹d podczas ³adowania mapy bitowej ""%s"".\nWymagany rozmiar: %i x %i (szer. >= %i x wys.)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Error while elevating user rights!"
"Error elevating user rights!"
END
STRINGTABLE
@ -233,8 +233,8 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Language"
IDS_MUI_MENU_THEMES "&Themes"
IDS_MUI_MENU_LANGUAGE "&Jêzyk"
IDS_MUI_MENU_THEMES "&Prze³¹cz motyw"
IDM_THEMES_DEFAULT "Factory Default"
IDM_THEMES_FILE_ITEM "Standard Settings"
END

8
language/np3_pt_br/menu_pt_br.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&View"
BEGIN
POPUP "&Scheme"
POPUP "&Themes"
BEGIN
MENUITEM "&Customise Schemes...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
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 SEPARATOR
MENUITEM "Global &Default Font...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Current Sc&heme's Default Font...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END
@ -349,7 +351,7 @@ BEGIN
END
POPUP "&Toolbar"
BEGIN
MENUITEM "Show Tool&bar", IDM_VIEW_TOOLBAR
MENUITEM "Show &Toolbar", IDM_VIEW_TOOLBAR
MENUITEM "To&ggle Toolbar", IDM_VIEW_TOGGLETB
MENUITEM "C&ustomise Toolbar...", IDM_VIEW_CUSTOMIZETB
MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB

4
language/np3_pt_br/strings_pt_br.rc
View File

@ -134,7 +134,7 @@ BEGIN
IDS_MUI_ERR_UNICODE "Error converting this Unicode file.\nData will be lost if the file is saved!"
IDS_MUI_ERR_BITMAP "Error loading bitmap ""%s"".\nNeed dimensions: %i x %i (width >= %i x height)."
IDS_MUI_ERR_ELEVATED_RIGHTS
"Error while elevating user rights!"
"Error elevating user rights!"
END
STRINGTABLE
@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Language"
IDS_MUI_MENU_THEMES "&Themes"
IDS_MUI_MENU_THEMES "&Switch Theme"
IDM_THEMES_DEFAULT "Factory Default"
IDM_THEMES_FILE_ITEM "Standard Settings"
END

6
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "&Âèä"
BEGIN
POPUP "Ñ&õåìà"
POPUP "&Òåìû"
BEGIN
MENUITEM "&Íàñòðîéêà ñòèëåé...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "&Cõåìà ñèíòàêñèñà...\tF12", IDM_VIEW_SCHEME
MENUITEM "&Âòîðàÿ ñõåìà ïî óìîë÷àíèþ\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "&Íàñòðîéêà ñòèëåé...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "Îáùèé &øðèôò ïî óìîë÷àíèþ...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "Øðèôò ïî óìîë÷àíèþ äëÿ &òåêóùåé ñõåìû...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

4
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "&Язык"
IDS_MUI_MENU_THEMES "&Òåìû"
IDS_MUI_MENU_THEMES "&Переключить Темы"
IDM_THEMES_DEFAULT "Заводские настройки"
IDM_THEMES_FILE_ITEM "Стандартные настройки"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Расширения файлов должны быть разделены символом ;\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
используйте \\<regex>; для определения шаблона имени файла:\r\n\
\\xyz$; => имя файла (basename+ext) с 'xyz' в конце.\r\n\r\n\
Формат стиля:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

6
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -295,11 +295,13 @@ BEGIN
END
POPUP "查看(&V)"
BEGIN
POPUP "语法高亮方案(&S)"
POPUP "主题(&T)"
BEGIN
MENUITEM "自定义语法高亮方案(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "选择语法高亮方案(&X)...\tF12", IDM_VIEW_SCHEME
MENUITEM "使用备选基本样式(&2)\tShift+F12", IDM_VIEW_USE2NDDEFAULT
MENUITEM "自定义语法高亮方案(&C)...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG
MENUITEM SEPARATOR
MENUITEM "全局默认字体(&D)...\tAlt+F12", IDM_VIEW_FONT
MENUITEM "当前方案默认字体(&H)...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME
END

4
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -234,7 +234,7 @@ END
STRINGTABLE
BEGIN
IDS_MUI_MENU_LANGUAGE "语言(&L)"
IDS_MUI_MENU_THEMES "Ö÷Ìâ(&T)"
IDS_MUI_MENU_THEMES "切换主题(&S)"
IDM_THEMES_DEFAULT "工厂默认(&F)"
IDM_THEMES_FILE_ITEM "标准设置(&S)"
END
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
文件扩展名必须以 ; 隔开。\r\n\
use \\<regex>; to define a filename matching pattern:\r\n\
使用 \\<regex>; 可定义用于匹配文件名的正则表达式：\r\n\
例如 \\xyz$; 可匹配以 xyz 结尾的文件名（含扩展名）。\r\n\r\n\
样式格式：\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

5
src/Notepad3.c
View File

@ -709,7 +709,10 @@ static bool _InsertLanguageMenu(HMENU hMenuBar)
int const pos = GetMenuItemCount(hMenuBar) - 1;
if (pos >= 0) {
GetLngString(IDS_MUI_MENU_LANGUAGE, wchMenuItemStrg, COUNTOF(wchMenuItemStrg));
return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
//return InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
bool const res = InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuLanguage, wchMenuItemStrg);
InsertMenu(hMenuBar, IDM_VIEW_TABSASSPACES, MF_BYCOMMAND | MF_SEPARATOR, (UINT_PTR)NULL, NULL);
return res;
}
return false;
}

5
src/Styles.c
View File

@ -259,7 +259,7 @@ void Style_SetIniFile(LPCWSTR szIniFile)
bool Style_InsertThemesMenu(HMENU hMenuBar)
{
HMENU hmenuThemes = CreatePopupMenu();
int const pos = GetMenuItemCount(hMenuBar) - 1;
//int const pos = GetMenuItemCount(hMenuBar) - 1;
GetLngString(Theme_Files[0].rid, Theme_Files[0].szName, COUNTOF(Theme_Files[0].szName));
GetLngString(Theme_Files[1].rid, Theme_Files[1].szName, COUNTOF(Theme_Files[1].szName));
@ -281,7 +281,8 @@ bool Style_InsertThemesMenu(HMENU hMenuBar)
WCHAR wchMenuItemStrg[80] = { L'\0' };
GetLngString(IDS_MUI_MENU_THEMES, wchMenuItemStrg, COUNTOF(wchMenuItemStrg));
bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
//bool const res = InsertMenu(hMenuBar, pos, MF_BYPOSITION | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
bool const res = InsertMenu(hMenuBar, IDM_VIEW_SCHEMECONFIG, MF_BYCOMMAND | MF_POPUP | MF_STRING, (UINT_PTR)hmenuThemes, wchMenuItemStrg);
CheckCmd(hMenuBar, Theme_Files[s_idxSelectedTheme].rid, true);