mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-20 21:13:25 +08:00
Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
This commit is contained in:
Rainer Kottenhoff
commit
70dc0a34bb
@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package
|
||||
|
||||
|
||||
========================================================
|
||||
Current BETA/RC Version 5.20.906.(build_#) (2020-09-06)
|
||||
Current BETA/RC Version 5.20.909.(build_#) (2020-09-08)
|
||||
========================================================
|
||||
|
||||
--------------------------------------------------------
|
||||
@ -102,6 +102,7 @@ ENHANCEMENT:
|
||||
FIXES:
|
||||
--------------------------------------------------------
|
||||
[.###.#]-
|
||||
[.908.1]- SubMenu active marker (Occurrences Indicator Options).
|
||||
[.906.1]- Delete marker of (comletely) deleted lines.
|
||||
[.905.1]- Initial state of "Focus View" button in F/R-Dlg.
|
||||
[.901.2]- Buffer size calculation.
|
||||
|
||||
13
Code_of_Conduct.md
Normal file
13
Code_of_Conduct.md
Normal file
@ -0,0 +1,13 @@
|
||||
# Code of Conduct
|
||||
|
||||
Don't have one. Don't want one.
|
||||
|
||||
That's the short version.
|
||||
|
||||
Now the _long version_:
|
||||
|
||||
1. Having a code of conduct means forcing rules on our community. We don't want that. We want to be free of restrictions and just get the project going.
|
||||
2. We don't care about your political views, your race, gender, hair color, tatoos or whatever. We just don't. And we don't ask. Because it has nothing to do with this project.
|
||||
3. We do care about the project, and the code. And nothing else.
|
||||
|
||||
If we can't be civil among each other, then having a code of conduct won't help either.
|
||||
@ -1 +1 @@
|
||||
906
|
||||
908
|
||||
|
||||
@ -354,7 +354,7 @@ BEGIN
|
||||
MENUITEM "&Coincidir sólo visible", IDM_VIEW_MARKOCCUR_VISIBLE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Coincidir &sensible a mayúsculas", IDM_VIEW_MARKOCCUR_CASE
|
||||
POPUP "Coincidir &palabra completa solo"
|
||||
POPUP "Coincidir sólo &palabra completa"
|
||||
BEGIN
|
||||
MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
|
||||
MENUITEM "Coincidir palabra &seleccionada", IDM_VIEW_MARKOCCUR_WORD
|
||||
|
||||
@ -354,7 +354,7 @@ BEGIN
|
||||
MENUITEM "&Coincidir sólo visible", IDM_VIEW_MARKOCCUR_VISIBLE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Coincidir &sensible a mayúsculas", IDM_VIEW_MARKOCCUR_CASE
|
||||
POPUP "Coincidir &palabra completa solo"
|
||||
POPUP "Coincidir sólo &palabra completa"
|
||||
BEGIN
|
||||
MENUITEM "&OFF", IDM_VIEW_MARKOCCUR_WNONE
|
||||
MENUITEM "Coincidir palabra &seleccionada", IDM_VIEW_MARKOCCUR_WORD
|
||||
|
||||
@ -69,7 +69,7 @@ BEGIN
|
||||
IDS_LEX_PRISM_CSV "CSV Prism"
|
||||
IDS_LEX_CPP_SRC "C/C++ källkod"
|
||||
IDS_LEX_CSHARP_SRC "C# källkod"
|
||||
IDS_LEX_RESOURCE_SCR "Resource-skript"
|
||||
IDS_LEX_RESOURCE_SCR "Resursskript"
|
||||
IDS_LEX_MAKEFILES "Make-filer"
|
||||
END
|
||||
|
||||
@ -261,7 +261,7 @@ BEGIN
|
||||
IDS_LEX_STR_63201 "Värde"
|
||||
IDS_LEX_STR_63202 "Viktigt"
|
||||
IDS_LEX_STR_63203 "Direktiv"
|
||||
IDS_LEX_STR_63204 "Target"
|
||||
IDS_LEX_STR_63204 "Mål"
|
||||
IDS_LEX_STR_63205 "Inline Asm"
|
||||
IDS_LEX_STR_63206 "CPU instruktion"
|
||||
IDS_LEX_STR_63207 "FPU instruktion"
|
||||
@ -308,7 +308,7 @@ BEGIN
|
||||
IDS_LEX_STR_63240 "Rad tillagd"
|
||||
IDS_LEX_STR_63241 "Rad borttagen"
|
||||
IDS_LEX_STR_63242 "Rad ändrad"
|
||||
IDS_LEX_STR_63243 "Quoted Identifierare"
|
||||
IDS_LEX_STR_63243 "Citerad Identifierare"
|
||||
IDS_LEX_STR_63244 "Sträng dubbelciterad"
|
||||
IDS_LEX_STR_63245 "Sträng trippelciterad"
|
||||
IDS_LEX_STR_63246 "Klassnamn"
|
||||
@ -323,8 +323,8 @@ BEGIN
|
||||
IDS_LEX_STR_63251 "Alias"
|
||||
IDS_LEX_STR_63252 "Tolkningsfel"
|
||||
IDS_LEX_STR_63253 "Prototyp"
|
||||
IDS_LEX_STR_63254 "Format-identifierare"
|
||||
IDS_LEX_STR_63255 "Format Body"
|
||||
IDS_LEX_STR_63254 "Formatidentifierare"
|
||||
IDS_LEX_STR_63255 "Formatera Body"
|
||||
IDS_LEX_STR_63256 "HTML element text"
|
||||
IDS_LEX_STR_63257 "XML element text"
|
||||
IDS_LEX_STR_63258 "typerdef/klasser"
|
||||
@ -411,7 +411,7 @@ BEGIN
|
||||
IDS_LEX_STR_63323 "Rubrik 4"
|
||||
IDS_LEX_STR_63324 "Rubrik 5"
|
||||
IDS_LEX_STR_63325 "Rubrik 6"
|
||||
IDS_LEX_STR_63326 "Pre Char"
|
||||
IDS_LEX_STR_63326 "Innan bokstav"
|
||||
IDS_LEX_STR_63327 "Oordnad lista"
|
||||
END
|
||||
|
||||
@ -425,13 +425,13 @@ BEGIN
|
||||
IDS_LEX_STR_63333 "Referens"
|
||||
IDS_LEX_STR_63334 "Dokument"
|
||||
IDS_LEX_STR_63335 "Text"
|
||||
IDS_LEX_STR_63336 "Standard Operator"
|
||||
IDS_LEX_STR_63336 "Standard operatör"
|
||||
IDS_LEX_STR_63337 "Attribut"
|
||||
IDS_LEX_STR_63338 "Standardfunktion"
|
||||
IDS_LEX_STR_63339 "Standardpaket"
|
||||
IDS_LEX_STR_63340 "Standardtyper"
|
||||
IDS_LEX_STR_63341 "Ord"
|
||||
IDS_LEX_STR_63342 "Verbatim"
|
||||
IDS_LEX_STR_63342 "Ordagrann"
|
||||
IDS_LEX_STR_63343 "Inbyggda typer"
|
||||
END
|
||||
|
||||
@ -439,7 +439,7 @@ STRINGTABLE
|
||||
BEGIN
|
||||
IDS_LEX_STR_63344 "Byta sträng"
|
||||
IDS_LEX_STR_63345 "Annat nyckelord"
|
||||
IDS_LEX_STR_63346 "Rust Lifetime"
|
||||
IDS_LEX_STR_63346 "Rust livstid"
|
||||
IDS_LEX_STR_63347 "Objekt"
|
||||
IDS_LEX_STR_63348 "Tanget"
|
||||
IDS_LEX_STR_63349 "Snabbtangent"
|
||||
@ -456,10 +456,10 @@ STRINGTABLE
|
||||
BEGIN
|
||||
IDS_LEX_STR_63357 "For Each definition"
|
||||
IDS_LEX_STR_63358 "While definition"
|
||||
IDS_LEX_STR_63359 "Math"
|
||||
IDS_LEX_STR_63360 "Scalar"
|
||||
IDS_LEX_STR_63359 "Matemataik"
|
||||
IDS_LEX_STR_63360 "Skalär"
|
||||
IDS_LEX_STR_63361 "Substitution"
|
||||
IDS_LEX_STR_63362 "Modifier"
|
||||
IDS_LEX_STR_63362 "Modifierare"
|
||||
IDS_LEX_STR_63363 "Tag"
|
||||
IDS_LEX_STR_63364 "Egenskap namn"
|
||||
IDS_LEX_STR_63365 "LD nyckelord"
|
||||
|
||||
@ -93,23 +93,23 @@ BEGIN
|
||||
MENUITEM "Öppna filutforskaren", IDM_FILE_EXPLORE_DIR
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Re&vert from File\tF5", IDM_FILE_REVERT
|
||||
MENUITEM "Återgå till filens version\tF5", IDM_FILE_REVERT
|
||||
POPUP "Teckenkodning"
|
||||
BEGIN
|
||||
POPUP "&Revert from File as"
|
||||
POPUP "Återgå till filversion som"
|
||||
BEGIN
|
||||
MENUITEM "&Default (Setting)", CMD_RECODEDEFAULT
|
||||
MENUITEM "Grundinställning", CMD_RECODEDEFAULT
|
||||
MENUITEM "&ANSI\tCtrl+Shift+A", CMD_RECODEANSI
|
||||
MENUITEM "&OEM\tCtrl+Shift+O", CMD_RECODEOEM
|
||||
MENUITEM "&GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "ASCII som UT&F-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
|
||||
MENUITEM "Force U&CHARDET Analysis", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM "Tvinga U&CHARDET analys", CMD_RELOADFORCEDETECTION
|
||||
MENUITEM "Ignorera kodningstaggar\tAlt+F8", CMD_RELOADNOFILEVARS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&More Encodings...\tF8", IDM_ENCODING_RECODE
|
||||
MENUITEM "&Fler teckenkodningar...\tF8", IDM_ENCODING_RECODE
|
||||
END
|
||||
POPUP "&Set Document as"
|
||||
POPUP "Koda dokumentet som"
|
||||
BEGIN
|
||||
MENUITEM "&ANSI", IDM_ENCODING_ANSI
|
||||
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
|
||||
@ -117,10 +117,10 @@ BEGIN
|
||||
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
|
||||
MENUITEM "UTF-8 med &signatur", IDM_ENCODING_UTF8SIGN
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&More Encodings...\tF9", IDM_ENCODING_SELECT
|
||||
MENUITEM "Fler teckenkodningar...\tF9", IDM_ENCODING_SELECT
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Set Encoding &Defaults...", IDM_ENCODING_SETDEFAULT
|
||||
MENUITEM "Ange förvald teckenkodning...", IDM_ENCODING_SETDEFAULT
|
||||
END
|
||||
POPUP "Radslut"
|
||||
BEGIN
|
||||
@ -220,7 +220,7 @@ BEGIN
|
||||
MENUITEM "[ ]\tCtrl+4", CMD_EMBRACE2
|
||||
MENUITEM "{ }\tCtrl+5", CMD_EMBRACE3
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Grave accent\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM "Grav accent\tCtrl+6", CMD_EMBRACE4
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Med...\tAlt+Q", IDM_EDIT_ENCLOSESELECTION
|
||||
END
|
||||
@ -229,7 +229,7 @@ BEGIN
|
||||
MENUITEM "Utfyllnad med blanksteg\tAlt+B", IDM_EDIT_PADWITHSPACES
|
||||
MENUITEM "Ta bort första bokstav\tAlt+Z", IDM_EDIT_STRIP1STCHAR
|
||||
MENUITEM "Ta bort sista bokstav\tAlt+U", IDM_EDIT_STRIPLASTCHAR
|
||||
MENUITEM "Ta bort blankstek i slutet av rader\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Ta bort blanksteg i slutet av rader\tAlt+W", IDM_EDIT_TRIMLINES
|
||||
MENUITEM "Komprimera blanksteg\tCtrl+Alt+P", IDM_EDIT_COMPRESS_BLANKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Modifiera rader...\tAlt+M", IDM_EDIT_MODIFYLINES
|
||||
@ -317,7 +317,7 @@ BEGIN
|
||||
MENUITEM "Ersätt nästa\tF4", IDM_EDIT_REPLACENEXT
|
||||
MENUITEM "Gå till...\tCtrl+G", IDM_EDIT_GOTOLINE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Sök i filer\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH
|
||||
MENUITEM "Sök i filer\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH
|
||||
END
|
||||
END
|
||||
POPUP "Visa"
|
||||
@ -349,7 +349,7 @@ BEGIN
|
||||
POPUP "Markera förekomster"
|
||||
BEGIN
|
||||
MENUITEM "Visa aktiva\tAlt+A", IDM_VIEW_MARKOCCUR_ONOFF
|
||||
MENUITEM "Use &Bookmarks too", IDM_VIEW_MARKOCCUR_BOOKMARKS
|
||||
MENUITEM "Markera i bokmärken", IDM_VIEW_MARKOCCUR_BOOKMARKS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Matcha endast synliga", IDM_VIEW_MARKOCCUR_VISIBLE
|
||||
MENUITEM SEPARATOR
|
||||
@ -379,13 +379,13 @@ BEGIN
|
||||
POPUP "Visa"
|
||||
BEGIN
|
||||
MENUITEM "Fokuserad vy\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
|
||||
POPUP "View Mode"
|
||||
POPUP "Visningsläge"
|
||||
BEGIN
|
||||
MENUITEM "Fold", IDM_VIEW_FV_FOLD
|
||||
MENUITEM "Bookmark", IDM_VIEW_FV_BOOKMARK
|
||||
MENUITEM "Highlight", IDM_VIEW_FV_HIGHLIGHT
|
||||
MENUITEM "Bookmark && Fold", IDM_VIEW_FV_BKMRKFOLD
|
||||
MENUITEM "Highlight && Fold", IDM_VIEW_FV_HIGHLGFOLD
|
||||
MENUITEM "Ihopvikning", IDM_VIEW_FV_FOLD
|
||||
MENUITEM "Bokmärke", IDM_VIEW_FV_BOOKMARK
|
||||
MENUITEM "Markera", IDM_VIEW_FV_HIGHLIGHT
|
||||
MENUITEM "Bokmärk och vik ihop", IDM_VIEW_FV_BKMRKFOLD
|
||||
MENUITEM "Markera och vik ihop", IDM_VIEW_FV_HIGHLGFOLD
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Logg", IDM_VIEW_CHASING_DOCTAIL
|
||||
@ -454,7 +454,7 @@ BEGIN
|
||||
MENUITEM "Avsluta Notepad3", IDM_VIEW_ESCEXIT
|
||||
END
|
||||
MENUITEM "Spara innan verktyg används", IDM_VIEW_SAVEBEFORERUNNINGTOOLS
|
||||
MENUITEM "Räkna ut Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL
|
||||
MENUITEM "Räkna ut Tiny-E&xpressions", IDM_VIEW_EVALTINYEXPRONSEL
|
||||
MENUITEM SEPARATOR
|
||||
POPUP "Kom ihåg"
|
||||
BEGIN
|
||||
@ -487,8 +487,8 @@ BEGIN
|
||||
END
|
||||
POPUP "R&TL Layout (GDI)"
|
||||
BEGIN
|
||||
MENUITEM "&Edit Area", IDM_SET_RTL_LAYOUT_EDIT
|
||||
MENUITEM "&Other Dialogs", IDM_SET_RTL_LAYOUT_DLG
|
||||
MENUITEM "&Redigera area", IDM_SET_RTL_LAYOUT_EDIT
|
||||
MENUITEM "&Andra dialogrutor", IDM_SET_RTL_LAYOUT_DLG
|
||||
END
|
||||
POPUP "&Dubbelriktad"
|
||||
BEGIN
|
||||
@ -551,14 +551,14 @@ BEGIN
|
||||
END
|
||||
POPUP "+"
|
||||
BEGIN
|
||||
MENUITEM "Clear Marker", IDM_EDIT_CLEAR_MARKER
|
||||
MENUITEM "Cut Lines of Marker-Type", IDM_EDIT_CUT_MARKED
|
||||
MENUITEM "Copy Lines of Marker-Type", IDM_EDIT_COPY_MARKED
|
||||
MENUITEM "Delete Lines of Marker-Type", IDM_EDIT_DELETE_MARKED
|
||||
MENUITEM "Ta bort markör", IDM_EDIT_CLEAR_MARKER
|
||||
MENUITEM "Klipp ut rader av markerad typ", IDM_EDIT_CUT_MARKED
|
||||
MENUITEM "Kopiera rader av markerad typ", IDM_EDIT_COPY_MARKED
|
||||
MENUITEM "Ta bort rader av markerad typ", IDM_EDIT_DELETE_MARKED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Ihopvikning av kodsegment", IDM_VIEW_FOLDING
|
||||
MENUITEM "Radnummer", IDM_VIEW_LINENUMBERS
|
||||
MENUITEM "Bookmark Margin", IDM_VIEW_BOOKMARK_MARGIN
|
||||
MENUITEM "Marginal för bokmärken", IDM_VIEW_BOOKMARK_MARGIN
|
||||
END
|
||||
POPUP "+"
|
||||
BEGIN
|
||||
|
||||
@ -159,14 +159,14 @@ BEGIN
|
||||
IDS_MUI_EOLMODENAME_LF "Unix/Mac (LF)"
|
||||
IDS_MUI_EOLMODENAME_CR "Gammal Mac (CR)"
|
||||
IDS_MUI_WARN_NORMALIZE_EOLS
|
||||
"Do you want to normalise all line endings to be '%s'?"
|
||||
"Vill du ändra alla radslut till '%s'?"
|
||||
END
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_MUI_SELRECT "Åtgärden kan inte utföras inom en rektangulär markering."
|
||||
IDS_MUI_SELMULTI "This operation can't be performed within a multi-selection."
|
||||
IDS_MUI_SELRECTORMULTI "This operation can't be performed within a rectangular or multi-selection."
|
||||
IDS_MUI_SELMULTI "Åtgärden kan inte utföras med multipla markeringar."
|
||||
IDS_MUI_SELRECTORMULTI "Åtgärden kan inte utföras med en rektangular markering eller multipla markeringar."
|
||||
IDS_MUI_BUFFERTOOSMALL "Åtgärden kan inte utföras eftersom raderna är för långa."
|
||||
IDS_MUI_FIND_WRAPFW "Kommit till slutet av dokumentet, börjar från början."
|
||||
IDS_MUI_FIND_WRAPRE "Kommit till slutet av dokumentet, startar om sökning från slutet."
|
||||
@ -193,13 +193,13 @@ BEGIN
|
||||
IDS_MUI_RELOADSETTINGS "Vill du ladda om applikationen med sparade inställningar?\n\n%s"
|
||||
IDS_MUI_RELOADCFGSEX "Om du fortsätter utan att starta om kommer inställningarna inte sparas!"
|
||||
IDS_MUI_EXPORT_FAIL "Fel vid exportering av stilinställningar ""%s""."
|
||||
IDS_MUI_REGEX_INVALID "Fil vid utvärdering av reguljärt uttryck. Uttrycket är ogiltigt!"
|
||||
IDS_MUI_REGEX_INVALID "Fel vid utvärdering av reguljärt uttryck. Uttrycket är ogiltigt!"
|
||||
IDS_MUI_DROP_NO_FILE "Inget giltigt filnamn kunde hittas.\nOm du drar-och-släpper från en 32-bits applikation,\nvar vänligt släpp på Notepad3s verktygsfält."
|
||||
IDS_MUI_URL_OPEN_FILE "\nAlt + Klicka för att öppna fil."
|
||||
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Klicka för att öppna länken i webbläsaren."
|
||||
IDS_MUI_INF_PRSVFILEMODTM
|
||||
"Bevarande av tidsstämpel för filmodifiering är aktiverad.\nInställningen är giltig för denna session!"
|
||||
IDS_MUI_OUT_OFF_OCCMRK "Running out of Occurrence Markers (Bookmark/Highligt)!"
|
||||
IDS_MUI_OUT_OFF_OCCMRK "Inga fler markeringar (bokmärke/markering)!"
|
||||
END
|
||||
|
||||
STRINGTABLE
|
||||
@ -256,11 +256,11 @@ BEGIN
|
||||
IDM_THEMES_FILE_ITEM "&Standardinställningar"
|
||||
IDS_MUI_STATUSBAR_PREFIXES "Ln ,Col ,Sel ,Sb ,SLn ,Occ ,,,,,,,Ch ,Repl ,Eval ,"
|
||||
IDS_MUI_STATUSBAR_POSTFIXES ",,,,,,,,,,,,,,,"
|
||||
IDS_CLEAR_ALL "Clear All"
|
||||
IDS_CLEAR_ALL "Rensa alla"
|
||||
IDS_MUI_CLEAR_FIND_HISTORY
|
||||
"Clear Find History"
|
||||
"Rensa sökhistorik"
|
||||
IDS_MUI_CLEAR_REPL_HISTORY
|
||||
"Clear Replace History"
|
||||
"Rensa ersättningshistorik"
|
||||
END
|
||||
|
||||
STRINGTABLE
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<assemblyIdentity
|
||||
name="Notepad3"
|
||||
processorArchitecture="*"
|
||||
version="5.20.906.1"
|
||||
version="5.20.908.1"
|
||||
type="win32"
|
||||
/>
|
||||
<description>Notepad3 rc</description>
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
#define SAPPNAME "Notepad3"
|
||||
#define VERSION_MAJOR 5
|
||||
#define VERSION_MINOR 20
|
||||
#define VERSION_REV 906
|
||||
#define VERSION_REV 908
|
||||
#define VERSION_BUILD 1
|
||||
#define SCINTILLA_VER 444
|
||||
#define ONIGURUMA_REGEX_VER 6.9.5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user