Skip to content

New Crowdin updates#1023

Merged
dail8859 merged 41 commits into
masterfrom
l10n_master
May 23, 2026
Merged

New Crowdin updates#1023
dail8859 merged 41 commits into
masterfrom
l10n_master

Conversation

@dail8859

Copy link
Copy Markdown
Owner

No description provided.

dail8859 added 28 commits April 29, 2026 04:54
@dail8859 dail8859 merged commit 625b692 into master May 23, 2026
1 check passed
@dail8859 dail8859 deleted the l10n_master branch May 23, 2026 20:52
nullmastermind added a commit to nullmastermind/NotepadAI that referenced this pull request May 26, 2026
Upstream changes (6 commits):
- Cleanup (lambda [=] → [this] modernization, connectEditorAction helper)
- Add Search and bookmark lines (dail8859#1049)
- Add split editor view functionality (dail8859#1063)
- Add translations section to README
- Update Windows OS version in build matrix
- New Crowdin updates (dail8859#1023)

Conflicts resolved:
- README.md: kept fork content, discarded upstream NotepadNext-specific sections
- DockedEditor.h/.cpp: kept both fork (preview tabs) and upstream (split view) methods
- MainWindow.cpp: kept fork clipboard-forwarding lambdas and markdown-preview block
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant