From 0c8fce55e6901a91c5b8624c976fe42fa229c930 Mon Sep 17 00:00:00 2001 From: Liu Hao Date: Fri, 31 May 2019 10:45:40 +0800 Subject: [PATCH 1/8] language/np3_zh_cn: Update translation for zh_CN. Signed-off-by: Liu Hao --- language/np3_zh_cn/strings_zh_cn.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index ee90ea02e..d3fca048b 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ 文件扩展名必须以 ; 隔开。\r\n\ -use \\; to define a filename matching pattern:\r\n\ +使用 \\; 可定义用于匹配文件名的正则表达式：\r\n\ 例如 \\xyz$; 可匹配以 xyz 结尾的文件名（含扩展名）。\r\n\r\n\ 样式格式：\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\ From dbe9bdd6706ab04d11d59ef8dd77b637bf53a109 Mon Sep 17 00:00:00 2001 From: Alex Yashkin Date: Fri, 31 May 2019 11:44:35 +0300 Subject: [PATCH 2/8] be-BY and ru-RU: translated line 288 --- language/np3_be_by/strings_be_by.rc | 2 +- language/np3_ru_ru/strings_ru_ru.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 4ef609351..5702257f4 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ 相瘕眄 羿殡啖 镟獬眄 猁鳇 镟溏咫屙 癯焘嚯囔 ;\r\n\ -use \\; to define a filename matching pattern:\r\n\ +恹赅瘥耱睥忄轹 \\; 赅 恹珥圜 犭铐 踌 羿殡:\r\n\ \\xyz$; => 踌 羿殡 (basename+ext) 'xyz' 磬 赅眦.\r\n\r\n\ 脏痨囹 耱:\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\ diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index bf5b74c95..7e2cb2770 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ 朽聒桊屙 羿殡钼 漕腈睇 猁螯 疣玟咫屙 耔焘铍铎 ;\r\n\ -use \\; to define a filename matching pattern:\r\n\ +桉镱朦珞轵 \\; 潆 铒疱溴脲龛 犭铐 桁屙 羿殡:\r\n\ \\xyz$; => 桁 羿殡 (basename+ext) 'xyz' 觐眦.\r\n\r\n\ 灶痨囹 耱桦:\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\ From 4f21bd262ac605acad5868fc943dae77ab331ffc Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Fri, 31 May 2019 11:55:11 +0200 Subject: [PATCH 3/8] MUI - Updated Italian Translation --- language/np3_it_it/strings_it_it.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index fae2b4cfa..aa9a823c7 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -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 \\; 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\ From 2fcd08de852a69f1c27de064ac464d3f1b74af4c Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Sat, 1 Jun 2019 11:47:12 +0200 Subject: [PATCH 4/8] + chg: move menus "Language" and "Themes" to sub-menu places --- language/np3_en_us/menu_en_us.rc | 6 ++++-- language/np3_en_us/strings_en_us.rc | 2 +- src/Notepad3.c | 5 ++++- src/Styles.c | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 434031b18..c8bf1fe21 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -292,11 +292,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 diff --git a/language/np3_en_us/strings_en_us.rc b/language/np3_en_us/strings_en_us.rc index 26a76c595..13387eb18 100644 --- a/language/np3_en_us/strings_en_us.rc +++ b/language/np3_en_us/strings_en_us.rc @@ -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 diff --git a/src/Notepad3.c b/src/Notepad3.c index b58721516..7acaf60e7 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -567,7 +567,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; } diff --git a/src/Styles.c b/src/Styles.c index 440fa3213..b6c0dc450 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -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); From 7d6f82e275b30a7fa58d95ff327df79d828f0868 Mon Sep 17 00:00:00 2001 From: Derick Payne Date: Sat, 1 Jun 2019 13:18:45 +0200 Subject: [PATCH 5/8] Update strings_af_za.rc --- language/np3_af_za/strings_af_za.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 9acb8167f..5adae632b 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ L阤rnaam uitbreidings moet geskei word deur ;\r\n\ -use \\; to define a filename matching pattern:\r\n\ +gebruik \\; om 'n l阤rnaampasvorm te definieer:\r\n\ \\xyz$; => l阤rname(basisnaam+ext) met 'xyz' vir laaste karakters\r\n\r\n\ Stylformaat:\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\ From 87b1e893a03557ccd5195cd0d90094ca8b4029b4 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 1 Jun 2019 17:43:02 +0200 Subject: [PATCH 6/8] MUI - Rearranging the Language and Theme menus --- language/np3_af_za/menu_af_za.rc | 8 +++++--- language/np3_af_za/strings_af_za.rc | 4 ++-- language/np3_be_by/menu_be_by.rc | 6 ++++-- language/np3_be_by/strings_be_by.rc | 2 +- language/np3_de_de/menu_de_de.rc | 6 ++++-- language/np3_de_de/strings_de_de.rc | 4 ++-- language/np3_en_gb/menu_en_gb.rc | 8 +++++--- language/np3_en_gb/strings_en_gb.rc | 4 ++-- language/np3_es_es/menu_es_es.rc | 6 ++++-- language/np3_es_es/strings_es_es.rc | 2 +- language/np3_fr_fr/menu_fr_fr.rc | 8 +++++--- language/np3_fr_fr/strings_fr_fr.rc | 4 ++-- language/np3_hu_hu/menu_hu_hu.rc | 6 ++++-- language/np3_hu_hu/strings_hu_hu.rc | 4 ++-- language/np3_it_it/menu_it_it.rc | 8 +++++--- language/np3_it_it/strings_it_it.rc | 4 ++-- language/np3_ja_jp/menu_ja_jp.rc | 10 ++++++---- language/np3_ja_jp/strings_ja_jp.rc | 4 ++-- language/np3_ko_kr/menu_ko_kr.rc | 8 +++++--- language/np3_ko_kr/strings_ko_kr.rc | 2 +- language/np3_nl_nl/menu_nl_nl.rc | 8 +++++--- language/np3_nl_nl/strings_nl_nl.rc | 4 ++-- language/np3_pl_pl/menu_pl_pl.rc | 8 +++++--- language/np3_pl_pl/strings_pl_pl.rc | 6 +++--- language/np3_pt_br/menu_pt_br.rc | 8 +++++--- language/np3_pt_br/strings_pt_br.rc | 4 ++-- language/np3_ru_ru/menu_ru_ru.rc | 6 ++++-- language/np3_ru_ru/strings_ru_ru.rc | 2 +- language/np3_zh_cn/menu_zh_cn.rc | 6 ++++-- language/np3_zh_cn/strings_zh_cn.rc | 2 +- 30 files changed, 96 insertions(+), 66 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 7d860a257..9563b023c 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc index 5adae632b..a30940ac8 100644 --- a/language/np3_af_za/strings_af_za.rc +++ b/language/np3_af_za/strings_af_za.rc @@ -134,7 +134,7 @@ BEGIN IDS_MUI_ERR_UNICODE "Kon nie hierdie Unicode-l阤r omskakel nie. \nData sal verlore wees as die l阤r 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 diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 0cfb99cc3..cdf510737 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -292,11 +292,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 diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc index 5702257f4..40e360291 100644 --- a/language/np3_be_by/strings_be_by.rc +++ b/language/np3_be_by/strings_be_by.rc @@ -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 diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 0ab4824f2..793679639 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -292,11 +292,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 diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index d3b7e40e2..318738a19 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -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 \\; to define a filename matching pattern:\r\n\ +nutze \\; um ein Regular Expression f黵 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\ diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index bf546ee99..147f7abca 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc index 5780f7237..9c8df363f 100644 --- a/language/np3_en_gb/strings_en_gb.rc +++ b/language/np3_en_gb/strings_en_gb.rc @@ -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 diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index e364aebd6..aa009e62b 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -292,11 +292,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 diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc index 0230d3808..95f724f8a 100644 --- a/language/np3_es_es/strings_es_es.rc +++ b/language/np3_es_es/strings_es_es.rc @@ -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醔rica" IDM_THEMES_FILE_ITEM "Ajustes est醤dar" END diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index afe3ceccd..eee1b4999 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -292,11 +292,13 @@ BEGIN END POPUP "&Affichage" BEGIN - POPUP "&Sch鑝e" + POPUP "&Th鑝es" BEGIN + MENUITEM "&Personnaliser les Sch鑝es...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "Sch鑝e Synta&xe...\tF12", IDM_VIEW_SCHEME MENUITEM "&2鑝e D閒aut Sch鑝e\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM "&Personnaliser les Sch鑝es...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "Globale &D閒aut Police...\tAlt+F12", IDM_VIEW_FONT MENUITEM "Actuel Sc&h鑝e D閒aut Police...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END @@ -346,7 +348,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閞er la barre outils...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Charger un th鑝e d'outils...", IDM_VIEW_LOADTHEMETB diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc index 32d799b8b..7981e2218 100644 --- a/language/np3_fr_fr/strings_fr_fr.rc +++ b/language/np3_fr_fr/strings_fr_fr.rc @@ -134,7 +134,7 @@ BEGIN IDS_MUI_ERR_UNICODE "Erreur lors de la conversion de ce fichier Unicode.\nLes donn閑s seront perdues si le fichier est sauvegard!" IDS_MUI_ERR_BITMAP "Erreur chargement bitmap ""%s"".\nDimensions n閏essaires: %i x %i (largeur >= %i x hauteur)." IDS_MUI_ERR_ELEVATED_RIGHTS - "Erreur lors de l'閘関ation des droits de l'utilisateur!" + "Erreur d'閘関ation des droits de l'utilisateur!" END STRINGTABLE @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "&Langue" - IDS_MUI_MENU_THEMES "&Th鑝es" + IDS_MUI_MENU_THEMES "&Changer de th鑝e" IDM_THEMES_DEFAULT "D閒aut de fabrication" IDM_THEMES_FILE_ITEM "Param鑤res standard" END diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 6f2bef554..4e878e106 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -292,11 +292,13 @@ BEGIN END POPUP "&N閦et" BEGIN - POPUP "&Sz韓kiemel閟" + POPUP "&T閙醟" BEGIN + MENUITEM "Sa&blonok testreszab醩a...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "&Sz韓kiemel閟i sablon...\tF12", IDM_VIEW_SCHEME MENUITEM "&2. sz韓kiem. sablon\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM "Sa&blonok testreszab醩a...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "羖tal醤os bet鹴&pus...\tAlt+F12", IDM_VIEW_FONT MENUITEM "&Jelenlegi sablon alap bet鹴韕usa...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 5b7503742..4aab356eb 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -234,7 +234,7 @@ END STRINGTABLE BEGIN IDS_MUI_MENU_LANGUAGE "N&yelv" - IDS_MUI_MENU_THEMES "&T閙醟" + IDS_MUI_MENU_THEMES "T閙a &v醠t醩a" IDM_THEMES_DEFAULT "Gy醨i 閞t閗" IDM_THEMES_FILE_ITEM "Standard be醠l韙醩ok" END @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ F醞ln関 kiterjeszt閟eket ';'-vel kell elv醠asztani\r\n\ -Haszn醠ja a \\; f醞ln関 minta megad醩醜oz:\r\n\ +haszn醠ja a \\; f醞ln関 minta megad醩醜oz:\r\n\ \\xyz$; => f醞lnevek (n関t 閟 kiterjeszt閟) ahol 'xyz' a v間e.\r\n\r\n\ St韑us form醫um:\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\ diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 2ba67d716..262001cd0 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index aa9a823c7..889db44fe 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -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 diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 2aab5723b..2caacdb1c 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -292,11 +292,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 @@ -346,8 +348,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 diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 18510df57..9ef47f078 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -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 diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 282e26d2e..8a5c0dbc7 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc index 31dbe0d9b..04f38a8bb 100644 --- a/language/np3_ko_kr/strings_ko_kr.rc +++ b/language/np3_ko_kr/strings_ko_kr.rc @@ -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 diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 5a08b8cb7..0d50cd7cf 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc index 656b52fef..56e2c459e 100644 --- a/language/np3_nl_nl/strings_nl_nl.rc +++ b/language/np3_nl_nl/strings_nl_nl.rc @@ -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 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index e5ea8ab95..24c35ed5c 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -292,11 +292,13 @@ BEGIN END POPUP "&Widok" BEGIN - POPUP "&Schemat" + POPUP "&Tematy" BEGIN + MENUITEM "&Dostosuj schematy...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "Schemat sk砤dni...\tF12", IDM_VIEW_SCHEME MENUITEM "&Alternatywny schemat sk砤dni\tShift+F12", IDM_VIEW_USE2NDDEFAULT - MENUITEM "&Dostosuj schematy...\tCtrl+F12", IDM_VIEW_SCHEMECONFIG + MENUITEM SEPARATOR MENUITEM "Domy渓na czcionka...\tAlt+F12", IDM_VIEW_FONT MENUITEM "Domy渓na czcionka bie抗cego schematu...\tCtrl+Alt+F12", IDM_VIEW_CURRENTSCHEME END @@ -346,7 +348,7 @@ BEGIN END POPUP "&Pasek narz阣zi" BEGIN - MENUITEM "Poka pasek narz阣zi", IDM_VIEW_TOOLBAR + MENUITEM "&Poka pasek narz阣zi", IDM_VIEW_TOOLBAR MENUITEM "Prze彻cz pasek narz阣zi", IDM_VIEW_TOGGLETB MENUITEM "Dostosuj pasek narz阣zi...", IDM_VIEW_CUSTOMIZETB MENUITEM "&Za砤duj motyw paska narz阣zi...", IDM_VIEW_LOADTHEMETB diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index d84983d93..bd6d505d5 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -134,7 +134,7 @@ BEGIN IDS_MUI_ERR_UNICODE "B彻d podczas kodowania pliku Unicode.\nDane zostan utracone je渓i plik zapisano!" IDS_MUI_ERR_BITMAP "B彻d podczas 砤dowania 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陑yk" + IDS_MUI_MENU_THEMES "&Prze彻cz motyw" IDM_THEMES_DEFAULT "Factory Default" IDM_THEMES_FILE_ITEM "Standard Settings" END diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index ecc97ff40..56c747e38 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -292,11 +292,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 @@ -346,7 +348,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 diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc index db43da901..6402ba1c0 100644 --- a/language/np3_pt_br/strings_pt_br.rc +++ b/language/np3_pt_br/strings_pt_br.rc @@ -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 diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index c0dcdef56..30a71ae65 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -292,11 +292,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 diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc index 7e2cb2770..6a6ce9d63 100644 --- a/language/np3_ru_ru/strings_ru_ru.rc +++ b/language/np3_ru_ru/strings_ru_ru.rc @@ -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 diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index de8b66fcb..83bdf73fc 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -292,11 +292,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 diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index d3fca048b..bb6befd7a 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -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 From 12b0cee6019e6439ca338d2885a04216e72a82bf Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 1 Jun 2019 18:11:25 +0200 Subject: [PATCH 7/8] Update Changes.txt --- Build/Changes.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 8164dc3d2..884d5d8e6 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -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: From d38749c42a1006a0a6f1351d97e69030409c9a9e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 1 Jun 2019 21:11:50 +0200 Subject: [PATCH 8/8] MUI - Correction typo in hu-HU --- language/np3_hu_hu/strings_hu_hu.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc index 4aab356eb..96040dd05 100644 --- a/language/np3_hu_hu/strings_hu_hu.rc +++ b/language/np3_hu_hu/strings_hu_hu.rc @@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\ IDS_MUI_STYLEEDIT_HELP "\ F醞ln関 kiterjeszt閟eket ';'-vel kell elv醠asztani\r\n\ -haszn醠ja a \\; f醞ln関 minta megad醩醜oz:\r\n\ +haszn醠ja a \\; f醞ln関 minta megad醩醜oz:\r\n\ \\xyz$; => f醞lnevek (n関t 閟 kiterjeszt閟) ahol 'xyz' a v間e.\r\n\r\n\ St韑us form醫um:\r\n\ font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\