Merged
Conversation
Owner
|
Thank you |
thukabjj
added a commit
to thukabjj/Handy
that referenced
this pull request
Mar 7, 2026
Upstream changes: - Language-aware filler word removal (cjpais#971) - Portable mode NSIS installer (cjpais#807) - Italian translation fix (cjpais#973) - Bun setup for Windows ARM64 (cjpais#965) - tauri-plugin-dialog upgraded to 2.6 - Linux install docs and AppImage troubleshooting (cjpais#951) Conflict resolution: - package.json: take upstream dialog 2.6 - Cargo.toml: take upstream dialog 2.6, keep fork deps (symphonia, keyring) - text.rs: take upstream's language-aware filter_transcription_output, keep fork test - settings/mod.rs: keep fork fields + add upstream custom_filler_words - bun.lock: take upstream version
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixed Italian translation for the recordingRetention settings to accurately reflect the original concept of auto-deleting old recordings, rather than just saving them.
Also, minor adjustments were made to ensure style and consistency (punctuation, uppercase/lowercase formatting discrepancies).