From c6a937e25670bfb2b3cab49bf9bbb231b1dad619 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 27 Jul 2020 22:12:23 +0200 Subject: [PATCH 1/3] MUI - Add a new string (Calculate...) and modify string GDI --- language/np3_af_za/menu_af_za.rc | 3 ++- language/np3_be_by/menu_be_by.rc | 3 ++- language/np3_de_de/menu_de_de.rc | 2 +- language/np3_en_gb/menu_en_gb.rc | 3 ++- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_es_es/menu_es_es.rc | 3 ++- language/np3_es_mx/menu_es_mx.rc | 3 ++- language/np3_fr_fr/menu_fr_fr.rc | 3 ++- language/np3_hi_in/menu_hi_in.rc | 7 ++++--- language/np3_hu_hu/menu_hu_hu.rc | 3 ++- language/np3_id_id/menu_id_id.rc | 7 ++++--- language/np3_it_it/menu_it_it.rc | 3 ++- language/np3_ja_jp/menu_ja_jp.rc | 7 ++++--- language/np3_ko_kr/menu_ko_kr.rc | 5 +++-- language/np3_nl_nl/menu_nl_nl.rc | 3 ++- language/np3_pl_pl/menu_pl_pl.rc | 3 ++- language/np3_pt_br/menu_pt_br.rc | 3 ++- language/np3_pt_pt/menu_pt_pt.rc | 3 ++- language/np3_ru_ru/menu_ru_ru.rc | 3 ++- language/np3_sk_sk/menu_sk_sk.rc | 3 ++- language/np3_sv_se/menu_sv_se.rc | 3 ++- language/np3_tr_tr/menu_tr_tr.rc | 7 ++++--- language/np3_vi_vn/menu_vi_vn.rc | 7 ++++--- language/np3_zh_cn/menu_zh_cn.rc | 3 ++- language/np3_zh_tw/menu_zh_tw.rc | 3 ++- 25 files changed, 59 insertions(+), 36 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 060d9f308..6cc31aa62 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "M&aak Notepad3 Toe", IDM_VIEW_ESCEXIT END MENUITEM "Stoor Voor L&opende Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "Ont&hou" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Lewering" BEGIN - MENUITEM "Verstek &GDI (Geen ligature nie)", IDM_SET_RENDER_TECH_DEFAULT MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite &Behou", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "Direct&Write GDI DC", IDM_SET_RENDER_TECH_D2DDC + MENUITEM "&GDI (Geen ligature nie)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectionele" BEGIN diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 915b4c158..581ba3ca8 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Закрыць Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Захоўваць перад запускам прыладаў", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Гісторыя" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Адлюстраванне" BEGIN - MENUITEM "Звычайны &GDI (без лігатураў)", 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 "&GDI (без лігатураў)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "&Накіраванне пісьма" BEGIN diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index d3d4d7025..92f3a8d89 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -454,10 +454,10 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Standard &GDI (keine Ligaturen)", 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 "&GDI (keine Ligaturen)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "&Bidirektional" BEGIN diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index b6c341f84..e1469ce70 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -453,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 7a4afe107..d8716733a 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -454,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index 94ccb377b..4e330a33f 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Salir de Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "&Guardar antes de ejecutar", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calcular Mini-E&xpresiones", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Recordar" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderizado" BEGIN - MENUITEM "Defecto &GDI (sin ligaduras)", 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 "&GDI (sin ligaduras)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "&Bidireccional" BEGIN diff --git a/language/np3_es_mx/menu_es_mx.rc b/language/np3_es_mx/menu_es_mx.rc index a780767ad..b3fde6c8e 100644 --- a/language/np3_es_mx/menu_es_mx.rc +++ b/language/np3_es_mx/menu_es_mx.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Salir de Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "&Guardar antes de ejecutar", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Recordar" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderizado" BEGIN - MENUITEM "Defecto &GDI (sin ligaduras)", 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 "&GDI (sin ligaduras)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "&Bidireccional" BEGIN diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 93e86bbd6..eab83ca65 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Quitter Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Enregistrer &avant d'exécuter", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculer des Mini-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Se souvenir" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Rendu" BEGIN - MENUITEM "Défaut &GDI (pas de 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 "&GDI (pas de ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectionnelle" BEGIN diff --git a/language/np3_hi_in/menu_hi_in.rc b/language/np3_hi_in/menu_hi_in.rc index c834dcb25..684546a88 100644 --- a/language/np3_hi_in/menu_hi_in.rc +++ b/language/np3_hi_in/menu_hi_in.rc @@ -374,7 +374,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END @@ -428,6 +428,7 @@ BEGIN MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -453,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN @@ -512,7 +513,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 0287501b9..c0c369c59 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "Kilé&pés a Notepad3-ból", IDM_VIEW_ESCEXIT END MENUITEM "Eszközök &futtatása előtt mentés", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Emlékezés" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderelés" BEGIN - MENUITEM "Alapértelmezett &GDI (ligatúrák nélkül)", 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 "&GDI (ligatúrák nélkül)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "K&étirányú" BEGIN diff --git a/language/np3_id_id/menu_id_id.rc b/language/np3_id_id/menu_id_id.rc index 17f50ff5f..f191d4d45 100644 --- a/language/np3_id_id/menu_id_id.rc +++ b/language/np3_id_id/menu_id_id.rc @@ -374,7 +374,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END @@ -428,6 +428,7 @@ BEGIN MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -453,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN @@ -512,7 +513,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 2b5767701..907bf39b1 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "Uscire da Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Salva prima di eseguire", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Ricorda" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - 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 + MENUITEM "&GDI (senza legature)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirezionale" BEGIN diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 2afcf76b4..11497ed97 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -415,7 +415,7 @@ BEGIN MENUITEM "自動閉じHTML/XMLタグ(&H)\tCtrl+Shift+H", IDM_VIEW_AUTOCLOSETAGS MENUITEM "単語補完(&U)", IDM_VIEW_AUTOCOMPLETEWORDS MENUITEM "予約語を自動補完(&K)", IDM_VIEW_AUTOCLEXKEYWORDS - MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV + MENUITEM "単語選択を広く(&G)\tCtrl+Alt+A", IDM_VIEW_ACCELWORDNAV MENUITEM "矩形/複数選択時もコメント切替(&C)", IDM_VIEW_EDIT_LINECOMMENT MENUITEM SEPARATOR MENUITEM "単一インスタンスでファイルを開く(&F)", IDM_VIEW_SINGLEFILEINSTANCE @@ -423,11 +423,12 @@ BEGIN MENUITEM "メッセージの効果音をミュート(&B)", IDM_VIEW_MUTE_MESSAGEBEEP POPUP "Escキーの動作(&K)" BEGIN - MENUITEM "なし(&N)", IDM_VIEW_NOESCFUNC + MENUITEM "なし(&N)", IDM_VIEW_NOESCFUNC MENUITEM "最小化(&M)", IDM_VIEW_ESCMINIMIZE MENUITEM "終了(&X)", IDM_VIEW_ESCEXIT END MENUITEM "ツール実行前に保存(&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "履歴の保存(&R)" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "描画方式(&R)" BEGIN - 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 + MENUITEM "GDI (合字未対応)(&G)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "書字方向" BEGIN diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 8305c4ab9..b1bd5debe 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "Notepad3 종료(&X)", IDM_VIEW_ESCEXIT END MENUITEM "도구 실행 전에 저장(&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "기억(&R)" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "렌더링(&R)" BEGIN - MENUITEM "GDI 기본(&G) (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT - MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D + MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D MENUITEM "DirectWrite 유지(&R)", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "GDI DC 직접 쓰기(&W)", IDM_SET_RENDER_TECH_D2DDC + MENUITEM "GDI (합자 없음) (&G)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "양방향" BEGIN diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 1f315146e..3523b0faf 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "A&fsluiten Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "O&pslaan voor uitvoeren", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Berekenen Tiny-E&xpressies", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Onthouden" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Standaard &GDI (geen ligaturen)", 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 "&GDI (geen ligaturen)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectionele" BEGIN diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 93f98406b..76ec91f96 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "Zamknij Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Zapisz przed uruchomieniem narzędzi", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Zapamiętaj" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderowanie" BEGIN - MENUITEM "Domyślne &GDI (bez ligatury)", 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 "&GDI (bez ligatury)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Dwukierunkowa" BEGIN diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc index 2e70dc021..49f443c06 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "S&ai do Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Salvar &Antes de Executar Ferramentas Externas", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Lembrar" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderização" BEGIN - MENUITEM "Padrão &GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT MENUITEM "DirectWrite (&Direct2D)", IDM_SET_RENDER_TECH_D2D MENUITEM "&Reter DirectWrite", IDM_SET_RENDER_TECH_D2DRETAIN MENUITEM "Direct&Write GDI DC", IDM_SET_RENDER_TECH_D2DDC + MENUITEM "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirecional" BEGIN diff --git a/language/np3_pt_pt/menu_pt_pt.rc b/language/np3_pt_pt/menu_pt_pt.rc index 63de08b8b..e730ceee3 100644 --- a/language/np3_pt_pt/menu_pt_pt.rc +++ b/language/np3_pt_pt/menu_pt_pt.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Sair do Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Guardar &antes de executar ferramentas", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "Lemb&rar" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Renderização" BEGIN - MENUITEM "&GDI padrão (sem ligaturas)", 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 "&GDI (sem ligaturas)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidireccional" BEGIN diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 94a7b325a..31980ecd1 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Закрыть Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Сохранять перед запуском инструментов", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&История" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Рендеринг" BEGIN - MENUITEM "Стандартный &GDI (без лигатур)", 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 "&GDI (без лигатур)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Направление письма" BEGIN diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index ed640b2f9..9f03b8c3b 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "&Ukončiť Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Uložiť pred spustením &nástrojov", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Pamätať si" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "&Vykresľovanie" BEGIN - MENUITEM "Predvolené &GDI", 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 "&GDI (bez ligatúr)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Obojsmerne" BEGIN diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 3641687e0..cab065d16 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "Avsluta Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Spara innan verktyg används", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "Kom ihåg" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "Rendering" BEGIN - MENUITEM "Standard &GDI (inga ligaturer)", 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 "&GDI (inga ligaturer)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Dubbelriktad" BEGIN diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 416d34106..6287e31bf 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -374,7 +374,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END @@ -428,6 +428,7 @@ BEGIN MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -453,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN @@ -512,7 +513,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END diff --git a/language/np3_vi_vn/menu_vi_vn.rc b/language/np3_vi_vn/menu_vi_vn.rc index d3e340e41..fc3f93e7d 100644 --- a/language/np3_vi_vn/menu_vi_vn.rc +++ b/language/np3_vi_vn/menu_vi_vn.rc @@ -374,7 +374,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END @@ -428,6 +428,7 @@ BEGIN MENUITEM "E&xit Notepad3", IDM_VIEW_ESCEXIT END MENUITEM "Save &Before Running Tools", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "&Remember" BEGIN @@ -453,10 +454,10 @@ 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 "&GDI (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "Bidirectional" BEGIN @@ -512,7 +513,7 @@ BEGIN MENUITEM "Show &Statusbar", IDM_VIEW_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Load Toolbar Theme...", IDM_VIEW_LOADTHEMETB - MENUITEM "&Customize Toolbar...", IDM_VIEW_CUSTOMIZETB + MENUITEM "&Customise Toolbar...", IDM_VIEW_CUSTOMIZETB MENUITEM "To&ggle Toolbars", IDM_VIEW_TOGGLETB MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB END diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 5ac156830..20998d600 100644 --- a/language/np3_zh_cn/menu_zh_cn.rc +++ b/language/np3_zh_cn/menu_zh_cn.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "退出 Notepad3(&X)", IDM_VIEW_ESCEXIT END MENUITEM "运行工具前先保存(&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "记忆(&R)" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "渲染(&R)" BEGIN - 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 + MENUITEM "GDI（无连字）(&G)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "双向(&B)" BEGIN diff --git a/language/np3_zh_tw/menu_zh_tw.rc b/language/np3_zh_tw/menu_zh_tw.rc index 24e8040f1..7f2bd184d 100644 --- a/language/np3_zh_tw/menu_zh_tw.rc +++ b/language/np3_zh_tw/menu_zh_tw.rc @@ -428,6 +428,7 @@ BEGIN MENUITEM "退出 Notepad3(&X)", IDM_VIEW_ESCEXIT END MENUITEM "執行工具前先儲存(&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS + MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "記憶(&R)" BEGIN @@ -453,10 +454,10 @@ BEGIN BEGIN POPUP "渲染(&R)" BEGIN - 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 + MENUITEM "GDI（無連字）(&G)", IDM_SET_RENDER_TECH_DEFAULT END POPUP "雙向(&B)" BEGIN From 0f6e14a631bcb01c2295c2c776e349eab65890a4 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 27 Jul 2020 22:12:55 +0200 Subject: [PATCH 2/3] + upd: Version files and Changes.txt --- Build/Changes.txt | 2 +- Versions/day.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 87b978b7b..b221ad1a7 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package ===================================================== -Current BETA Version 5.20.724.(build_#) (2020-07-24) +Current BETA Version 5.20.727.(build_#) (2020-07-27) ===================================================== ----------------------------------------------------- diff --git a/Versions/day.txt b/Versions/day.txt index 67adbdb35..5a9a14151 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -724 +727 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index d07e65d9d..da82a5b97 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/VersionEx.h b/src/VersionEx.h index d4c89f739..7a2d49892 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 724 +#define VERSION_REV 727 #define VERSION_BUILD 1 #define SCINTILLA_VER 444 #define ONIGURUMA_REGEX_VER 6.9.5 @@ -16,4 +16,4 @@ #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH BETA -#define VERSION_COMMIT_ID t7820-rk +#define VERSION_COMMIT_ID dkt1-amr From ef08edcae05d1b3515a8900b7117162438e47e77 Mon Sep 17 00:00:00 2001 From: maboroshin <41102508+maboroshin@users.noreply.github.com> Date: Tue, 28 Jul 2020 07:38:23 +0900 Subject: [PATCH 3/3] Translation >Japanese : 2020/Jul TinyExpr --- language/np3_ja_jp/menu_ja_jp.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 11497ed97..e3ad37a48 100644 --- a/language/np3_ja_jp/menu_ja_jp.rc +++ b/language/np3_ja_jp/menu_ja_jp.rc @@ -428,7 +428,7 @@ BEGIN MENUITEM "終了(&X)", IDM_VIEW_ESCEXIT END MENUITEM "ツール実行前に保存(&B)", IDM_VIEW_SAVEBEFORERUNNINGTOOLS - MENUITEM "Calculate Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL + MENUITEM "数式を計算 (TinyExpr)(&X)", IDM_VIEW_EVALTINYEXPRONSEL MENUITEM SEPARATOR POPUP "履歴の保存(&R)" BEGIN