Skip to content

[v2.0] Add multi-language support - #314

Draft
jaylikesbunda wants to merge 6 commits into
Development-dekifrom
language
Draft

[v2.0] Add multi-language support#314
jaylikesbunda wants to merge 6 commits into
Development-dekifrom
language

Conversation

@jaylikesbunda

@jaylikesbunda jaylikesbunda commented May 5, 2026

Copy link
Copy Markdown
Member

What's new (Author - fill this out)

  • Added and preserved multi-language UI support updates while reconciling stacked-branch drift from two-point-zero.

Changed

  • Merged latest two-point-zero into language and resolved merge conflicts across settings/UI manager and view files.
  • Preserved language/i18n-related changes from this PR while keeping newer base-branch functionality from two-point-zero.
  • Updated conflict-affected code paths in menu/options/settings rendering and related view modules so the branch is conflict-free against base.

Removed

  • Merge conflict markers and duplicate/conflicting merge artifacts introduced during branch divergence.

Verification (Author - fill this out)

  • I have tested Primary device(s) (list exact HW + config):
  • I have tested potentially affected devices (and/or list potential affected devices not available to you):
  • I have wrapped device specific code with #ifdef CONFIG_... or similar: [ ] Yes / [ ] N/A
  • I have updated Hugo Docs with any new or changed info for end users: [ ] Yes / [ ] N/A

Linked Issues

Checklist (Reviewer - don't fill this out)

  • Code builds, flashes, and feature verified with no functional issues on listed device(s)
  • Changes reviewed for unintended impact on other devices/targets

@jaylikesbunda

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

Co-authored-by: jaylikesbunda <133104319+jaylikesbunda@users.noreply.github.com>

Copilot AI commented May 13, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved and pushed in commit 8c421dd. I merged two-point-zero into this PR branch and fixed all merge conflicts in settings/options/main-menu/SubGHz files; the branch is now conflict-free with the base.

@jaylikesbunda

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

Copilot AI changed the title [v2.0] Add multi-language support [v2.0] Add multi-language support and resolve stacked-branch merge conflicts Jun 9, 2026
@netlify

netlify Bot commented Jun 9, 2026

Copy link
Copy Markdown

Deploy Preview for betadocs canceled.

Name Link
🔨 Latest commit c337a29
🔍 Latest deploy log https://app.netlify.com/projects/betadocs/deploys/6a27a38fb542d40008ee2358

@jaylikesbunda jaylikesbunda changed the title [v2.0] Add multi-language support and resolve stacked-branch merge conflicts [v2.0] Add multi-language support Jun 9, 2026

Copilot AI commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

I have merged the latest changes from the base branch two-point-zero into language and resolved all conflicts in commit c337a29. The pull request is now conflict-free against the base branch.

@jaylikesbunda
jaylikesbunda changed the base branch from two-point-zero to Development-deki July 6, 2026 03:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants