diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..b8626c4cf 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +4 diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index a83ef6e55..345fefc84 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -447,16 +447,16 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT - MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D - MENUITEM "DirectWrite &Retain", IDM_SET_RENDER_TECH_D2DRETAIN - MENUITEM "Direct&Write GDI DC", IDM_SET_RENDER_TECH_D2DDC + MENUITEM "Default &GDI (senza legature)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D + MENUITEM "DirectWrite &Retain", IDM_SET_RENDER_TECH_D2DRETAIN + MENUITEM "Direct&Write GDI DC", IDM_SET_RENDER_TECH_D2DDC END POPUP "Bidirezionale" BEGIN - MENUITEM "Nessuno", IDM_SET_BIDIRECTIONAL_NONE - MENUITEM "Da SX a DX", IDM_SET_BIDIRECTIONAL_L2R - MENUITEM "Da DX a SX", IDM_SET_BIDIRECTIONAL_R2L + MENUITEM "Nessuno", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "Da SX a DX", IDM_SET_BIDIRECTIONAL_L2R + MENUITEM "Da DX a SX", IDM_SET_BIDIRECTIONAL_R2L END END POPUP "Configurazione &avanzata" diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc index af7a05e45..1be251c16 100644 --- a/language/np3_it_it/strings_it_it.rc +++ b/language/np3_it_it/strings_it_it.rc @@ -146,7 +146,7 @@ BEGIN "Il file ""%s"" non può essere salvato e potrebbe essere protetto.\n\nVuoi aprire %s con diritti amministrativi?" IDS_MUI_ERR_ADMINEXE "Nessun eseguibile di administration trovato.\nControllare https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE - "Sei sicuro di voler aprire questo file grande?\n\t(dimensione: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" + "Sei sicuro di voler aprire questo file grande?\n\t(dimensione: %s >= %s)!\n(Le evidenziature di stile e sintassi non saranno applicate!)" IDS_MUI_ERR_FILE_TOO_LARGE "Impossibile gestire un file così grande (dimensione: %s)!" IDS_MUI_WARN_UNKNOWN_EXT diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 940649a30..3944c204b 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "描画方式(&R)" BEGIN - MENUITEM "標準GDI (&G) (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "標準GDI (合字未対応)(&G)", IDM_SET_RENDER_TECH_DEFAULT MENUITEM "DirectWrite (Direct2D)(&D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite Retain(&R)", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "DirectWrite GDI DC(&W)", IDM_SET_RENDER_TECH_D2DDC diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 9defc242a..20768015a 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "渲染(&R)" BEGIN - MENUITEM "默认 GDI(&G) (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "默认 GDI(无连字)(&G)", IDM_SET_RENDER_TECH_DEFAULT MENUITEM "DirectWrite (Direct2D) (&D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite Retain(&R)", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "DirectWrite GDI DC(&W)", IDM_SET_RENDER_TECH_D2DDC diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc index e2634c5ae..6e693bc90 100644 --- a/language/np3_zh_cn/strings_zh_cn.rc +++ b/language/np3_zh_cn/strings_zh_cn.rc @@ -146,7 +146,7 @@ BEGIN "文件“%s”不能被保存,它可能是受保护的。\n\n是否希望提升 %s 的权限?" IDS_MUI_ERR_ADMINEXE "无管理工具可用。\n\n访问 https://rizonesoft.com/ 看看?" IDS_MUI_WARN_LOAD_BIG_FILE - "是否确实要打开一个如此庞大的文件?\n\t(大小 %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" + "是否确实要打开一个如此庞大的文件?\n\t(大小 %s >= %s)\n样式和语法高亮将被禁用。" IDS_MUI_ERR_FILE_TOO_LARGE "无法处理如此庞大的文件(大小 %s)!" IDS_MUI_WARN_UNKNOWN_EXT diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 72d00d2a0..9735ab2d9 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC2 diff --git a/src/VersionEx.h b/src/VersionEx.h index 7787970d9..0c229b9a7 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 303 -#define VERSION_BUILD 2 +#define VERSION_BUILD 4 #define SCINTILLA_VER 431 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH RC2 -#define VERSION_COMMIT_ID t7820-rk +#define VERSION_COMMIT_ID dkt1-amr