From 6cda2ebf04324295f495a367a4f8f68ed53d1b30 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 11:40:34 +0100 Subject: [PATCH 1/6] + chg: Add an end file "[~EOF~]" ins *.ini files --- Build/Notepad3.ini | 1 + Build/Themes/Dark.ini | 1 + Build/Themes/Obsidian.ini | 1 + Build/minipath.ini | 1 + 4 files changed, 4 insertions(+) diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini index 0e5598247..c2f408df5 100644 --- a/Build/Notepad3.ini +++ b/Build/Notepad3.ini @@ -151,3 +151,4 @@ SettingsVersion=4 [Recent Files] [Recent Find] [Recent Replace] +[~EOF~] diff --git a/Build/Themes/Dark.ini b/Build/Themes/Dark.ini index d94ea8e34..b89144d5d 100644 --- a/Build/Themes/Dark.ini +++ b/Build/Themes/Dark.ini @@ -713,3 +713,4 @@ Text=fore:#404040 Error=bold; italic; fore:#FFFFFF; back:#FF0000; eolfilled Operator=fore:#333366 [Styles] +[~EOF~] diff --git a/Build/Themes/Obsidian.ini b/Build/Themes/Obsidian.ini index 9e61cb419..73d280779 100644 --- a/Build/Themes/Obsidian.ini +++ b/Build/Themes/Obsidian.ini @@ -713,3 +713,4 @@ Text=fore:#404040 Error=bold; italic; fore:#FFFFFF; back:#FF0000; eolfilled Operator=fore:#333366 [Styles] +[~EOF~] diff --git a/Build/minipath.ini b/Build/minipath.ini index be21017ff..1f39acf6b 100644 --- a/Build/minipath.ini +++ b/Build/minipath.ini @@ -128,3 +128,4 @@ XML Document=*.xml;*.xsl;*.rss;*.svg;*.xul;*.xsd;*.xslt;*.axl;*.rdf;*.xaml;*.vcp ;DDEApplication= ;DDETopic= [Window] +[~EOF~] From 9e54281003675608d2987677eca0da32b4295d9c Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 11:44:51 +0100 Subject: [PATCH 2/6] + chg: Add an end file "[~EOF~]" ins *.ini files --- test/config/Notepad3_distrib.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/test/config/Notepad3_distrib.ini b/test/config/Notepad3_distrib.ini index 266155760..61524ca8d 100644 --- a/test/config/Notepad3_distrib.ini +++ b/test/config/Notepad3_distrib.ini @@ -27,3 +27,4 @@ WebTemplate2= [Recent Replace] [Styles] Use2ndDefaultStyle=0 +[~EOF~] From 12a0dd8a0b6f576c727b74299c12f39c9ac3fb12 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 11:47:00 +0100 Subject: [PATCH 3/6] MUI - Minor translation in for pl-PL --- language/np3_pl_pl/lexer_pl_pl.rc | 80 ++++++++++++++--------------- language/np3_pl_pl/menu_pl_pl.rc | 14 ++--- language/np3_pl_pl/strings_pl_pl.rc | 14 ++--- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/language/np3_pl_pl/lexer_pl_pl.rc b/language/np3_pl_pl/lexer_pl_pl.rc index e04e0b1ae..1d3449bc6 100644 --- a/language/np3_pl_pl/lexer_pl_pl.rc +++ b/language/np3_pl_pl/lexer_pl_pl.rc @@ -330,7 +330,7 @@ BEGIN IDS_LEX_STR_63258 "Typedefs/Classes" IDS_LEX_STR_63259 "Comment Doc" IDS_LEX_STR_63260 "Keyword 2nd" - IDS_LEX_STR_63261 "Error" + IDS_LEX_STR_63261 "Błąd" IDS_LEX_STR_63262 "Mark Occurrences (Indicator)" IDS_LEX_STR_63263 "2nd Mark Occurrences (Indicator)" END @@ -417,64 +417,64 @@ END STRINGTABLE BEGIN - IDS_LEX_STR_63328 "Block Quote" - IDS_LEX_STR_63329 "Strikeout" - IDS_LEX_STR_63330 "Horizontal Rule" + IDS_LEX_STR_63328 "Cytat blokowy" + IDS_LEX_STR_63329 "Wykreślenie" + IDS_LEX_STR_63330 "Linijka pozioma" IDS_LEX_STR_63331 "Link" - IDS_LEX_STR_63332 "Code" - IDS_LEX_STR_63333 "Reference" - IDS_LEX_STR_63334 "Document" - IDS_LEX_STR_63335 "Text" - IDS_LEX_STR_63336 "Standard Operator" - IDS_LEX_STR_63337 "Attribute" - IDS_LEX_STR_63338 "Standard Function" - IDS_LEX_STR_63339 "Standard Package" - IDS_LEX_STR_63340 "Standard Type" - IDS_LEX_STR_63341 "Word" - IDS_LEX_STR_63342 "Verbatim" - IDS_LEX_STR_63343 "Built-In Type" + IDS_LEX_STR_63332 "Kod" + IDS_LEX_STR_63333 "Odsyłacz" + IDS_LEX_STR_63334 "Dokument" + IDS_LEX_STR_63335 "Tekst" + IDS_LEX_STR_63336 "Standardowy Operator" + IDS_LEX_STR_63337 "Atrybut" + IDS_LEX_STR_63338 "Funkcja standardowa" + IDS_LEX_STR_63339 "Standardowy Pakiet" + IDS_LEX_STR_63340 "Standardowy type" + IDS_LEX_STR_63341 "Wyraz" + IDS_LEX_STR_63342 "Dosłowny" + IDS_LEX_STR_63343 "Typ wbudowany" END STRINGTABLE BEGIN - IDS_LEX_STR_63344 "Byte String" - IDS_LEX_STR_63345 "Other Keyword" + IDS_LEX_STR_63344 "Ciąg bajtów" + IDS_LEX_STR_63345 "Inny wyraz" IDS_LEX_STR_63346 "Rust Lifetime" - IDS_LEX_STR_63347 "Object" - IDS_LEX_STR_63348 "Key" + IDS_LEX_STR_63347 "Objekt" + IDS_LEX_STR_63348 "Klucz" IDS_LEX_STR_63349 "HotKey" IDS_LEX_STR_63350 "HotString" IDS_LEX_STR_63351 "HotStringOption" - IDS_LEX_STR_63352 "Inline-IME Color" - IDS_LEX_STR_63353 "2nd Inline-IME Color" - IDS_LEX_STR_63354 "Multi Edit Indicator" - IDS_LEX_STR_63355 "2nd Multi Edit Indicator" - IDS_LEX_STR_63356 "Date-Time" + IDS_LEX_STR_63352 "Inline-IME kolor" + IDS_LEX_STR_63353 "2nd Inline-IME kolor" + IDS_LEX_STR_63354 "Wskaźnik multi edycji" + IDS_LEX_STR_63355 "Drugi wskaźnik multi edycji" + IDS_LEX_STR_63356 "Data-Czas" END STRINGTABLE BEGIN - IDS_LEX_STR_63357 "For Each Definition" + IDS_LEX_STR_63357 "Dla każdej definicji" IDS_LEX_STR_63358 "While Definition" - IDS_LEX_STR_63359 "Math" - IDS_LEX_STR_63360 "Scalar" - IDS_LEX_STR_63361 "Substitution" - IDS_LEX_STR_63362 "Modifier" + IDS_LEX_STR_63359 "Matematyka" + IDS_LEX_STR_63360 "Skalar" + IDS_LEX_STR_63361 "Zastąpienie" + IDS_LEX_STR_63362 "Modyfikator" IDS_LEX_STR_63363 "Tag" END STRINGTABLE BEGIN - IDS_LEX_CSV_COL_0 "Column 0" - IDS_LEX_CSV_COL_1 "Column 1" - IDS_LEX_CSV_COL_2 "Column 2" - IDS_LEX_CSV_COL_3 "Column 3" - IDS_LEX_CSV_COL_4 "Column 4" - IDS_LEX_CSV_COL_5 "Column 5" - IDS_LEX_CSV_COL_6 "Column 6" - IDS_LEX_CSV_COL_7 "Column 7" - IDS_LEX_CSV_COL_8 "Column 8" - IDS_LEX_CSV_COL_9 "Column 9" + IDS_LEX_CSV_COL_0 "Kolumna 0" + IDS_LEX_CSV_COL_1 "Kolumna 1" + IDS_LEX_CSV_COL_2 "Kolumna 2" + IDS_LEX_CSV_COL_3 "Kolumna 3" + IDS_LEX_CSV_COL_4 "Kolumna 4" + IDS_LEX_CSV_COL_5 "Kolumna 5" + IDS_LEX_CSV_COL_6 "Kolumna 6" + IDS_LEX_CSV_COL_7 "Kolumna 7" + IDS_LEX_CSV_COL_8 "Kolumna 8" + IDS_LEX_CSV_COL_9 "Kolumna 9" END #endif // Polish (Poland) resources diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index b1d436bb4..1b495004f 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -199,8 +199,8 @@ BEGIN MENUITEM "&Wcięcie", IDM_EDIT_INDENT MENUITEM "&Bez wcięcia", IDM_EDIT_UNINDENT MENUITEM SEPARATOR - MENUITEM "Jump to Sele&ction Start\tCtrl+,", CMD_JUMP2SELSTART - MENUITEM "Jump to Selectio&n End\tCtrl+.", CMD_JUMP2SELEND + MENUITEM "Skocz na początek wyboru\tCtrl+,", CMD_JUMP2SELSTART + MENUITEM "Skocz na koniec wyboru\tCtrl+.", CMD_JUMP2SELEND MENUITEM SEPARATOR POPUP "&Ujęcie zaznaczenia" BEGIN @@ -345,16 +345,16 @@ BEGIN MENUITEM "Numery wierszy\tCtrl+Shift+N", IDM_VIEW_LINENUMBERS MENUITEM "Margines\tCtrl+Shift+M", IDM_VIEW_MARGIN MENUITEM SEPARATOR - POPUP "&Folding" + POPUP "&Składanie" BEGIN MENUITEM "Składanie kodu", IDM_VIEW_FOLDING MENUITEM "&Przełącz składanie kodu\tCtrl+Shift+F", IDM_VIEW_TOGGLEFOLDS MENUITEM SEPARATOR - MENUITEM "Jump &Next Fold\tAlt+ +", CMD_FOLDJUMPDOWN - MENUITEM "Jump &Prev Fold\tAlt+ –", CMD_FOLDJUMPUP + MENUITEM "Przeskocz do nast.\tAlt+ +", CMD_FOLDJUMPDOWN + MENUITEM "Przeskocz do poprzed.\tAlt+ –", CMD_FOLDJUMPUP MENUITEM SEPARATOR - MENUITEM "&Collapse Fold\tAlt+ ←", CMD_FOLDCOLLAPSE - MENUITEM "&Expand Fold\tAlt+ →", CMD_FOLDEXPAND + MENUITEM "&Zwiń zagięcie\tAlt+ ←", CMD_FOLDCOLLAPSE + MENUITEM "&Rozwiń zagięcie\tAlt+ →", CMD_FOLDEXPAND END POPUP "&Pokaż" BEGIN diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc index 7a7b2f740..0c382d116 100644 --- a/language/np3_pl_pl/strings_pl_pl.rc +++ b/language/np3_pl_pl/strings_pl_pl.rc @@ -97,7 +97,7 @@ END STRINGTABLE BEGIN IDS_MUI_APPTITLE "Notepad3" - IDS_MUI_APPTITLE_ELEVATED "%s (Elevated)" + IDS_MUI_APPTITLE_ELEVATED "%s (Podniesiony)" IDS_MUI_APPTITLE_PASTEBOARD "Notepad3 : Schowek" IDS_MUI_UNTITLED "Bez nazwy" IDS_MUI_TITLEEXCERPT """%s""" @@ -143,12 +143,12 @@ BEGIN IDS_MUI_ERR_UNICODE2 "Niektóre znaki w tym tekście nie są obsługiwane przez wybrane kodowanie, i mogą zostanie zamienione na standardowe znaki po zapisaniu. Zaleca się wybrać inne kodowanie pliku. Kontynuować?" IDS_MUI_ERR_DROP "Tylko jeden plik może być upuszczony w tym samym czasie!" IDS_MUI_ERR_ACCESSDENIED - "Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nDo you want to launch %s as 'Elevated' application?" + "Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nCzy chcesz uruchomić %s jako 'Podniesiony'?" IDS_MUI_ERR_ADMINEXE "Nie znaleziono narzędzia administracyjnego.\nSprawdź stronę https://rizonesoft.com?" IDS_MUI_WARN_LOAD_BIG_FILE - "Czy na pewno chcesz otworzyć ten duży plik?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)" + "Czy na pewno chcesz otworzyć ten duży plik?\n\t(size: %s >= %s)!\n(Projekt i podświetlenie składni nie będzie zastosowane!)" IDS_MUI_ERR_FILE_TOO_LARGE - "Can't handle that huge file (size: %s)!" + "Nie można przetworzyć tego pliku, jest zbyt duży (size: %s)!" IDS_MUI_WARN_UNKNOWN_EXT "Nieznane rozszerzenie nazwy pliku (%s)!\nCzy mimo to załadować?" IDS_MUI_INDENT_CONSISTENT "Ten plik posiada jednolite wcięcie!" @@ -183,8 +183,8 @@ END STRINGTABLE BEGIN - IDS_MUI_RELOADSETTINGS "Activate saved settings by application relaunch?\n\n%s" - IDS_MUI_RELOADCFGSEX "On continuing w/o relaunch, saved settings are not applied and will be overridden by internal settings on program exit!" + IDS_MUI_RELOADSETTINGS "Aktywować zapisane ustawienia uruchamiając aplikację ponownie?\n\n%s" + IDS_MUI_RELOADCFGSEX "Przy kontynuacji bez restartu zapisane ustawienia nie będą używane i zostaną zastąpione przez wewnętrzne ustawienia po wyjściu z programu!" IDS_MUI_EXPORT_FAIL "Błąd podczas eksportowania ustawień styu do ""%s""." IDS_MUI_REGEX_INVALID "Błąd podczas oceny regularnego wyrażenia. Wyrażenie jest nieuzasadnione!" IDS_MUI_DROP_NO_FILE "Nie rozpoznano żadnej sensownej nazwy pliku.\nJeśli upuścisz aplikację 32-bitową,\nprzeciągnij i upuść do paska narzędzi Notepad3'a." @@ -246,7 +246,7 @@ BEGIN IDS_MUI_MENU_THEMES "Wybór &schematów" IDM_THEMES_DEFAULT "Domyślne" IDM_THEMES_FILE_ITEM "Ustawienia standardowe" - IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ," + IDS_MUI_STATUSBAR_PREFIXES "Ln ,kol ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Podn ," IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,," END From decb246159858527a2cd245969978ad6cd1bd21e Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 11:51:47 +0100 Subject: [PATCH 4/6] + chg: Minor correction for accelerator clash in Find/Replace dialog --- language/np3_af_za/dialogs_af_za.rc | 6 +++--- language/np3_es_es/dialogs_es_es.rc | 2 +- language/np3_ja_jp/dialogs_ja_jp.rc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index c5c3ebf9c..2dca91429 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -85,7 +85,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS CAPTION "Vind Teks" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Soekstrin&g:",IDC_STATIC,7,7,46,8 + LTEXT "Soe&kstring:",IDC_STATIC,7,7,46,8 COMBOBOX IDC_FINDTEXT,7,17,202,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "Pas &case",IDC_FINDCASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,37,53,10 CONTROL "Pas slegs die hele &woord aan",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,99,10 @@ -118,7 +118,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS CAPTION "Vervang Teks" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Soekstrin&g:",IDC_STATIC,7,7,46,8 + LTEXT "Soe&kstring:",IDC_STATIC,7,7,46,8 COMBOBOX IDC_FINDTEXT,7,17,202,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Vervang m&et:",IDC_STATIC,7,36,44,8 COMBOBOX IDC_REPLACETEXT,7,47,202,116,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -126,7 +126,7 @@ BEGIN CONTROL "Pas slegs die hele &woord aan",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,99,10 CONTROL "Pas slegs die &begin van die woord aan",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,122,10 CONTROL "&Transformeer terugslag",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 - CONTROL "&Outo Esc Ctrl C&hr", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 135, 102, 85, 10 + CONTROL "Outo Esc Ctrl C&hr", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 135, 102, 85, 10 CONTROL "Gereelde &uitdrukkingssoektog",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,110,10 CONTROL "&Dot pas alles by",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,65,10 CONTROL "&Moenie omdraai nie",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,135,66,75,10 diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index 5b446f16f..6e1c69f37 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -139,7 +139,7 @@ BEGIN PUSHBUTTON "Buscar ante&rior",IDC_FINDPREV,211,23,55,14 PUSHBUTTON "&Reemplazar",IDC_REPLACE,211,43,55,14 PUSHBUTTON "En selección",IDC_REPLACEINSEL,211,59,55,14 - PUSHBUTTON "Reemplazar &todo",IDC_REPLACEALL,211,75,55,14 + PUSHBUTTON "Reemplazar to&do",IDC_REPLACEALL,211,75,55,14 PUSHBUTTON "Alternar textos",IDC_SWAPSTRG,150,32,49,12 PUSHBUTTON "Cerrar",IDCANCEL,211,126,55,14 CONTROL "Ir a Buscar (Ctrl+F)",IDC_TOGGLEFINDREPLACE, diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 9d0243fc7..ce7091ce7 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -91,7 +91,7 @@ BEGIN CONTROL "単語全体が一致(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,89,10 CONTROL "単語の先頭から一致(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,110,10 CONTROL "バックスラッシュを変換(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,73,92,10 - CONTROL "バックスラッシュを付与(&A)", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 73, 85, 10 + CONTROL "バックスラッシュを付与(&U)", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 73, 85, 10 CONTROL "正規表現(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,96,10 CONTROL "ドット(.)を改行にもマッチ(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,96,99,10 CONTROL "再検索しない(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,37,75,10 @@ -126,7 +126,7 @@ BEGIN CONTROL "単語全体が一致(&W)",IDC_FINDWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,89,10 CONTROL "単語の先頭から一致(&B)",IDC_FINDSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,110,10 CONTROL "バックスラッシュを変換(&T)",IDC_FINDTRANSFORMBS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,102,89,10 - CONTROL "バックスラッシュを付与(&A)", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 102, 85, 10 + CONTROL "バックスラッシュを付与(&U)", IDC_FINDAUTOESCCTRLCHR, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 125, 102, 85, 10 CONTROL "正規表現(&E)",IDC_FINDREGEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,114,97,10 CONTROL "ドット(.)を改行にもマッチ(&M)",IDC_DOT_MATCH_ALL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,125,99,10 CONTROL "再検索しない(&D)",IDC_NOWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,66,75,10 From 1131c3154f203a22079e85c7392fbf9d7acd8709 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 12:29:23 +0100 Subject: [PATCH 5/6] MUI - Add " (no ligatures)" in Default GDI --- language/np3_af_za/menu_af_za.rc | 2 +- language/np3_be_by/menu_be_by.rc | 36 ++++++++++++++++---------------- language/np3_de_de/menu_de_de.rc | 2 +- language/np3_en_gb/menu_en_gb.rc | 2 +- language/np3_en_us/menu_en_us.rc | 2 +- language/np3_es_es/menu_es_es.rc | 2 +- language/np3_fr_fr/menu_fr_fr.rc | 2 +- language/np3_hu_hu/menu_hu_hu.rc | 14 ++++++------- language/np3_it_it/menu_it_it.rc | 2 +- language/np3_ja_jp/menu_ja_jp.rc | 2 +- language/np3_ko_kr/menu_ko_kr.rc | 2 +- language/np3_nl_nl/menu_nl_nl.rc | 2 +- language/np3_pl_pl/menu_pl_pl.rc | 8 +++---- language/np3_pt_br/menu_pt_br.rc | 22 +++++++++---------- language/np3_ru_ru/menu_ru_ru.rc | 20 +++++++++--------- language/np3_sk_sk/menu_sk_sk.rc | 2 +- language/np3_sv_se/menu_sv_se.rc | 2 +- language/np3_tr_tr/menu_tr_tr.rc | 2 +- language/np3_zh_cn/menu_zh_cn.rc | 2 +- 19 files changed, 64 insertions(+), 64 deletions(-) diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc index 0d812c76d..04db181f6 100644 --- a/language/np3_af_za/menu_af_za.rc +++ b/language/np3_af_za/menu_af_za.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Lewering" BEGIN - MENUITEM "Verstek &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Verstek &GDI (no ligatures)", 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 diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc index 13b0a601d..bee7dc03a 100644 --- a/language/np3_be_by/menu_be_by.rc +++ b/language/np3_be_by/menu_be_by.rc @@ -425,9 +425,9 @@ BEGIN MENUITEM SEPARATOR POPUP "&Гісторыя" BEGIN - MENUITEM "Захоўваць гісторыю адкрытых &файлаў", IDM_VIEW_NOSAVERECENT - MENUITEM "Аднаўляць пазіцыю &карэткі", IDM_VIEW_NOPRESERVECARET - MENUITEM "Захоўваць пошукавыя &запыты", IDM_VIEW_NOSAVEFINDREPL + MENUITEM "Захоўваць гісторыю адкрытых &файлаў", IDM_VIEW_NOSAVERECENT + MENUITEM "Аднаўляць пазіцыю &карэткі", IDM_VIEW_NOPRESERVECARET + MENUITEM "Захоўваць пошукавыя &запыты", IDM_VIEW_NOSAVEFINDREPL END POPUP "&Акно" BEGIN @@ -447,34 +447,34 @@ 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 (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 END POPUP "&Накіраванне пісьма" BEGIN - MENUITEM "&Няма", IDM_SET_BIDIRECTIONAL_NONE - MENUITEM "&Злева направа", IDM_SET_BIDIRECTIONAL_L2R - MENUITEM "&Справа налева", IDM_SET_BIDIRECTIONAL_R2L + MENUITEM "&Няма", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "&Злева направа", IDM_SET_BIDIRECTIONAL_L2R + MENUITEM "&Справа налева", IDM_SET_BIDIRECTIONAL_R2L END END POPUP "&Пашыраныя налады" BEGIN - MENUITEM "Захоўваць налады падчас &выхаду", IDM_VIEW_SAVESETTINGS - MENUITEM "Захаваць налады &зараз\tF7", IDM_VIEW_SAVESETTINGSNOW - MENUITEM "&Адкрыць файл наладаў\tCtrl+F7", CMD_OPENINIFILE + MENUITEM "Захоўваць налады падчас &выхаду", IDM_VIEW_SAVESETTINGS + MENUITEM "Захаваць налады &зараз\tF7", IDM_VIEW_SAVESETTINGSNOW + MENUITEM "&Адкрыць файл наладаў\tCtrl+F7", CMD_OPENINIFILE END END POPUP "&Даведка" BEGIN - MENUITEM "Дапа&можнік Online\tF1", IDM_HELP_ONLINEDOCUMENTATION + MENUITEM "Дапа&можнік Online\tF1", IDM_HELP_ONLINEDOCUMENTATION MENUITEM SEPARATOR - MENUITEM "&Запусціць інструмент адміністратара...", IDM_HELP_ADMINEXE - MENUITEM "Праверыць &даступныя абнаўленні", IDM_HELP_UPDATEWEBSITE + MENUITEM "&Запусціць інструмент адміністратара...", IDM_HELP_ADMINEXE + MENUITEM "Праверыць &даступныя абнаўленні", IDM_HELP_UPDATEWEBSITE MENUITEM SEPARATOR - MENUITEM "Параметры &камандавага радку...", IDM_HELP_CMD - MENUITEM "&Пра праграму...\tShift+F1", IDM_HELP_ABOUT + MENUITEM "Параметры &камандавага радку...", IDM_HELP_CMD + MENUITEM "&Пра праграму...\tShift+F1", IDM_HELP_ABOUT END END diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc index 739d325af..ce2034c62 100644 --- a/language/np3_de_de/menu_de_de.rc +++ b/language/np3_de_de/menu_de_de.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Standard &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Standard &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 diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc index 0709afe4e..8dc568e0a 100644 --- a/language/np3_en_gb/menu_en_gb.rc +++ b/language/np3_en_gb/menu_en_gb.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI", IDM_SET_RENDER_TECH_DEFAULT + 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 diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc index 5c8b0d50c..ba71f024b 100644 --- a/language/np3_en_us/menu_en_us.rc +++ b/language/np3_en_us/menu_en_us.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI", IDM_SET_RENDER_TECH_DEFAULT + 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 diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc index d74995664..943595d9d 100644 --- a/language/np3_es_es/menu_es_es.rc +++ b/language/np3_es_es/menu_es_es.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Renderizado" BEGIN - MENUITEM "Defecto &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Defecto &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 diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc index 9ab26d95f..3093b7e7c 100644 --- a/language/np3_fr_fr/menu_fr_fr.rc +++ b/language/np3_fr_fr/menu_fr_fr.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendu" BEGIN - MENUITEM "Défaut &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Défaut &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 diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc index 7f1c9f47e..cb65eeda6 100644 --- a/language/np3_hu_hu/menu_hu_hu.rc +++ b/language/np3_hu_hu/menu_hu_hu.rc @@ -447,16 +447,16 @@ BEGIN BEGIN POPUP "&Renderelés" BEGIN - MENUITEM "Alapértelmezett &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 "Alapértelmezett &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 END POPUP "K&étirányú" BEGIN - MENUITEM "Nincs", IDM_SET_BIDIRECTIONAL_NONE - MENUITEM "Balról jobbra", IDM_SET_BIDIRECTIONAL_L2R - MENUITEM "Jobbról balra", IDM_SET_BIDIRECTIONAL_R2L + MENUITEM "Nincs", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "Balról jobbra", IDM_SET_BIDIRECTIONAL_L2R + MENUITEM "Jobbról balra", IDM_SET_BIDIRECTIONAL_R2L END END POPUP "&Haladó konfiguráció" diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc index 0fdeb8d07..a83ef6e55 100644 --- a/language/np3_it_it/menu_it_it.rc +++ b/language/np3_it_it/menu_it_it.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI", IDM_SET_RENDER_TECH_DEFAULT + 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 diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc index 91eeaf576..940649a30 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)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "標準GDI (&G) (no ligatures)", 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_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc index 44e380833..89ee4224b 100644 --- a/language/np3_ko_kr/menu_ko_kr.rc +++ b/language/np3_ko_kr/menu_ko_kr.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "렌더링(&R)" BEGIN - MENUITEM "GDI 기본(&G)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "GDI 기본(&G) (no ligatures)", IDM_SET_RENDER_TECH_DEFAULT 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 diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc index 946e0621f..80c4358cc 100644 --- a/language/np3_nl_nl/menu_nl_nl.rc +++ b/language/np3_nl_nl/menu_nl_nl.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Standaard &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Standaard &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 diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc index 1b495004f..6738e23f1 100644 --- a/language/np3_pl_pl/menu_pl_pl.rc +++ b/language/np3_pl_pl/menu_pl_pl.rc @@ -447,10 +447,10 @@ BEGIN BEGIN POPUP "&Renderowanie" BEGIN - MENUITEM "Domyślne &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 "Domyślne &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 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 1373522da..5e0ca77f9 100644 --- a/language/np3_pt_br/menu_pt_br.rc +++ b/language/np3_pt_br/menu_pt_br.rc @@ -438,25 +438,25 @@ BEGIN MENUITEM "Mostrar &Caminho Completo", IDM_VIEW_SHOWFULLPATH MENUITEM "Extrair &Texto\tCtrl+9", IDM_VIEW_SHOWEXCERPT END - MENUITEM "&Reusar Janela", IDM_VIEW_REUSEWINDOW - MENUITEM "&Sempre no Topo\tAlt+T", IDM_VIEW_ALWAYSONTOP - MENUITEM "Minimi&zar para a Bandeja", IDM_VIEW_MINTOTRAY - MENUITEM "&Modo Transparente\tAlt+G", IDM_VIEW_TRANSPARENT + MENUITEM "&Reusar Janela", IDM_VIEW_REUSEWINDOW + MENUITEM "&Sempre no Topo\tAlt+T", IDM_VIEW_ALWAYSONTOP + MENUITEM "Minimi&zar para a Bandeja", IDM_VIEW_MINTOTRAY + MENUITEM "&Modo Transparente\tAlt+G", IDM_VIEW_TRANSPARENT END POPUP "&Tecnologia" BEGIN POPUP "&Renderização" BEGIN - MENUITEM "Padrão &GDI", 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 "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 END POPUP "Bidirecional" BEGIN - MENUITEM "Nenhum", IDM_SET_BIDIRECTIONAL_NONE - MENUITEM "Esquerda para a Direita", IDM_SET_BIDIRECTIONAL_L2R - MENUITEM "Direita para a Esquerda", IDM_SET_BIDIRECTIONAL_R2L + MENUITEM "Nenhum", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "Esquerda para a Direita", IDM_SET_BIDIRECTIONAL_L2R + MENUITEM "Direita para a Esquerda", IDM_SET_BIDIRECTIONAL_R2L END END POPUP "Configurações &Avançadas" diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc index 7e166b1d3..d5634117a 100644 --- a/language/np3_ru_ru/menu_ru_ru.rc +++ b/language/np3_ru_ru/menu_ru_ru.rc @@ -447,23 +447,23 @@ 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 (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 END POPUP "Направление письма" BEGIN - MENUITEM "Нет", IDM_SET_BIDIRECTIONAL_NONE - MENUITEM "Слева направо", IDM_SET_BIDIRECTIONAL_L2R - MENUITEM "Справа налево", IDM_SET_BIDIRECTIONAL_R2L + MENUITEM "Нет", IDM_SET_BIDIRECTIONAL_NONE + MENUITEM "Слева направо", IDM_SET_BIDIRECTIONAL_L2R + MENUITEM "Справа налево", IDM_SET_BIDIRECTIONAL_R2L END END POPUP "&Расширенные настройки" BEGIN - MENUITEM "Сохранять настройки при &выходе", IDM_VIEW_SAVESETTINGS - MENUITEM "Сохранить настройки &сейчас\tF7", IDM_VIEW_SAVESETTINGSNOW - MENUITEM "&Открыть файл настроек\tCtrl+F7", CMD_OPENINIFILE + MENUITEM "Сохранять настройки при &выходе", IDM_VIEW_SAVESETTINGS + MENUITEM "Сохранить настройки &сейчас\tF7", IDM_VIEW_SAVESETTINGSNOW + MENUITEM "&Открыть файл настроек\tCtrl+F7", CMD_OPENINIFILE END END POPUP "&Справка" diff --git a/language/np3_sk_sk/menu_sk_sk.rc b/language/np3_sk_sk/menu_sk_sk.rc index c80288eec..8696f1251 100644 --- a/language/np3_sk_sk/menu_sk_sk.rc +++ b/language/np3_sk_sk/menu_sk_sk.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI", IDM_SET_RENDER_TECH_DEFAULT + 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 diff --git a/language/np3_sv_se/menu_sv_se.rc b/language/np3_sv_se/menu_sv_se.rc index 1f01474de..1455eaa4f 100644 --- a/language/np3_sv_se/menu_sv_se.rc +++ b/language/np3_sv_se/menu_sv_se.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "Rendering" BEGIN - MENUITEM "Standard &GDI", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "Standard &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 diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc index 26b4eab94..aa5fb1f47 100644 --- a/language/np3_tr_tr/menu_tr_tr.rc +++ b/language/np3_tr_tr/menu_tr_tr.rc @@ -447,7 +447,7 @@ BEGIN BEGIN POPUP "&Rendering" BEGIN - MENUITEM "Default &GDI", IDM_SET_RENDER_TECH_DEFAULT + 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 diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc index 627131e4b..9defc242a 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)", IDM_SET_RENDER_TECH_DEFAULT + MENUITEM "默认 GDI(&G) (no ligatures)", 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 From 869c7c4e34affbfa76a417f58f50902c753d77d1 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Mon, 2 Mar 2020 13:24:42 +0100 Subject: [PATCH 6/6] + upd: versioning files and Changes.txt --- Build/Changes.txt | 30 +- Versions/build.txt | 2 +- .../App/AppInfo/installer_template.ini | 2 +- oniguruma/version.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 6 +- ...awienia.info (Conf=86%) (issue #2035).txt | 5 + .../complex-script-samples (issue #2019).txt | 32 + ...者游戏2.Jumanji.中英双字 (issue #2034).nfo | 665 ++++++++++++++++++ 9 files changed, 737 insertions(+), 9 deletions(-) create mode 100644 test/test_files/encoding/Txtfiles/Ustawienia.info (Conf=86%) (issue #2035).txt create mode 100644 test/test_files/encoding/Txtfiles/complex-script-samples (issue #2019).txt create mode 100644 test/test_files/encoding/Txtfiles/勇敢者游戏2.Jumanji.中英双字 (issue #2034).nfo diff --git a/Build/Changes.txt b/Build/Changes.txt index 6196ee6bd..e8fe1b8f9 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,12 +31,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library ===================================================== -Current RC1 Version 5.20.212.(build_#) (2020-02-12) +Current RC1 Version 5.20.302.(build_#) (2020-03-02) ===================================================== ----------------------------------------------------- NEW: ----------------------------------------------------- +- Automatic scrolling when dragging text near window edge. + Patch by McLoo from https://sourceforge.net/p/scintilla/feature-requests/497/. - Multiple selection on end-of-lines from rectangular selection. - Infos of sreen/display for "Copy Version Info" button. - Preserve stream selection in file history (w/ text position remembering). @@ -51,6 +53,11 @@ NEW: ----------------------------------------------------- CHANGES: ----------------------------------------------------- +- Add an end file "[~EOF~]" ins *.ini files. +- Add file history to to recent docs jumplist. +- AddFileToRecentDocs. +- INI file read/write using synchronous file locking (shared read / exclusive write). +- Reset build-of-the-day number in AppVeyor on new day. - Change version numbering of build_# (the build number is now daily based). - Remove AppVeyors build number, add build-of-the-day number, add short version of commit/local build ID. - Accelerator key remapping: move line up/down vs. jump folds. @@ -95,12 +102,16 @@ CHANGES: - Menu and behavior for copy/paste and copy/paste line. - Allow each modification step to split undo typing sequence (set timeout < 20ms). - Split undo typing sequence (by line-breaks and/or timeout). -- Update Oniguruma Regex (ONI) engine version 6.9.4 (2019/10/31). +- Update Oniguruma Regex (ONI) engine version 6.9.5 (2020/01/28). - Update Scintilla Library (SCI) version 4.3.0 (2020/01/16). ----------------------------------------------------- ENHANCEMENT: ----------------------------------------------------- +- Load files larger than 2GB (64-bit) - Limit to 4GB (Scintilla problems). +- Method to set document for big files. +- ScintillaWin: IMEJPCancelAction (SCI) +- Win file API locking mechanism to avoid multi process file write race conditions. - Menu entries for move line and folding control. - Multi-line Search Find/Replace. - Apply Start Case to AutoHotkey Lexer. @@ -112,6 +123,21 @@ ENHANCEMENT: ----------------------------------------------------- FIXES: ----------------------------------------------------- +- Move hardcoded lexer <-> filename (w/o .ext) associations to configurable scheme (regex def). +- Drag&drop rectangular selection shuffles chars. +- Paint() hangs due to unnecessary LockWindowsUpdate(). +- Drag&drop selection should use configured slop settings. +- Internal file-history submitted to taskbar JumpList +- Load files larger than 2GB (64-bit) - Limit to 4GB (Scintilla problems). +- Automatic scrolling when dragging text near window edge: make caret visible after drop. +- No styling for big/large files (loading speedup and UI responsiveness). +- Esc skip level on rect/multi-selection. +- Avoid caret jump on cancel multi-selection (esc). +- In case of "Transform BS", swallow single slashes not related to a ctrl-char. +- Handling of default settings for deprecated 'SciDirectWriteTech=...' +- Concurrent access to .ini-File (lock file). +- Caret virtual space movement options: remove "SCVS_NOWRAPLINESTART". +- Jump to selection "start/end" operations. - Word lists for LUA Lexer. - Line Comment (Toggle) for NIM Lexer. - Slow indentation (TAB/BACKTAB). diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..00750edc0 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +3 diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini index d7cae479c..ce1251609 100644 --- a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini +++ b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini @@ -151,4 +151,4 @@ TURKISH=true ;PreserveFile1=App\AppName\appnameportableexample.config [FilesToRemove] -;RemoveFile1= \ No newline at end of file +;RemoveFile1= diff --git a/oniguruma/version.txt b/oniguruma/version.txt index c250d84b8..e1e5d1369 100644 --- a/oniguruma/version.txt +++ b/oniguruma/version.txt @@ -1 +1 @@ -6.9.4 +6.9.5 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 1d6b4323b..07cff1cdd 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 da0fba2cd..8e0376623 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,11 +9,11 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 20 #define VERSION_REV 302 -#define VERSION_BUILD 2 +#define VERSION_BUILD 3 #define SCINTILLA_VER 430 -#define ONIGURUMA_REGEX_VER 6.9.4 +#define ONIGURUMA_REGEX_VER 6.9.5 #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 diff --git a/test/test_files/encoding/Txtfiles/Ustawienia.info (Conf=86%) (issue #2035).txt b/test/test_files/encoding/Txtfiles/Ustawienia.info (Conf=86%) (issue #2035).txt new file mode 100644 index 000000000..c0b56007b --- /dev/null +++ b/test/test_files/encoding/Txtfiles/Ustawienia.info (Conf=86%) (issue #2035).txt @@ -0,0 +1,5 @@ + + Wgra plik ustawie "Notepad3.ini" do folderu "C:\Users\Marek\AppData\Roaming\Rizonesoft\Notepad3". + + Poprawiony plik jzykowy "np3lng.dll.mui" - zmieniona opcja w menu "Ustawienia" -> + -> "Przykad pojedyczego pliku" na "Jedna Instancja Pliku". \ No newline at end of file diff --git a/test/test_files/encoding/Txtfiles/complex-script-samples (issue #2019).txt b/test/test_files/encoding/Txtfiles/complex-script-samples (issue #2019).txt new file mode 100644 index 000000000..78f03c405 --- /dev/null +++ b/test/test_files/encoding/Txtfiles/complex-script-samples (issue #2019).txt @@ -0,0 +1,32 @@ +Arabic, RTL: +أنا قادر على أكل الزجاج و هذا لا يؤلمني + +Hebrew, RTL: +אני יכול לאכול זכוכית וזה לא מזיק לי + +Bengali, LTR: +আমি কাঁচ খেতে পারি, তাতে আমার কোনো ক্ষতি হয় না। + +Devanagari, LTR: +मैं काँच खा सकता हूँ और मुझे उससे कोई चोट नहीं पहुंचती + +Tamil, LTR: +நான் கண்ணாடி சாப்பிடுவேன், அதனால் எனக்கு ஒரு கேடும் வராது. + +Telugu, LTR: +నేను గాజు తినగలను మరియు అలా చేసినా నాకు ఏమి ఇబ్బంది లేదు + +Sinhala, LTR: +මට වීදුරු කෑමට හැකියි. එයින් මට කිසි හානියක් සිදු නොවේ. + +Kannada, LTR: +ನನಗೆ ಹಾನಿ ಆಗದೆ, ನಾನು ಗಜನ್ನು ತಿನಬಹುದು + +Khmer, LTR: +ខ្ញុំអាចញុំកញ្ចក់បាន ដោយគ្មានបញ្ហារ + +Lao, LTR: +ຂອ້ຍກິນແກ້ວໄດ້ໂດຍທີ່ມັນບໍ່ໄດ້ເຮັດໃຫ້ຂອ້ຍເຈັບ. + +Thai, LTR: +ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ \ No newline at end of file diff --git a/test/test_files/encoding/Txtfiles/勇敢者游戏2.Jumanji.中英双字 (issue #2034).nfo b/test/test_files/encoding/Txtfiles/勇敢者游戏2.Jumanji.中英双字 (issue #2034).nfo new file mode 100644 index 000000000..116160b05 --- /dev/null +++ b/test/test_files/encoding/Txtfiles/勇敢者游戏2.Jumanji.中英双字 (issue #2034).nfo @@ -0,0 +1,665 @@ + + + + 勇敢者游戏2：再战巅峰 + Jumanji: The Next Level + + + 2019 + + + 6.9 + 87472 + + + 0.0 + 0 + + 四名勇敢者再次穿越回到险象环生的游戏世界中，开启全新冒险。与上次不同的是，变身勇石博士 (道恩·强森 饰) 的是斯潘瑟的外公，外公的好友则变身为语言学家 (凯文· 哈特 饰)，高大威猛的弗里奇变成了中年发福地质学家 (杰克·布莱克 饰)，只有学霸玛莎依旧化身性感打女 (凯伦·吉兰 饰)，斯潘瑟和贝瑟尼却不知所踪。为营救消失的伙伴，四人必须进入全面失控的未知世界，面对难度爆表危险重重的致命关卡，强森领队挑战极限玩命闯关。山崩石裂的险境中命悬一线，与突如其来的凶猛野兽死战到底，他们唯有绷紧神经并肩作战，才能通过生死考验逃出生天。一场惊险刺激又充满惊喜的冒险之旅即将展开！ + 四名勇敢者再次穿越回到险象环生的游戏世界中，开启全新冒险。与上次不同的是，变身勇石博士 (道恩·强森 饰) 的是斯潘瑟的外公，外公的好友则变身为语言学家 (凯文· 哈特 饰)，高大威猛的弗里奇变成了中年发福地质学家 (杰克·布莱克 饰)，只有学霸玛莎依旧化身性感打女 (凯伦·吉兰 饰)，斯潘瑟和贝瑟尼却不知所踪。为营救消失的伙伴，四人必须进入全面失控的未知世界，面对难度爆表危险重重的致命关卡，强森领队挑战极限玩命闯关。山崩石裂的险境中命悬一线，与突如其来的凶猛野兽死战到底，他们唯有绷紧神经并肩作战，才能通过生死考验逃出生天。一场惊险刺激又充满惊喜的冒险之旅即将展开！ + The next level + 123 + https://s2.ax1x.com/2020/02/29/3y1sQs.jpg + + https://s2.ax1x.com/2020/02/29/3y3Vfg.jpg + + Rated PG-13 + US:PG-13 / US:Rated PG-13 + tt7975244 + + + tt7975244 + 美国 + + + 2019-12-13 + false + + + Action + Adventure + Comedy + Fantasy + Matt Tolmach Productions + Seven Bucks Productions + The Detective Agency + Jake Kasdan + Jeff Pinkner + Scott Rosenberg + Chris Van Allsburg + Jake Kasdan + sequel + third-part + shared-universe + christmas + jumanji + + Dwayne Johnson + Bravestone + https://m.media-amazon.com/images/M/MV5BMTkyNDQ3NzAxM15BMl5BanBnXkFtZTgwODIwMTQ0NTE@._UY632.jpg + http://www.imdb.com/name/nm0425005/ + + + Kevin Hart + Mouse + https://m.media-amazon.com/images/M/MV5BMTY4OTAxMjkxN15BMl5BanBnXkFtZTgwODg5MzYyMTE@._UY632.jpg + http://www.imdb.com/name/nm0366389/ + + + Jack Black + Oberon + https://m.media-amazon.com/images/M/MV5BYTFiMWNlNmItMDRiYy00NzA4LWE5YjItZmViNWQ2NzhhOWZlXkEyXkFqcGdeQXVyMTA2Mjc5ODMy._UY632.jpg + http://www.imdb.com/name/nm0085312/ + + + Karen Gillan + Ruby + https://m.media-amazon.com/images/M/MV5BMTQwMDQ0NDk1OV5BMl5BanBnXkFtZTcwNDcxOTExNg@@._UY632.jpg + http://www.imdb.com/name/nm2394794/ + + + Awkwafina + Ming + https://m.media-amazon.com/images/M/MV5BMTU0NTUwNjkyN15BMl5BanBnXkFtZTgwMjM0NzEzMTI@._UY632.jpg + http://www.imdb.com/name/nm5377144/ + + + Nick Jonas + Seaplane + https://m.media-amazon.com/images/M/MV5BMjI2NTI0NjczM15BMl5BanBnXkFtZTgwMDc4NDI1NDM@._UY632.jpg + http://www.imdb.com/name/nm2679917/ + + + Alex Wolff + Spencer + https://m.media-amazon.com/images/M/MV5BNTdiNzc5NmQtM2ZlNS00MTAxLTg2YzAtYzU0NjBjM2JkZDA1XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm1842974/ + + + Morgan Turner + Martha + https://m.media-amazon.com/images/M/MV5BYTQ1ODMwNDYtMTMyMS00ZmViLThhNTEtNWY3OGE5MmVmMzM4XkEyXkFqcGdeQXVyMTczNTU1NDQ@._UY632.jpg + http://www.imdb.com/name/nm2367353/ + + + Madison Iseman + Bethany + https://m.media-amazon.com/images/M/MV5BZTgzN2FhZjgtOWZhOS00ZDdlLThmNDYtMTNlNTc5YzI0YWNhXkEyXkFqcGdeQXVyNDIxNzMxNTc@._UY632.jpg + http://www.imdb.com/name/nm5589690/ + + + Ser'Darius Blain + Fridge + https://m.media-amazon.com/images/M/MV5BNTFhNTc3OWUtMjM5YS00YmYzLWJjMDMtMGI2NDgyNWJlM2YwXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm3843144/ + + + Danny DeVito + Eddie + https://m.media-amazon.com/images/M/MV5BMTE5MjM5MzM3M15BMl5BanBnXkFtZTYwOTEzOTY0._UY632.jpg + http://www.imdb.com/name/nm0000362/ + + + Danny Glover + Milo + https://m.media-amazon.com/images/M/MV5BMTI4ODM2MzQwN15BMl5BanBnXkFtZTcwMjY2OTI5MQ@@._UY632.jpg + http://www.imdb.com/name/nm0000418/ + + + Rhys Darby + Nigel + https://m.media-amazon.com/images/M/MV5BMTU2NjExNjI4NF5BMl5BanBnXkFtZTgwNjU0OTk3NzE@._UY632.jpg + http://www.imdb.com/name/nm1055302/ + + + Colin Hanks + Alex + https://m.media-amazon.com/images/M/MV5BMTc5OTcxNjIzM15BMl5BanBnXkFtZTcwNDI0NjMyMw@@._UY632.jpg + http://www.imdb.com/name/nm0004988/ + + + Rory McCann + Jurgen the Brutal + https://m.media-amazon.com/images/M/MV5BYmIzMjdkZmEtMDA0Yy00YzVhLWEzYmEtOWRmZmMzODYxZDQ5XkEyXkFqcGdeQXVyMTAwMDczMTU3._UY632.jpg + http://www.imdb.com/name/nm0564920/ + + + Marin Hinkle + Janice + https://m.media-amazon.com/images/M/MV5BMTkyNTIyNDgyMV5BMl5BanBnXkFtZTcwMDk3MjU5MQ@@._UY632.jpg + http://www.imdb.com/name/nm0385792/ + + + Vince Pisani + Pharmacy Manager + https://m.media-amazon.com/images/M/MV5BZjk5MDM2ZmEtZTc0Ny00OWNkLTliOGMtNGRjYjc3NmExYTc2XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm2079627/ + + + Dorothy Steel + Village Elder + https://m.media-amazon.com/images/M/MV5BZTk4YzIwM2EtNmUwMy00Mzg1LWIxM2MtYWE4Njk1MzBmYTlkXkEyXkFqcGdeQXVyNzgxOTY1MDk@._UY632.jpg + http://www.imdb.com/name/nm7262074/ + + + Jennifer Patino + Bravestone's Mother + https://m.media-amazon.com/images/M/MV5BMTQ3Mzk2NjM0NF5BMl5BanBnXkFtZTgwMTEwNzc4NjE@._UY632.jpg + http://www.imdb.com/name/nm2358594/ + + + Madison Johnson + Little Bethany Vreeke + https://m.media-amazon.com/images/M/MV5BYzk2ZTU5YjctMjlkMy00YmQ3LWI3NWEtN2Q0YjIyNDUyZTM0XkEyXkFqcGdeQXVyMTA0ODIxNDc3._UY632.jpg + http://www.imdb.com/name/nm10794211/ + + + Dania Ramirez + Lady in Red + https://m.media-amazon.com/images/M/MV5BMjU0OTIyNzQ3MF5BMl5BanBnXkFtZTgwNzQwODU1NjM@._UY632.jpg + http://www.imdb.com/name/nm1268158/ + + + Derek Russo + Key Master + https://m.media-amazon.com/images/M/MV5BM2U1OTJhZmMtNjJmYS00ZDdjLWIzOTUtNTg5N2E1NzE3MzdkXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm2403799/ + + + Vanessa Cater + Red Headed Marauder + https://m.media-amazon.com/images/M/MV5BMzgzZmRkZDQtYzE3MS00ZWU4LTgzMzctMjM4ODM1ZjZkMjBlXkEyXkFqcGdeQXVyMTkxNzAwODU@._UY632.jpg + http://www.imdb.com/name/nm1695706/ + + + Nick Gomez + Oasis Drunk + https://m.media-amazon.com/images/M/MV5BMmI3NTc3NTAtODU2Ny00NDYyLWE1N2YtZWNkYjlkNWM0MGEyXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm0327063/ + + + Massi Furlan + Switchblade + https://m.media-amazon.com/images/M/MV5BZDA1MWY1MzQtZTAwNi00NTExLTg0MmYtZTA1NjY1ODEyMWNhL2ltYWdlXkEyXkFqcGdeQXVyMTIwNDk5MDA@._UY632.jpg + http://www.imdb.com/name/nm2939724/ + + + Javier Villamil + Switchblade's Sidekick + https://m.media-amazon.com/images/M/MV5BN2NiYmU2NTktMDIwNi00NjNlLTljNzktYTE0MDhjYTZlMTcwXkEyXkFqcGdeQXVyMjk2MTA5NjE@._UY632.jpg + http://www.imdb.com/name/nm4676698/ + + + Anthony Neves + Jurgen's Patrolman + + http://www.imdb.com/name/nm7543346/ + + + Morgan Brown + Fortress Guard + https://m.media-amazon.com/images/M/MV5BMmY3NTA3NjAtYzQyZS00MDQwLTkzNTctMTEzYmQ1ZjdjZjczXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm3231814/ + + + Deobia Oparei + Elevator Guard + https://m.media-amazon.com/images/M/MV5BMjMyNzU5MzI5MV5BMl5BanBnXkFtZTgwMjI5MTg5ODE@._UY632.jpg + http://www.imdb.com/name/nm0649046/ + + + Leslie Simms + Cake Lady + https://m.media-amazon.com/images/M/MV5BMTg4YTdjYjctNzRkNy00ZWMxLWJiZTEtMzc4M2Y2OWQyM2FkXkEyXkFqcGdeQXVyMTc3MTYwNzY@._UY632.jpg + http://www.imdb.com/name/nm0799984/ + + + John Ross Bowie + Cavendish + https://m.media-amazon.com/images/M/MV5BN2MwZWMyMDQtOTc5Ny00NDcyLWJjODgtMjZiYTJjYzUyYTMwXkEyXkFqcGdeQXVyMDYyODYzMQ@@._UY632.jpg + http://www.imdb.com/name/nm0101152/ + + + Lucy DeVito + Maiden + https://m.media-amazon.com/images/M/MV5BNWZhZmFjNjUtM2U4NS00MzY1LWFiYmQtMDZjZmUzNjRjNjI2XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm2192439/ + + + Bebe Neuwirth + Nora + https://m.media-amazon.com/images/M/MV5BMjEzOTUxODI1M15BMl5BanBnXkFtZTcwNTU3MjE3NA@@._UY632.jpg + http://www.imdb.com/name/nm0001564/ + + + Lamorne Morris + Heater Repair Man + https://m.media-amazon.com/images/M/MV5BNmJhMWJkNTgtODIzMC00ZmIzLTliMjUtZGZmMmM1MTU5OTZhXkEyXkFqcGdeQXVyMjY5MDMxMzQ@._UY632.jpg + http://www.imdb.com/name/nm2031358/ + + + Cruz Abelita + Messenger Boy + https://m.media-amazon.com/images/M/MV5BYWVkYjBkNDMtOTgwYi00ZjYyLWI3MWUtY2Q4NjMzMGUxYjk4XkEyXkFqcGdeQXVyNjc3ODE4Mzg@._UY632.jpg + http://www.imdb.com/name/nm8914091/ + + + James William Ballard + Bad Guy in Fortress + https://m.media-amazon.com/images/M/MV5BMmZiOGE3MDUtMzU5MC00NjYxLThhNGEtZTgwMTQ1NWUzZmUyXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm9735552/ + + + Richard Baxter + Fortress Guard / Fortress Guard Detaining Awkwafina + https://m.media-amazon.com/images/M/MV5BODQ5MGY3ODEtNGI3Zi00OWQzLTk3NDItYzE4MjI5MjNhZmJkXkEyXkFqcGdeQXVyOTk3MDM3NTk@._UY632.jpg + http://www.imdb.com/name/nm10509356/ + + + Michael Beasley + Coach Davis + https://m.media-amazon.com/images/M/MV5BYjMwYzhiM2MtNjE2Mi00YjAzLTg2NjAtZmYyYWMwNzFlZjBkXkEyXkFqcGdeQXVyMTk5NTE1ODA@._UY632.jpg + http://www.imdb.com/name/nm2689261/ + + + Dillon Belisle + Fortress Guard + https://m.media-amazon.com/images/M/MV5BNzRlNjVmMmMtY2U2OS00ZWFkLThlNTgtNzM4YzkyZWU0ZmM4XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm6911209/ + + + Shane Berengue + Jergan's Viking + https://m.media-amazon.com/images/M/MV5BMWUyMjE1ZDYtNjAzZC00ZDkyLTkwOWUtMWYwNmQ2ZDcwNDRlXkEyXkFqcGdeQXVyOTg3ODA2NDU@._UY632.jpg + http://www.imdb.com/name/nm10656436/ + + + Ashley Black + Viking Woman + + http://www.imdb.com/name/nm8587437/ + + + Matt Bolick + Jergans inner circle + https://m.media-amazon.com/images/M/MV5BYjRkYzA2YTgtZGUzNi00MzZiLWJhOGMtN2ViNmQwNTFhODYxXkEyXkFqcGdeQXVyMzYxMDMxMjI@._UY632.jpg + http://www.imdb.com/name/nm8569766/ + + + Kristopherr Brown Jr. + Fortress Guard + + http://www.imdb.com/name/nm10744694/ + + + Ray Buchanan + Pedestrian + + http://www.imdb.com/name/nm10557155/ + + + John David Bulla + Groovy Face Tattoo Biker + https://m.media-amazon.com/images/M/MV5BZmIwMGU4YWQtN2Y3OS00Y2FjLTk4NWEtNTY4ZmRiMmJiYzIyXkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm6980280/ + + + Catherine Busby + College Hiker + https://m.media-amazon.com/images/M/MV5BMjY0Yzg2NGUtMmJiNS00YWU5LWFlOTEtYmJmNzdkYTlkOTE0XkEyXkFqcGdeQXVyNzAxNTk3MDE@._UY632.jpg + http://www.imdb.com/name/nm8559849/ + + + Matthew Byrge + Jurgen's Viking + https://m.media-amazon.com/images/M/MV5BYWQxZGEwNDItMDIxOC00M2U2LWFjZWQtNDU1NzdjZTEyZGU4XkEyXkFqcGdeQXVyOTQ2OTE4NDk@._UY632.jpg + http://www.imdb.com/name/nm10233844/ + + + Ryan Cheeseman + Marauder + https://m.media-amazon.com/images/M/MV5BYjU2YjI1MGUtNDQ1Ny00ZjMwLTg1OGEtZjU5MTAyZGZiMDk4XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm10504390/ + + + Teo Ciltia + Fortress Guard + https://m.media-amazon.com/images/M/MV5BMzkwMDY4ODg2M15BMl5BanBnXkFtZTgwMTIxODg5NTE@._UY632.jpg + http://www.imdb.com/name/nm5854970/ + + + Jeremy Connell + Bus Passenger + + http://www.imdb.com/name/nm10517614/ + + + Marché Day + Fortress Guard + https://m.media-amazon.com/images/M/MV5BYzZhNDgwZTctNTU3Yi00MTE4LWIwZTYtZjYxNjkyY2YwODcwXkEyXkFqcGdeQXVyMTAyNjY1Nzky._UY632.jpg + http://www.imdb.com/name/nm10693389/ + + + Bethany Dixon + Jurgen's Viking + + http://www.imdb.com/name/nm10128159/ + + + Darin Ferraro + The Gun Seller + https://m.media-amazon.com/images/M/MV5BNGMwOGU3YTgtYWRjNi00YjVhLWIyMTYtNjg2MGIyZjIyN2ZiXkEyXkFqcGdeQXVyODI2NjMzOTA@._UY632.jpg + http://www.imdb.com/name/nm5155353/ + + + Brent Moorer Gaskins + Farmer + + http://www.imdb.com/name/nm7476062/ + + + John Gettier + Fortress Guard + https://m.media-amazon.com/images/M/MV5BZmY2OGZlNzQtNWVlMy00NDk5LTk1ZjYtYTBmZDdjMWZjMzQ5XkEyXkFqcGdeQXVyNjgyMTc3ODI@._UY632.jpg + http://www.imdb.com/name/nm8074962/ + + + Tahseen Ghauri + Oasis Market Patron + + http://www.imdb.com/name/nm6708940/ + + + Charles Green + Bartender + https://m.media-amazon.com/images/M/MV5BZmU0ZDUxMjEtNzYxNS00OWY0LWI3MDQtYjUzNTljOGY4YTAwXkEyXkFqcGdeQXVyMzU3NjIzMjc@._UY632.jpg + http://www.imdb.com/name/nm0337705/ + + + Jared Hasmuk + Dagfin + https://m.media-amazon.com/images/M/MV5BYzc1NjJkNmQtZDU0Ni00YTFiLTgwZjQtMjk1OTU4ODk5NmU5XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm9187777/ + + + Marque Hernandez + Gypsy Guy in Tattoo Chair + https://m.media-amazon.com/images/M/MV5BYTU4MmIwMDAtMDk1My00ZGRiLWEwYmQtOWM5ODAwYjIwZTVmXkEyXkFqcGdeQXVyNzQ3ODU1NjI@._UY632.jpg + http://www.imdb.com/name/nm9145803/ + + + Shiquita James + Pedestrian + https://m.media-amazon.com/images/M/MV5BNGY4ZDVkNDctY2MwNi00ZjJhLWI0YTgtN2NkZDM5ZGNhMjMzXkEyXkFqcGdeQXVyODcyNjczNzA@._UY632.jpg + http://www.imdb.com/name/nm7691913/ + + + Sean K. Jones + Fortress Guard + + http://www.imdb.com/name/nm10268319/ + + + Christine A. Jordan + Gym Goer + https://m.media-amazon.com/images/M/MV5BNTIwODhiN2QtMGNmMy00YWNkLWFkZTMtYzBiNDVmMGVhYzIxXkEyXkFqcGdeQXVyMTg0ODU3NzM@._UY632.jpg + http://www.imdb.com/name/nm9451882/ + + + David Kallaway + New Hyena Master + https://m.media-amazon.com/images/M/MV5BOGU3ZjY4MWEtMTkxNy00NjIyLWFiMzgtNDYxOTFmZmE0YzUzXkEyXkFqcGdeQXVyNTMyMjUwMDA@._UY632.jpg + http://www.imdb.com/name/nm0436064/ + + + Melissa Kennemore + Marauder 1 / Jergens Inner Circle + + http://www.imdb.com/name/nm11156931/ + + + Chase Ledgerwood + NYU Student / Bus Passenger + https://m.media-amazon.com/images/M/MV5BMjEyODM3Y2MtMzBiMC00MTAyLWFkODgtMmEwZWY4YWU5YjU0XkEyXkFqcGdeQXVyNTI5NjIyMw@@._UY632.jpg + http://www.imdb.com/name/nm9453496/ + + + Damon LeGrand + Jurgen Henchman + https://m.media-amazon.com/images/M/MV5BYTk2NWU2ZWEtM2U4My00NjcwLWE0ODQtYzdlZjNmNDBhMjQ3XkEyXkFqcGdeQXVyMTExMjg4NzY0._UY632.jpg + http://www.imdb.com/name/nm10836044/ + + + Sal Longobardo + Tony + https://m.media-amazon.com/images/M/MV5BMTk0NTU4YmItNjlkMi00ZjAzLWE5NmQtNjY0MDhlMTUwNmVjXkEyXkFqcGdeQXVyMjI0NDU5MTQ@._UY632.jpg + http://www.imdb.com/name/nm2381885/ + + + Dennis Mallen + Second Husband + + http://www.imdb.com/name/nm9990253/ + + + Michael Mathis + Fighter + https://m.media-amazon.com/images/M/MV5BZDBjZThmNWMtNzliMC00ODEzLWFjNWQtMGExMTVjNzFlMjMwXkEyXkFqcGdeQXVyMTA1ODUzNTQw._UY632.jpg + http://www.imdb.com/name/nm11093179/ + + + Andrew R. McCallister + Jurgen's Henchman + https://m.media-amazon.com/images/M/MV5BMTIzZGZhNzMtNDYyNi00NDY5LTg1MzYtMGMxM2YzNTg5OWU5XkEyXkFqcGdeQXVyMTA5OTg5MDU3._UY632.jpg + http://www.imdb.com/name/nm11132403/ + + + Ego Mikitas + Jergen Man + https://m.media-amazon.com/images/M/MV5BNzQ0NzZiMzMtZGM0Mi00NGVlLTkxMDktMWRhZTgyZTJjNWQwXkEyXkFqcGdeQXVyNTYxOTc4MDM@._UY632.jpg + http://www.imdb.com/name/nm3658494/ + + + Brandon Parker + Jergan's Viking + + http://www.imdb.com/name/nm10814930/ + + + Paul Pillsbury + Fortress Guard + + http://www.imdb.com/name/nm7591351/ + + + Monica Powers + Fortress Viking + https://m.media-amazon.com/images/M/MV5BMWUzMTdiZjgtYmZjMC00ODQwLWI4ZmQtZjJlNjQ3MmQ2NzQyXkEyXkFqcGdeQXVyMTAyNTE4NTgy._UY632.jpg + http://www.imdb.com/name/nm10667070/ + + + Scott Rapp + Marauder + https://m.media-amazon.com/images/M/MV5BMzcxOWE5ODAtZmE0My00NWFhLWJlZjItZjZlZGJlYzc0MTg0XkEyXkFqcGdeQXVyOTQyMzUzMzk@._UY632.jpg + http://www.imdb.com/name/nm10405165/ + + + Sheril Rodgers + New York City Pedestrain + https://m.media-amazon.com/images/M/MV5BMGM3ZWEzN2MtNzcxOC00NWE4LWFhNzItYjM5MjJjMmM5MGIxXkEyXkFqcGdeQXVyNjY0MzQxMzA@._UY632.jpg + http://www.imdb.com/name/nm3725031/ + + + Bruno Rose + NY Dorm Guy + https://m.media-amazon.com/images/M/MV5BZThjMWNiYmUtOTNhZC00NGQ1LWFkM2UtZGJiNGFhNjE3N2RjXkEyXkFqcGdeQXVyNDc4Mzk3MTI@._UY632.jpg + http://www.imdb.com/name/nm6261591/ + + + Robert Sargent + Luna Viking- Jergen + https://m.media-amazon.com/images/M/MV5BOWFhNjYwNjctZmZhYS00NGUwLThmZDEtNzkwOGI3MDdmNDdmXkEyXkFqcGdeQXVyMTA4MzY1Mjcw._UY632.jpg + http://www.imdb.com/name/nm11032927/ + + + Ashley Scott + Ashley + https://m.media-amazon.com/images/M/MV5BMjIwNTU4OTQ1Nl5BMl5BanBnXkFtZTgwNTM2OTg0MDE@._UY632.jpg + http://www.imdb.com/name/nm1008709/ + + + Taylor Simmons + Viking + https://m.media-amazon.com/images/M/MV5BMmY3ZWFlY2YtZjZkYy00YTFiLThlNWQtNGU3MWU5MDg5MDA4XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm5574343/ + + + Elizabeth Sparks + Viking + https://m.media-amazon.com/images/M/MV5BOWUyNjY3NmMtNTczYS00YjljLTljMzYtY2M4ZDJhNjYxYTk5XkEyXkFqcGdeQXVyOTM5NjEwNDg@._UY632.jpg + http://www.imdb.com/name/nm10198488/ + + + Ulrike Stewart + Jergens Viking + https://m.media-amazon.com/images/M/MV5BYjA2YjZhOGItNjBjOC00OGIwLTk5YzktNjJkNDBiMWIxOTg0XkEyXkFqcGdeQXVyOTA5NjYwODI@._UY632.jpg + http://www.imdb.com/name/nm10032663/ + + + Zachary Tzegaegbe + Young Bravestone + https://m.media-amazon.com/images/M/MV5BNjQwYWM0ZTAtNzBlOC00MzgxLTlhMWEtY2EwNzIzNTMyOWQ1XkEyXkFqcGdeQXVyMTEwOTQzNDYw._UY632.jpg + http://www.imdb.com/name/nm10435927/ + + + Trinity Whiteside + Viking + https://m.media-amazon.com/images/M/MV5BYzdiMWZjZDktMWE0ZS00NzY4LWI0MmYtNDNhMDM5NjRiYWFlXkEyXkFqcGdeQXVyNjg0MjI5ODU@._UY632.jpg + http://www.imdb.com/name/nm8376728/ + + + Lewis Wright + Viking Warrior + https://m.media-amazon.com/images/M/MV5BYzcyNmJiMzgtNjhmMi00N2RlLTg4Y2UtOWVmMTllOGMzYjMxXkEyXkFqcGdeQXVyNzc1MzU5MTk@._UY632.jpg + http://www.imdb.com/name/nm9152774/ + + + Kodai Yamaguchi + Jumanjian Villager + https://m.media-amazon.com/images/M/MV5BYmQ2MWIwZDktNDUyZi00ZmQ4LTkxMjItMWVhNTdjN2IyZjY0XkEyXkFqcGdeQXVyMjQwMDg0Ng@@._UY632.jpg + http://www.imdb.com/name/nm10139978/ + + + Ted Field + + + + + Dany Garcia + + + + + Hiram Garcia + + + + + David B. Householter + + + + + Dwayne Johnson + + + + + Jake Kasdan + + + + + David Manpearl + + + + + Melvin Mar + + + + + Jeff Pinkner + + + + + Sky Salem Robinson + + + + + Scott Rosenberg + + + + + William Teitler + + + + + Matt Tolmach + + + + + Mike Weber + + + + + 英文 + 2020-02-29 16:32:39 + + + + + + + + UNKNOWN + NONE +