Immersive Translate/Extension @ Weblate

Language	Translated	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
English		0	0	0	0	406	0	3

Arabic	80%	240	2,480	17,257	4	130	1	0

Arabic (Egyptian)	2%	1,173	9,087	61,939	1,173	0	0	0

Arabic (Najdi)	2%	1,173	9,087	61,939	1,173	0	0	0

Arabic (Tunisian)	2%	1,173	9,087	61,939	1,173	0	0	0

Burmese	2%	1,168	9,076	61,886	1,166	3	0	0

Chinese (Min Nan, Traditional)	2%	1,173	9,087	61,939	1,173	0	1	0

Chinese (Simplified)	2%	1,173	9,087	61,939	1,173	0	0	0

Chinese (Traditional)		0	0	0	0	2	36	1

French	79%	246	2,574	17,899	4	180	0	0

Georgian	2%	1,172	9,085	61,926	1,172	1	0	0

German	79%	248	2,594	18,020	4	172	0	0

Hebrew	79%	244	2,540	17,755	4	166	0	0

Hindi	79%	251	2,608	18,131	4	145	0	0

Hungarian	78%	258	2,690	18,768	4	137	0	0

Indonesian	2%	1,173	9,087	61,939	1,173	0	0	0

Italian	79%	247	2,638	18,370	4	160	0	0

Japanese		0	0	0	0	2	0	0

Khmer (Central)	2%	1,173	9,087	61,939	1,173	0	0	0

Korean	79%	244	2,582	17,928	4	245	1	0

Persian	80%	232	2,446	17,068	4	19	0	0

Polish	2%	1,173	9,087	61,939	1,173	0	0	0

Portuguese	2%	1,173	9,087	61,939	1,173	0	0	0

Portuguese (Brazil)	78%	256	2,689	18,657	4	100	0	0

Portuguese (Portugal)	78%	256	2,689	18,657	4	147	0	0

Russian	99%	4	5	21	4	37	0	0

Spanish	79%	243	2,559	17,811	4	120	0	0

Turkish	78%	258	2,750	19,123	4	148	0	0

Ukrainian	2%	1,173	9,087	61,939	1,173	0	0	0

Vietnamese	11%	907	7,023	47,837	880	11	0	0

Please sign in to see the alerts.

Overview

Project website	immersivetranslate.com
Project maintainers	zhoulink90
Translation process	Translations can be made directly. Translation suggestions can be made. Any authenticated user can contribute. The translation uses monolingual files. The translation base language is editable.
Source code repository	`git@github.com:immersive-translate/extension.git`
Repository branch	main
Last remote commit	支持Youtube转写内容 `f455cb7b7` keyboard3 authored yesterday
Last commit in Weblate	Translated using Weblate (English) `f34f10d7c` rachpiepcuanvanh authored 12 hours ago
Weblate repository	`https://weblate.immersivetranslate.com/git/immersive-translate/extension/`
File mask	`locales/*.json`
Monolingual base language file	`locales/en.json`

10 hours ago

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		35,604		263,419		1,801,704
Source		1,200		2,113		22,599
Translated	48%	17,400	43%	113,521	43%	775,200
Needs editing	8%	3,200	12%	34,040	13%	237,065
Read-only	2%	810	1%	810	1%	2,696
Failing checks	6%	2,331	7%	19,686	7%	138,442
Strings with suggestions	1%	39	1%	833	1%	5,860
Untranslated strings	42%	15,004	43%	115,858	43%	789,439

Last 12 months Previous

Activity in last 12 months


Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec	Jan	Feb	Mar

Quick numbers

263 k

Hosted words

35,604

Hosted strings

48%

Translated

Contributors

and previous 30 days

Trends of last 30 days

+1%

Hosted words

+100%

+3%

Hosted strings

+100%

−10%

Translated

+59%

−20%

Contributors

+100%

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2026-03-12 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2026-03-12 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

None Repository merge failed Immersive Translate Extension	Auto-merging .gitignore CONFLICT (content): Merge conflict in .gitignore Auto-merging Makefile CONFLICT (content): Merge conflict in Makefile Auto-merging README.md CONFLICT (content): Merge conflict in README.md Auto-merging assets/constant.ts CONFLICT (add/add): Merge conflict in assets/constant.ts warning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main) Auto-merging assets/dark-icon-badge.png CONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png warning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main) Auto-merging assets/dark-icon.png CONFLICT (add/add): Merge conflict in assets/dark-icon.png warning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main) Auto-merging assets/icon-badge.png CONFLICT (add/add): Merge conflict in assets/icon-badge.png warning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main) Auto-merging assets/toolbar-icon.png CONFLICT (add/add): Merge conflict in assets/toolbar-icon.png Auto-merging background.ts CONFLICT (content): Merge conflict in background.ts Auto-merging background/read_time.ts CONFLICT (add/add): Merge conflict in background/read_time.ts Auto-merging background/video_time.ts CONFLICT (add/add): Merge conflict in background/video_time.ts CONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main. Version main of background_command_listeners.ts left in tree. CONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main. Version main of background_message_listeners.ts left in tree. Auto-merging background_test.ts CONFLICT (content): Merge conflict in background_test.ts Auto-merging browser/background_fetch_stream.ts CONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts CONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main. Version main of browser/cache_manager.ts left in tree. Auto-merging browser/mock_browser.ts CONFLICT (content): Merge conflict in browser/mock_browser.ts Auto-merging browser/request.ts CONFLICT (content): Merge conflict in browser/request.ts Auto-merging browser/userscript_polyfill.ts CONFLICT (content): Merge conflict in browser/userscript_polyfill.ts Auto-merging browser/version.ts CONFLICT (content): Merge conflict in browser/version.ts CONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main. Version main of browser_deps.ts left in tree. Auto-merging browser_proxy.ts CONFLICT (content): Merge conflict in browser_proxy.ts CONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main. Version main of browser_updated_listeners.ts left in tree. CONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main. Version main of buildin_config.json left in tree. Auto-merging cli.ts CONFLICT (content): Merge conflict in cli.ts Auto-merging components/add_models_modal.tsx CONFLICT (add/add): Merge conflict in components/add_models_modal.tsx Auto-merging components/add_url_modal.tsx CONFLICT (content): Merge conflict in components/add_url_modal.tsx Auto-merging components/always_lang.tsx CONFLICT (content): Merge conflict in components/always_lang.tsx Auto-merging components/button_drop_down.tsx CONFLICT (content): Merge conflict in components/button_drop_down.tsx Auto-merging components/config_sync.tsx CONFLICT (content): Merge conflict in components/config_sync.tsx Auto-merging components/download_app.tsx CONFLICT (add/add): Merge conflict in components/download_app.tsx Auto-merging components/error_wrapper.tsx CONFLICT (add/add): Merge conflict in components/error_wrapper.tsx Auto-merging components/icons.tsx CONFLICT (add/add): Merge conflict in components/icons.tsx Auto-merging components/input_row.tsx CONFLICT (content): Merge conflict in components/input_row.tsx Auto-merging components/modal.tsx CONFLICT (add/add): Merge conflict in components/modal.tsx Auto-merging components/nav_left.tsx CONFLICT (content): Merge conflict in components/nav_left.tsx Auto-merging components/option_field.tsx CONFLICT (content): Merge conflict in components/option_field.tsx Auto-merging components/options_button.tsx CONFLICT (content): Merge conflict in components/options_button.tsx Auto-merging components/popup.tsx CONFLICT (content): Merge conflict in components/popup.tsx Auto-merging components/popup/always_translate_language.tsx CONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx Auto-merging components/popup/footer.tsx CONFLICT (add/add): Merge conflict in components/popup/footer.tsx Auto-merging components/popup/services_icon.ts CONFLICT (add/add): Merge conflict in components/popup/services_icon.ts Auto-merging components/popup/translate_language.tsx CONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx Auto-merging components/popup/translation_service.tsx CONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx Auto-merging components/popup/trial_pro.tsx CONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx Auto-merging components/popup/widgets.tsx CONFLICT (add/add): Merge conflict in components/popup/widgets.tsx Auto-merging components/popup_generic.tsx CONFLICT (add/add): Merge conflict in components/popup_generic.tsx Auto-merging components/popup_types.ts CONFLICT (add/add): Merge conflict in components/popup_types.ts CONFLICT (modify/delete): components/select_drop_down.tsx deleted in HEAD and modified in main. Version main of components/select_drop_down.tsx left in tree. Auto-merging components/select_link.tsx CONFLICT (content): Merge conflict in components/select_link.tsx Auto-merging components/service_select.tsx CONFLICT (add/add): Merge conflict in components/service_select.tsx Auto-merging components/shadow_components/error_result/error_result.tsx CONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx Auto-merging components/shadow_components/service_select/select_select.tsx CONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx Auto-merging components/shadow_components/service_select/style.ts CONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts Auto-merging components/shortcut.tsx CONFLICT (add/add): Merge conflict in components/shortcut.tsx Auto-merging components/switch.tsx CONFLICT (content): Merge conflict in components/switch.tsx Auto-merging components/sync_latest.tsx CONFLICT (content): Merge conflict in components/sync_latest.tsx Auto-merging components/tags_input.tsx CONFLICT (add/add): Merge conflict in components/tags_input.tsx Auto-merging components/tooltip.tsx CONFLICT (add/add): Merge conflict in components/tooltip.tsx Auto-merging components/touch_mouse_helper.tsx CONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx Auto-merging components/url_list.tsx CONFLICT (content): Merge conflict in components/url_list.tsx CONFLICT (modify/delete): config.ts deleted in HEAD and modified in main. Version main of config.ts left in tree. Auto-merging constant.ts CONFLICT (content): Merge conflict in constant.ts CONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main. Version main of content_dom_listeners.ts left in tree. Auto-merging content_main.ts CONFLICT (content): Merge conflict in content_main.ts CONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main. Version main of content_message_listeners.ts left in tree. Auto-merging content_script.ts CONFLICT (content): Merge conflict in content_script.ts Auto-merging content_start.ts CONFLICT (add/add): Merge conflict in content_start.ts Auto-merging cron.ts CONFLICT (content): Merge conflict in cron.ts Auto-merging default_config.json CONFLICT (add/add): Merge conflict in default_config.json Auto-merging deno.json CONFLICT (content): Merge conflict in deno.json Auto-merging deno.lock CONFLICT (add/add): Merge conflict in deno.lock CONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main. Version main of deps.ts left in tree. Auto-merging deps/dev_deps.ts CONFLICT (content): Merge conflict in deps/dev_deps.ts Auto-merging docs/CONTRIBUTION.md CONFLICT (add/add): Merge conflict in docs/CONTRIBUTION.md Auto-merging docs/CONTRIBUTION_EN.md CONFLICT (add/add): Merge conflict in docs/CONTRIBUTION_EN.md CONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main. Version main of docs/TODO.md left in tree. CONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main. Version main of docs/config.md left in tree. Auto-merging docs/context.md CONFLICT (add/add): Merge conflict in docs/context.md Auto-merging docs/domain-transfer.md CONFLICT (add/add): Merge conflict in docs/domain-transfer.md CONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main. Version main of docs/edge.md left in tree. Auto-merging docs/firefox-review.md CONFLICT (add/add): Merge conflict in docs/firefox-review.md Auto-merging docs/introduce.md CONFLICT (add/add): Merge conflict in docs/introduce.md Auto-merging docs/issues.md CONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main. Version main of docs/sale.md left in tree. Auto-merging dom/apply_user_config_css.ts CONFLICT (content): Merge conflict in dom/apply_user_config_css.ts Auto-merging dom/context.ts CONFLICT (content): Merge conflict in dom/context.ts Auto-merging dom/inject_css_to_frame.ts CONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts Auto-merging dom/main.ts CONFLICT (content): Merge conflict in dom/main.ts Auto-merging dom/paragraph_to_html.ts CONFLICT (content): Merge conflict in dom/paragraph_to_html.ts Auto-merging dom/util.ts CONFLICT (content): Merge conflict in dom/util.ts Auto-merging dom/util_test.ts CONFLICT (content): Merge conflict in dom/util_test.ts Auto-merging env.ts CONFLICT (content): Merge conflict in env.ts Auto-merging errors.ts CONFLICT (content): Merge conflict in errors.ts Auto-merging esbuild_deno_loader/deps.ts CONFLICT (content): Merge conflict in esbuild_deno_loader/deps.ts Auto-merging example/demo.tsx CONFLICT (content): Merge conflict in example/demo.tsx Auto-merging example/frame.html CONFLICT (content): Merge conflict in example/frame.html Auto-merging example/iframe.html CONFLICT (content): Merge conflict in example/iframe.html Auto-merging example/index.html CONFLICT (content): Merge conflict in example/index.html Auto-merging example/js-sdk.html CONFLICT (add/add): Merge conflict in example/js-sdk.html Auto-merging example/popup.html CONFLICT (add/add): Merge conflict in example/popup.html Auto-merging example/simple-p.html CONFLICT (add/add): Merge conflict in example/simple-p.html Auto-merging hooks/use_i18n.ts CONFLICT (content): Merge conflict in hooks/use_i18n.ts Auto-merging hooks/use_page_theme.ts CONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts Auto-merging hooks/use_position_adjuster.ts CONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts Auto-merging hooks/use_route.ts CONFLICT (content): Merge conflict in hooks/use_route.ts Auto-merging hooks/use_user_config.ts CONFLICT (content): Merge conflict in hooks/use_user_config.ts Auto-merging interface.ts CONFLICT (content): Merge conflict in interface.ts Auto-merging language/config.ts CONFLICT (add/add): Merge conflict in language/config.ts Auto-merging language/index.ts CONFLICT (add/add): Merge conflict in language/index.ts Auto-merging libs/preact-translation/translateProvider.tsx CONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx Auto-merging libs/preact-translation/useTranslate.tsx CONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx Auto-merging libs/preact-translation/utils.ts CONFLICT (content): Merge conflict in libs/preact-translation/utils.ts Auto-merging libs/protoframe/connector.ts CONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts Auto-merging libs/protoframe/mod.ts CONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts Auto-merging libs/retry.ts CONFLICT (add/add): Merge conflict in libs/retry.ts Auto-merging libs/subsrt-ts/subsrt_test.ts CONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts Auto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts CONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts Auto-merging libs/use-chrome-storage/useChromeStorage.ts CONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts Auto-merging locales/aeb.json CONFLICT (add/add): Merge conflict in locales/aeb.json Auto-merging locales/ar.json CONFLICT (add/add): Merge conflict in locales/ar.json Auto-merging locales/ars.json CONFLICT (add/add): Merge conflict in locales/ars.json Auto-merging locales/arz.json CONFLICT (add/add): Merge conflict in locales/arz.json Auto-merging locales/de.json CONFLICT (add/add): Merge conflict in locales/de.json Auto-merging locales/en.json CONFLICT (content): Merge conflict in locales/en.json Auto-merging locales/es.json CONFLICT (add/add): Merge conflict in locales/es.json Auto-merging locales/fa.json CONFLICT (content): Merge conflict in locales/fa.json Auto-merging locales/fr.json CONFLICT (add/add): Merge conflict in locales/fr.json Auto-merging locales/he.json CONFLICT (add/add): Merge conflict in locales/he.json Auto-merging locales/hi.json CONFLICT (add/add): Merge conflict in locales/hi.json Auto-merging locales/hu.json CONFLICT (add/add): Merge conflict in locales/hu.json Auto-merging locales/id.json CONFLICT (add/add): Merge conflict in locales/id.json Auto-merging locales/it.json CONFLICT (add/add): Merge conflict in locales/it.json Auto-merging locales/ja.json CONFLICT (add/add): Merge conflict in locales/ja.json Auto-merging locales/ko.json CONFLICT (add/add): Merge conflict in locales/ko.json Auto-merging locales/mod.ts CONFLICT (add/add): Merge conflict in locales/mod.ts Auto-merging locales/my.json CONFLICT (add/add): Merge conflict in locales/my.json Auto-merging locales/pt-BR.json CONFLICT (add/add): Merge conflict in locales/pt-BR.json Auto-merging locales/pt-PT.json CONFLICT (add/add): Merge conflict in locales/pt-PT.json Auto-merging locales/ru.json CONFLICT (add/add): Merge conflict in locales/ru.json Auto-merging locales/tr.json CONFLICT (add/add): Merge conflict in locales/tr.json Auto-merging locales/uk.json CONFLICT (add/add): Merge conflict in locales/uk.json Auto-merging locales/vi.json CONFLICT (add/add): Merge conflict in locales/vi.json Auto-merging locales/zh-CN.json CONFLICT (content): Merge conflict in locales/zh-CN.json Auto-merging locales/zh-TW.json CONFLICT (content): Merge conflict in locales/zh-TW.json Auto-merging manifest.json CONFLICT (content): Merge conflict in manifest.json Auto-merging menu.ts CONFLICT (content): Merge conflict in menu.ts CONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main. Version main of messager.ts left in tree. Auto-merging offscreen.ts CONFLICT (add/add): Merge conflict in offscreen.ts CONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main. Version main of page_popup.tsx left in tree. Auto-merging pages/about.tsx CONFLICT (content): Merge conflict in pages/about.tsx Auto-merging pages/advanced.tsx CONFLICT (content): Merge conflict in pages/advanced.tsx Auto-merging pages/ai_writing.tsx CONFLICT (add/add): Merge conflict in pages/ai_writing.tsx Auto-merging pages/assistants.tsx CONFLICT (add/add): Merge conflict in pages/assistants.tsx Auto-merging pages/components/assistants_detail.tsx CONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx Auto-merging pages/components/custom_assistants.tsx CONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx Auto-merging pages/components/header.tsx CONFLICT (add/add): Merge conflict in pages/components/header.tsx Auto-merging pages/components/input_select.tsx CONFLICT (add/add): Merge conflict in pages/components/input_select.tsx Auto-merging pages/components/loading.tsx CONFLICT (add/add): Merge conflict in pages/components/loading.tsx Auto-merging pages/components/subtitle_style_preview.tsx CONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx Auto-merging pages/components/translation_service.tsx CONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx Auto-merging pages/contact.tsx CONFLICT (add/add): Merge conflict in pages/contact.tsx Auto-merging pages/developer.tsx CONFLICT (content): Merge conflict in pages/developer.tsx Auto-merging pages/download_config.tsx CONFLICT (add/add): Merge conflict in pages/download_config.tsx Auto-merging pages/floating.tsx CONFLICT (add/add): Merge conflict in pages/floating.tsx Auto-merging pages/general.tsx CONFLICT (content): Merge conflict in pages/general.tsx Auto-merging pages/hooks.ts CONFLICT (add/add): Merge conflict in pages/hooks.ts Auto-merging pages/import_export/helper.ts CONFLICT (add/add): Merge conflict in pages/import_export/helper.ts Auto-merging pages/import_export/hooks.ts CONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts Auto-merging pages/import_export/index.tsx CONFLICT (add/add): Merge conflict in pages/import_export/index.tsx Auto-merging pages/input.tsx CONFLICT (add/add): Merge conflict in pages/input.tsx Auto-merging pages/manga.tsx CONFLICT (add/add): Merge conflict in pages/manga.tsx Auto-merging pages/mouse_hover.tsx CONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx Auto-merging pages/options.tsx CONFLICT (content): Merge conflict in pages/options.tsx Auto-merging pages/popup.tsx CONFLICT (content): Merge conflict in pages/popup.tsx Auto-merging pages/selection_translation.tsx CONFLICT (add/add): Merge conflict in pages/selection_translation.tsx Auto-merging pages/services.tsx CONFLICT (add/add): Merge conflict in pages/services.tsx Auto-merging pages/shortcuts.tsx CONFLICT (add/add): Merge conflict in pages/shortcuts.tsx Auto-merging pages/side-panel/count-tag.tsx CONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx Auto-merging pages/side-panel/hooks.ts CONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts Auto-merging pages/side-panel/index.tsx CONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx Auto-merging pages/side-panel/reward-center/hooks.ts CONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts Auto-merging pages/side-panel/reward-center/index.tsx CONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx Auto-merging pages/side-panel/reward-center/mod.ts CONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts Auto-merging pages/side-panel/select-service.tsx CONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx Auto-merging pages/side-panel/translate-input.tsx CONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx Auto-merging pages/subtitle.tsx CONFLICT (add/add): Merge conflict in pages/subtitle.tsx Auto-merging pages/terms/glossary_editor.tsx CONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx Auto-merging pages/terms/helper.ts CONFLICT (add/add): Merge conflict in pages/terms/helper.ts Auto-merging pages/terms/hooks.ts CONFLICT (add/add): Merge conflict in pages/terms/hooks.ts Auto-merging pages/terms/index.tsx CONFLICT (add/add): Merge conflict in pages/terms/index.tsx Auto-merging pages/terms/terms_detail.tsx CONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx Auto-merging pages/translation-services/consent_modal.tsx CONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx Auto-merging pages/translation-services/hooks.ts CONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts Auto-merging pages/translation-services/modal.tsx CONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx Auto-merging pages/translation-services/service-group.tsx CONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx Auto-merging pages/translation-services/service-item.tsx CONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx Auto-merging pages/translation-services/service-setting.tsx CONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx Auto-merging pages/util.ts CONFLICT (add/add): Merge conflict in pages/util.ts Auto-merging pages/util_test.ts CONFLICT (add/add): Merge conflict in pages/util_test.ts Auto-merging pages/verify-service.ts CONFLICT (add/add): Merge conflict in pages/verify-service.ts Auto-merging popup.tsx CONFLICT (content): Merge conflict in popup.tsx Auto-merging scripts/check-i18n-params.ts CONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts Auto-merging scripts/deno.lock CONFLICT (add/add): Merge conflict in scripts/deno.lock Auto-merging scripts/generate_icon.ts CONFLICT (content): Merge conflict in scripts/generate_icon.ts Auto-merging scripts/generate_icon_badge.ts CONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts Auto-merging scripts/generate_translatedText.ts CONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts Auto-merging scripts/quality/common.js CONFLICT (add/add): Merge conflict in scripts/quality/common.js Auto-merging scripts/quality/test_services.js CONFLICT (add/add): Merge conflict in scripts/quality/test_services.js Auto-merging scripts/remove_unused_keys.sh CONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh Auto-merging scripts/update_locales.ts CONFLICT (add/add): Merge conflict in scripts/update_locales.ts Auto-merging serve.ts CONFLICT (content): Merge conflict in serve.ts Auto-merging services/access_token.ts CONFLICT (add/add): Merge conflict in services/access_token.ts Auto-merging services/ai.ts CONFLICT (add/add): Merge conflict in services/ai.ts Auto-merging services/ai_test.ts CONFLICT (add/add): Merge conflict in services/ai_test.ts Auto-merging services/bai.ts CONFLICT (content): Merge conflict in services/bai.ts Auto-merging services/baidu_qianfan.ts CONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts Auto-merging services/bing/mod.ts CONFLICT (content): Merge conflict in services/bing/mod.ts CONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main. Version main of services/cache.ts left in tree. Auto-merging services/claude.ts CONFLICT (add/add): Merge conflict in services/claude.ts Auto-merging services/config.ts CONFLICT (add/add): Merge conflict in services/config.ts Auto-merging services/deepl.ts CONFLICT (content): Merge conflict in services/deepl.ts Auto-merging services/gemini.ts CONFLICT (add/add): Merge conflict in services/gemini.ts Auto-merging services/google.ts Auto-merging services/helper.ts CONFLICT (add/add): Merge conflict in services/helper.ts Auto-merging services/helper_test.ts CONFLICT (add/add): Merge conflict in services/helper_test.ts Auto-merging services/mock.ts CONFLICT (content): Merge conflict in services/mock.ts Auto-merging services/mod.ts CONFLICT (content): Merge conflict in services/mod.ts Auto-merging services/niu.ts CONFLICT (content): Merge conflict in services/niu.ts Auto-merging services/pro.ts CONFLICT (add/add): Merge conflict in services/pro.ts Auto-merging services/silicon_cloud.ts CONFLICT (add/add): Merge conflict in services/silicon_cloud.ts Auto-merging services/tencent_hunyuan.ts CONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts Auto-merging services/translation.ts CONFLICT (content): Merge conflict in services/translation.ts Auto-merging services/translation_test.ts CONFLICT (add/add): Merge conflict in services/translation_test.ts Auto-merging services/util.ts CONFLICT (content): Merge conflict in services/util.ts Auto-merging services/util_test.ts CONFLICT (content): Merge conflict in services/util_test.ts Auto-merging services/zhipu.ts CONFLICT (add/add): Merge conflict in services/zhipu.ts Auto-merging side-panel.tsx CONFLICT (add/add): Merge conflict in side-panel.tsx Auto-merging src/ai-assistant/mod.ts CONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts Auto-merging src/ai-assistant/mod_test.ts CONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts Auto-merging src/ai-writing/components/Insert-btn.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx Auto-merging src/ai-writing/components/ai-writing-button-container.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx Auto-merging src/ai-writing/components/ai-writing-modal-container.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx Auto-merging src/ai-writing/components/ai-writing-modal.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx Auto-merging src/ai-writing/components/chat.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx Auto-merging src/ai-writing/components/close-modal.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx Auto-merging src/ai-writing/components/error.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx Auto-merging src/ai-writing/components/language-select.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx Auto-merging src/ai-writing/components/prompt-style.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx Auto-merging src/ai-writing/components/suggestion.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx Auto-merging src/ai-writing/components/summary.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx Auto-merging src/ai-writing/components/translate-result.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx Auto-merging src/ai-writing/components/user-input-text.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx Auto-merging src/ai-writing/components/user-input.tsx CONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx Auto-merging src/ai-writing/hooks/use-ai-writing-config.ts CONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts Auto-merging src/ai-writing/hooks/use-drag-modal.ts CONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts Auto-merging src/ai-writing/hooks/use-translate.ts CONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts Auto-merging src/ai-writing/mod.ts CONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts Auto-merging src/ai-writing/prompts.ts CONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts Auto-merging src/ai-writing/styles.ts CONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts Auto-merging src/ai-writing/types.ts CONFLICT (add/add): Merge conflict in src/ai-writing/types.ts Auto-merging src/auto_translate_referrer.ts CONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts Auto-merging src/body-filter.ts CONFLICT (add/add): Merge conflict in src/body-filter.ts Auto-merging src/browser-bridge/dom-event.ts CONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts Auto-merging src/browser-bridge/inject.ts CONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts Auto-merging src/browser-bridge/message.ts CONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts Auto-merging src/constant-urls.ts CONFLICT (add/add): Merge conflict in src/constant-urls.ts Auto-merging src/constant-urls_test.ts CONFLICT (add/add): Merge conflict in src/constant-urls_test.ts Auto-merging src/contexts/mod.ts CONFLICT (add/add): Merge conflict in src/contexts/mod.ts Auto-merging src/dialogs/ai-context-upgrade.tsx CONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx Auto-merging src/ebook-builder/mod.ts CONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts Auto-merging src/encode.ts CONFLICT (add/add): Merge conflict in src/encode.ts Auto-merging src/encode_test.ts CONFLICT (add/add): Merge conflict in src/encode_test.ts Auto-merging src/error/modal-ui.ts CONFLICT (add/add): Merge conflict in src/error/modal-ui.ts Auto-merging src/error/modal.ts CONFLICT (add/add): Merge conflict in src/error/modal.ts Auto-merging src/global_state.ts CONFLICT (add/add): Merge conflict in src/global_state.ts Auto-merging src/gpt/mod.ts CONFLICT (add/add): Merge conflict in src/gpt/mod.ts Auto-merging src/hotkey-hover/mod.ts CONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts Auto-merging src/html-engine/core.ts CONFLICT (add/add): Merge conflict in src/html-engine/core.ts Auto-merging src/html-engine/interface.ts CONFLICT (add/add): Merge conflict in src/html-engine/interface.ts Auto-merging src/html-engine/mod.ts CONFLICT (add/add): Merge conflict in src/html-engine/mod.ts Auto-merging src/html-engine/report.ts CONFLICT (add/add): Merge conflict in src/html-engine/report.ts Auto-merging src/html-engine/rule.ts CONFLICT (add/add): Merge conflict in src/html-engine/rule.ts Auto-merging src/html-engine/util.ts CONFLICT (add/add): Merge conflict in src/html-engine/util.ts Auto-merging src/image/menu.ts CONFLICT (add/add): Merge conflict in src/image/menu.ts Auto-merging src/image/mod.ts CONFLICT (add/add): Merge conflict in src/image/mod.ts Auto-merging src/image/tools/hook.ts CONFLICT (add/add): Merge conflict in src/image/tools/hook.ts Auto-merging src/image/tools/index.tsx CONFLICT (add/add): Merge conflict in src/image/tools/index.tsx Auto-merging src/image/translate.ts CONFLICT (add/add): Merge conflict in src/image/translate.ts Auto-merging src/image/util.ts CONFLICT (add/add): Merge conflict in src/image/util.ts Auto-merging src/input/mod.ts CONFLICT (add/add): Merge conflict in src/input/mod.ts Auto-merging src/main.ts CONFLICT (add/add): Merge conflict in src/main.ts Auto-merging src/mock-side-panel/mod.tsx CONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx Auto-merging src/new-user-guide/components/arrow_animation.tsx CONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx Auto-merging src/new-user-guide/components/index.tsx CONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx Auto-merging src/new-user-guide/components/select-service-guide.tsx CONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx Auto-merging src/new-user-guide/mod.ts CONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts Auto-merging src/notification/hook.ts CONFLICT (add/add): Merge conflict in src/notification/hook.ts Auto-merging src/notification/mod.tsx CONFLICT (add/add): Merge conflict in src/notification/mod.tsx Auto-merging src/notification/utils.ts CONFLICT (add/add): Merge conflict in src/notification/utils.ts Auto-merging src/pdf/util.ts CONFLICT (add/add): Merge conflict in src/pdf/util.ts Auto-merging src/resources/build-in-config.content.ts CONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts Auto-merging src/resources/build-in-config.ts CONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts Auto-merging src/resources/build-in-config.userscript.ts CONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts Auto-merging src/resources/final-config.content.ts CONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts Auto-merging src/resources/final-config.ts CONFLICT (add/add): Merge conflict in src/resources/final-config.ts Auto-merging src/resources/locales.ts CONFLICT (add/add): Merge conflict in src/resources/locales.ts Auto-merging src/resources/locales.userscript.ts CONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts Auto-merging src/rich-translate.ts CONFLICT (add/add): Merge conflict in src/rich-translate.ts Auto-merging src/rich-translate_test.ts CONFLICT (add/add): Merge conflict in src/rich-translate_test.ts Auto-merging src/selection-translation/components/copy_text.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx Auto-merging src/selection-translation/components/dropdown.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx Auto-merging src/selection-translation/components/feedback.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx Auto-merging src/selection-translation/components/inner_translator.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx Auto-merging src/selection-translation/components/speaker.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx Auto-merging src/selection-translation/components/styles.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx Auto-merging src/selection-translation/components/translation_modal.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx Auto-merging src/selection-translation/components/trigger_icon.tsx CONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx Auto-merging src/selection-translation/hooks/use-modal-position.ts CONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts Auto-merging src/selection-translation/hooks/use-selection-service.ts CONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts Auto-merging src/selection-translation/mod.ts CONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts Auto-merging src/selection-translation/types.ts CONFLICT (add/add): Merge conflict in src/selection-translation/types.ts Auto-merging src/selection-translation/utils.ts CONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts Auto-merging src/subtitle/mod.ts CONFLICT (add/add): Merge conflict in src/subtitle/mod.ts Auto-merging src/translate-context/mod.ts CONFLICT (add/add): Merge conflict in src/translate-context/mod.ts Auto-merging src/translate-context/mod_test.ts CONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts Auto-merging src/tts/index.ts CONFLICT (add/add): Merge conflict in src/tts/index.ts Auto-merging src/utils/chrome-util.ts CONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts Auto-merging src/utils/crypto-config.ts CONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts Auto-merging src/utils/crypto-config_test.ts CONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts Auto-merging src/utils/hash.ts CONFLICT (add/add): Merge conflict in src/utils/hash.ts Auto-merging src/utils/secret-regex.ts CONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts Auto-merging src/utils/translation_theme.ts CONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts Auto-merging src/utils/user-config.ts CONFLICT (add/add): Merge conflict in src/utils/user-config.ts Auto-merging src/utils/util.ts CONFLICT (add/add): Merge conflict in src/utils/util.ts Auto-merging src/utils/util_test.ts CONFLICT (add/add): Merge conflict in src/utils/util_test.ts Auto-merging src/video-subtitle/attach-subtitle/hook.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts Auto-merging src/video-subtitle/attach-subtitle/index.tsx CONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx Auto-merging src/video-subtitle/deduplicate_subtitle_test.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts Auto-merging src/video-subtitle/download_manager.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts Auto-merging src/video-subtitle/inject.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts Auto-merging src/video-subtitle/mod.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts Auto-merging src/video-subtitle/quick-button/hook.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts Auto-merging src/video-subtitle/quick-button/icon.tsx CONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx Auto-merging src/video-subtitle/quick-button/index.tsx CONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx Auto-merging src/video-subtitle/translators/ai.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts Auto-merging src/video-subtitle/translators/av.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts Auto-merging src/video-subtitle/translators/disneyplus.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts Auto-merging src/video-subtitle/translators/index.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts Auto-merging src/video-subtitle/translators/inject_util_test.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts Auto-merging src/video-subtitle/translators/khanacademy.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts Auto-merging src/video-subtitle/translators/live.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts Auto-merging src/video-subtitle/translators/mubi.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts Auto-merging src/video-subtitle/translators/multi_attach_vtt.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts Auto-merging src/video-subtitle/translators/subsrt.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts Auto-merging src/video-subtitle/translators/text_track.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts Auto-merging src/video-subtitle/translators/text_track_dynamic.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts Auto-merging src/video-subtitle/translators/udemy.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts Auto-merging src/video-subtitle/translators/util.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts Auto-merging src/video-subtitle/translators/util_test.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts Auto-merging src/video-subtitle/translators/youtube.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts Auto-merging src/video-subtitle/util.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts Auto-merging src/video-subtitle/youtube/mod.ts CONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts Auto-merging src/yaml.ts CONFLICT (add/add): Merge conflict in src/yaml.ts Auto-merging src/yaml_test.ts CONFLICT (add/add): Merge conflict in src/yaml_test.ts warning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main) Auto-merging static/badge-icons/128.png CONFLICT (add/add): Merge conflict in static/badge-icons/128.png warning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main) Auto-merging static/badge-icons/256.png CONFLICT (add/add): Merge conflict in static/badge-icons/256.png warning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main) Auto-merging static/badge-icons/32.png CONFLICT (add/add): Merge conflict in static/badge-icons/32.png warning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main) Auto-merging static/badge-icons/48.png CONFLICT (add/add): Merge conflict in static/badge-icons/48.png warning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main) Auto-merging static/badge-icons/64.png CONFLICT (add/add): Merge conflict in static/badge-icons/64.png warning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main) Auto-merging static/badge-icons/dark-128.png CONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png warning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main) Auto-merging static/badge-icons/dark-256.png CONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png warning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main) Auto-merging static/badge-icons/dark-32.png CONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png warning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main) Auto-merging static/badge-icons/dark-48.png CONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png warning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main) Auto-merging static/badge-icons/dark-64.png CONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png warning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main) Auto-merging static/icons/dark-128.png CONFLICT (add/add): Merge conflict in static/icons/dark-128.png warning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main) Auto-merging static/icons/dark-256.png CONFLICT (add/add): Merge conflict in static/icons/dark-256.png warning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main) Auto-merging static/icons/dark-32.png CONFLICT (add/add): Merge conflict in static/icons/dark-32.png warning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main) Auto-merging static/icons/dark-48.png CONFLICT (add/add): Merge conflict in static/icons/dark-48.png warning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main) Auto-merging static/icons/dark-64.png CONFLICT (add/add): Merge conflict in static/icons/dark-64.png warning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main) Auto-merging static/icons/toolbar-icon.png CONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png Auto-merging static/offscreen.html CONFLICT (add/add): Merge conflict in static/offscreen.html Auto-merging static/options.html CONFLICT (content): Merge conflict in static/options.html Auto-merging static/side-panel.html CONFLICT (add/add): Merge conflict in static/side-panel.html Auto-merging static/styles/assistant.css CONFLICT (add/add): Merge conflict in static/styles/assistant.css Auto-merging static/styles/inject.css CONFLICT (content): Merge conflict in static/styles/inject.css Auto-merging static/styles/input.css CONFLICT (add/add): Merge conflict in static/styles/input.css Auto-merging static/styles/options.css CONFLICT (content): Merge conflict in static/styles/options.css Auto-merging static/styles/popup.css CONFLICT (content): Merge conflict in static/styles/popup.css Auto-merging sync/google_auth.ts CONFLICT (content): Merge conflict in sync/google_auth.ts Auto-merging sync/util.ts CONFLICT (content): Merge conflict in sync/util.ts Auto-merging throttle_request_bus.ts CONFLICT (add/add): Merge conflict in throttle_request_bus.ts Auto-merging touch_shortcuts.ts CONFLICT (add/add): Merge conflict in touch_shortcuts.ts Auto-merging twind_config.ts CONFLICT (content): Merge conflict in twind_config.ts Auto-merging userscript.ts CONFLICT (content): Merge conflict in userscript.ts Auto-merging userscript/arrow_animation.tsx CONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx Auto-merging userscript/close_modal.tsx CONFLICT (add/add): Merge conflict in userscript/close_modal.tsx Auto-merging userscript/float_ball.tsx CONFLICT (add/add): Merge conflict in userscript/float_ball.tsx Auto-merging userscript/float_ball_entry.tsx CONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx Auto-merging userscript/float_ball_hook.ts CONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts Auto-merging userscript/float_ball_icon.tsx CONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx Auto-merging userscript/guide.tsx CONFLICT (add/add): Merge conflict in userscript/guide.tsx Auto-merging userscript/init_popup.tsx CONFLICT (add/add): Merge conflict in userscript/init_popup.tsx Auto-merging userscript/manga_guide.tsx CONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx warning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main) Auto-merging userscript/options/favicon.ico CONFLICT (add/add): Merge conflict in userscript/options/favicon.ico Auto-merging userscript/options/index.html CONFLICT (content): Merge conflict in userscript/options/index.html Auto-merging userscript/options_entry.ts CONFLICT (content): Merge conflict in userscript/options_entry.ts Auto-merging userscript/popup_app.tsx CONFLICT (content): Merge conflict in userscript/popup_app.tsx Auto-merging userscript/sdk/lite-entry.ts CONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts Auto-merging userscript/sdk/lite-helper.ts CONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts Auto-merging userscript/sdk/lite-main.ts CONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts Auto-merging userscript/sdk/lite-view.tsx CONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx Auto-merging userscript/sheet.tsx CONFLICT (add/add): Merge conflict in userscript/sheet.tsx CONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main. Version main of userscript_command_listeners.ts left in tree. CONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main. Version main of userscript_message.ts left in tree. Auto-merging utils/aes_safe_test.ts CONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts Auto-merging utils/aes_test.ts CONFLICT (add/add): Merge conflict in utils/aes_test.ts Auto-merging utils/app_version.ts CONFLICT (add/add): Merge conflict in utils/app_version.ts Auto-merging utils/app_version_test.ts CONFLICT (add/add): Merge conflict in utils/app_version_test.ts Auto-merging utils/append_tsx.tsx CONFLICT (add/add): Merge conflict in utils/append_tsx.tsx Auto-merging utils/browser_app.ts CONFLICT (add/add): Merge conflict in utils/browser_app.ts Auto-merging utils/compare_version.ts Auto-merging utils/date.ts CONFLICT (content): Merge conflict in utils/date.ts Auto-merging utils/date_test.ts CONFLICT (add/add): Merge conflict in utils/date_test.ts Auto-merging utils/discount_activity.ts CONFLICT (add/add): Merge conflict in utils/discount_activity.ts Auto-merging utils/expression.ts CONFLICT (add/add): Merge conflict in utils/expression.ts Auto-merging utils/expression_test.ts CONFLICT (add/add): Merge conflict in utils/expression_test.ts Auto-merging utils/fake_user.ts CONFLICT (add/add): Merge conflict in utils/fake_user.ts Auto-merging utils/format_language.ts CONFLICT (content): Merge conflict in utils/format_language.ts Auto-merging utils/iframe.ts CONFLICT (content): Merge conflict in utils/iframe.ts Auto-merging utils/is_pro.ts CONFLICT (add/add): Merge conflict in utils/is_pro.ts Auto-merging utils/is_valid_html_url.ts CONFLICT (content): Merge conflict in utils/is_valid_html_url.ts Auto-merging utils/js_sdk.ts CONFLICT (add/add): Merge conflict in utils/js_sdk.ts Auto-merging utils/language_detect_api.ts CONFLICT (add/add): Merge conflict in utils/language_detect_api.ts Auto-merging utils/language_detect_google.ts CONFLICT (add/add): Merge conflict in utils/language_detect_google.ts Auto-merging utils/mac_test.ts CONFLICT (add/add): Merge conflict in utils/mac_test.ts Auto-merging utils/merge_rule_test.ts CONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts Auto-merging utils/page_view_report.ts CONFLICT (add/add): Merge conflict in utils/page_view_report.ts Auto-merging utils/platform.ts CONFLICT (content): Merge conflict in utils/platform.ts Auto-merging utils/pro_service_trial.ts CONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts Auto-merging utils/rate_limiter.ts CONFLICT (add/add): Merge conflict in utils/rate_limiter.ts Auto-merging utils/rate_limiter_test.ts CONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts Auto-merging utils/split_text.ts CONFLICT (add/add): Merge conflict in utils/split_text.ts Auto-merging utils/split_text_test.ts CONFLICT (add/add): Merge conflict in utils/split_text_test.ts Auto-merging utils/subtitle_styles_items.ts CONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts Auto-merging utils/update_models_test.ts CONFLICT (add/add): Merge conflict in utils/update_models_test.ts Auto-merging utils/url_match_test.ts CONFLICT (content): Merge conflict in utils/url_match_test.ts Auto-merging web-options/setup_web_options_page.ts CONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts Automatic merge failed; fix conflicts and then commit the result. (1) 10 hours ago
None Changes committed Immersive Translate Extension English	Changes committed 10 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Chinese (Traditional)	English 1 character edited Translated Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Hebrew	English 1 character edited Needs editing Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Japanese	English 1 character edited Translated Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Vietnamese	English 1 character edited Needs editing Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Portuguese (Portugal)	English 1 character edited Needs editing Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Portuguese (Brazil)	English 1 character edited Needs editing Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Italian	English 1 character edited Needs editing Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago
rachpiepcuanvanh Source string changed Immersive Translate Extension Portuguese	English 1 character edited Empty Free bilingual web page translator with PDF translation (preserving layout), video subtitle translation (YouTube, Netflix), and EPUB ebook translation. Supports AI translation services including OpenAI (ChatGPT), DeepL, Gemini, and more. 12 hours ago

Browse all component changes