Change List

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "count": 131983,
    "next": "https://weblate.immersivetranslate.com/api/changes/?format=api&page=2",
    "previous": null,
    "results": [
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T04:01:02.973037Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151169,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151169/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T04:00:59.435453Z",
            "action": 21,
            "target": "",
            "id": 151168,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151168/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T04:00:53.263462Z",
            "action": 53,
            "target": "",
            "id": 151167,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151167/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T02:42:10.714967Z",
            "action": 22,
            "target": "Auto-merging .gitignore\nCONFLICT (content): Merge conflict in .gitignore\nAuto-merging Makefile\nCONFLICT (content): Merge conflict in Makefile\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAuto-merging assets/constant.ts\nCONFLICT (add/add): Merge conflict in assets/constant.ts\nwarning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main)\nAuto-merging assets/dark-icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png\nwarning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main)\nAuto-merging assets/dark-icon.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon.png\nwarning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main)\nAuto-merging assets/icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/icon-badge.png\nwarning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main)\nAuto-merging assets/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in assets/toolbar-icon.png\nAuto-merging background.ts\nCONFLICT (content): Merge conflict in background.ts\nAuto-merging background/read_time.ts\nCONFLICT (add/add): Merge conflict in background/read_time.ts\nAuto-merging background/video_time.ts\nCONFLICT (add/add): Merge conflict in background/video_time.ts\nCONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main.  Version main of background_command_listeners.ts left in tree.\nCONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main.  Version main of background_message_listeners.ts left in tree.\nAuto-merging background_test.ts\nCONFLICT (content): Merge conflict in background_test.ts\nAuto-merging browser/background_fetch_stream.ts\nCONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts\nCONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main.  Version main of browser/cache_manager.ts left in tree.\nAuto-merging browser/mock_browser.ts\nCONFLICT (content): Merge conflict in browser/mock_browser.ts\nAuto-merging browser/request.ts\nCONFLICT (content): Merge conflict in browser/request.ts\nAuto-merging browser/userscript_polyfill.ts\nCONFLICT (content): Merge conflict in browser/userscript_polyfill.ts\nCONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main.  Version main of browser_deps.ts left in tree.\nAuto-merging browser_proxy.ts\nCONFLICT (content): Merge conflict in browser_proxy.ts\nCONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main.  Version main of browser_updated_listeners.ts left in tree.\nCONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main.  Version main of buildin_config.json left in tree.\nAuto-merging cli.ts\nCONFLICT (content): Merge conflict in cli.ts\nAuto-merging components/add_models_modal.tsx\nCONFLICT (add/add): Merge conflict in components/add_models_modal.tsx\nAuto-merging components/add_url_modal.tsx\nCONFLICT (content): Merge conflict in components/add_url_modal.tsx\nAuto-merging components/always_lang.tsx\nCONFLICT (content): Merge conflict in components/always_lang.tsx\nAuto-merging components/button_drop_down.tsx\nCONFLICT (content): Merge conflict in components/button_drop_down.tsx\nAuto-merging components/config_sync.tsx\nCONFLICT (content): Merge conflict in components/config_sync.tsx\nAuto-merging components/download_app.tsx\nCONFLICT (add/add): Merge conflict in components/download_app.tsx\nAuto-merging components/error_wrapper.tsx\nCONFLICT (add/add): Merge conflict in components/error_wrapper.tsx\nAuto-merging components/icons.tsx\nCONFLICT (add/add): Merge conflict in components/icons.tsx\nAuto-merging components/input_row.tsx\nCONFLICT (content): Merge conflict in components/input_row.tsx\nAuto-merging components/modal.tsx\nCONFLICT (add/add): Merge conflict in components/modal.tsx\nAuto-merging components/nav_left.tsx\nCONFLICT (content): Merge conflict in components/nav_left.tsx\nAuto-merging components/option_field.tsx\nCONFLICT (content): Merge conflict in components/option_field.tsx\nAuto-merging components/options_button.tsx\nCONFLICT (content): Merge conflict in components/options_button.tsx\nAuto-merging components/popup.tsx\nCONFLICT (content): Merge conflict in components/popup.tsx\nAuto-merging components/popup/always_translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx\nAuto-merging components/popup/footer.tsx\nCONFLICT (add/add): Merge conflict in components/popup/footer.tsx\nAuto-merging components/popup/for_this_site.tsx\nCONFLICT (add/add): Merge conflict in components/popup/for_this_site.tsx\nAuto-merging components/popup/mouse_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/mouse_translate.tsx\nAuto-merging components/popup/selection_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/selection_translate.tsx\nAuto-merging components/popup/services_icon.ts\nCONFLICT (add/add): Merge conflict in components/popup/services_icon.ts\nAuto-merging components/popup/translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx\nAuto-merging components/popup/translation_service.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx\nAuto-merging components/popup/trial_pro.tsx\nCONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx\nAuto-merging components/popup/widgets.tsx\nCONFLICT (add/add): Merge conflict in components/popup/widgets.tsx\nAuto-merging components/popup_generic.tsx\nCONFLICT (add/add): Merge conflict in components/popup_generic.tsx\nAuto-merging components/popup_types.ts\nCONFLICT (add/add): Merge conflict in components/popup_types.ts\nCONFLICT (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.\nAuto-merging components/select_link.tsx\nCONFLICT (content): Merge conflict in components/select_link.tsx\nAuto-merging components/service_select.tsx\nCONFLICT (add/add): Merge conflict in components/service_select.tsx\nAuto-merging components/shadow_components/error_result/error_result.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx\nAuto-merging components/shadow_components/service_select/select_select.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx\nAuto-merging components/shadow_components/service_select/style.ts\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts\nAuto-merging components/shortcut.tsx\nCONFLICT (add/add): Merge conflict in components/shortcut.tsx\nAuto-merging components/switch.tsx\nCONFLICT (content): Merge conflict in components/switch.tsx\nAuto-merging components/sync_latest.tsx\nCONFLICT (content): Merge conflict in components/sync_latest.tsx\nAuto-merging components/tags_input.tsx\nCONFLICT (add/add): Merge conflict in components/tags_input.tsx\nAuto-merging components/tooltip.tsx\nCONFLICT (add/add): Merge conflict in components/tooltip.tsx\nAuto-merging components/touch_mouse_helper.tsx\nCONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx\nAuto-merging components/url_list.tsx\nCONFLICT (content): Merge conflict in components/url_list.tsx\nCONFLICT (modify/delete): config.ts deleted in HEAD and modified in main.  Version main of config.ts left in tree.\nAuto-merging constant.ts\nCONFLICT (content): Merge conflict in constant.ts\nCONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main.  Version main of content_dom_listeners.ts left in tree.\nAuto-merging content_main.ts\nCONFLICT (content): Merge conflict in content_main.ts\nCONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main.  Version main of content_message_listeners.ts left in tree.\nAuto-merging content_script.ts\nAuto-merging content_start.ts\nCONFLICT (add/add): Merge conflict in content_start.ts\nAuto-merging cron.ts\nCONFLICT (content): Merge conflict in cron.ts\nAuto-merging default_config.json\nCONFLICT (add/add): Merge conflict in default_config.json\nAuto-merging deno.json\nCONFLICT (content): Merge conflict in deno.json\nAuto-merging deno.lock\nCONFLICT (add/add): Merge conflict in deno.lock\nCONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main.  Version main of deps.ts left in tree.\nAuto-merging deps/dev_deps.ts\nCONFLICT (content): Merge conflict in deps/dev_deps.ts\nCONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main.  Version main of docs/TODO.md left in tree.\nCONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main.  Version main of docs/config.md left in tree.\nCONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main.  Version main of docs/edge.md left in tree.\nAuto-merging docs/issues.md\nCONFLICT (content): Merge conflict in docs/issues.md\nCONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main.  Version main of docs/sale.md left in tree.\nAuto-merging dom/apply_user_config_css.ts\nCONFLICT (content): Merge conflict in dom/apply_user_config_css.ts\nAuto-merging dom/context.ts\nCONFLICT (content): Merge conflict in dom/context.ts\nAuto-merging dom/inject_css_to_frame.ts\nCONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts\nAuto-merging dom/main.ts\nCONFLICT (content): Merge conflict in dom/main.ts\nAuto-merging dom/paragraph_to_html.ts\nCONFLICT (content): Merge conflict in dom/paragraph_to_html.ts\nAuto-merging dom/util.ts\nCONFLICT (content): Merge conflict in dom/util.ts\nAuto-merging dom/util_test.ts\nCONFLICT (content): Merge conflict in dom/util_test.ts\nAuto-merging env.ts\nCONFLICT (content): Merge conflict in env.ts\nAuto-merging errors.ts\nCONFLICT (content): Merge conflict in errors.ts\nAuto-merging example/demo.tsx\nCONFLICT (content): Merge conflict in example/demo.tsx\nAuto-merging example/frame.html\nCONFLICT (content): Merge conflict in example/frame.html\nAuto-merging example/iframe.html\nCONFLICT (content): Merge conflict in example/iframe.html\nAuto-merging example/index.html\nCONFLICT (content): Merge conflict in example/index.html\nAuto-merging example/js-sdk.html\nCONFLICT (add/add): Merge conflict in example/js-sdk.html\nAuto-merging example/popup.html\nCONFLICT (add/add): Merge conflict in example/popup.html\nAuto-merging example/simple-p.html\nCONFLICT (add/add): Merge conflict in example/simple-p.html\nAuto-merging hooks/use_i18n.ts\nCONFLICT (content): Merge conflict in hooks/use_i18n.ts\nAuto-merging hooks/use_page_theme.ts\nCONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts\nAuto-merging hooks/use_position_adjuster.ts\nCONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts\nAuto-merging hooks/use_route.ts\nCONFLICT (content): Merge conflict in hooks/use_route.ts\nAuto-merging hooks/use_user_config.ts\nCONFLICT (content): Merge conflict in hooks/use_user_config.ts\nAuto-merging interface.ts\nCONFLICT (content): Merge conflict in interface.ts\nAuto-merging language/config.ts\nCONFLICT (add/add): Merge conflict in language/config.ts\nAuto-merging language/index.ts\nCONFLICT (add/add): Merge conflict in language/index.ts\nAuto-merging libs/preact-translation/translateProvider.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx\nAuto-merging libs/preact-translation/useTranslate.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx\nAuto-merging libs/preact-translation/utils.ts\nCONFLICT (content): Merge conflict in libs/preact-translation/utils.ts\nAuto-merging libs/protoframe/connector.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts\nAuto-merging libs/protoframe/mod.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts\nAuto-merging libs/retry.ts\nCONFLICT (add/add): Merge conflict in libs/retry.ts\nAuto-merging libs/subsrt-ts/subsrt_test.ts\nCONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts\nAuto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts\nAuto-merging libs/use-chrome-storage/useChromeStorage.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts\nAuto-merging locales/aeb.json\nCONFLICT (add/add): Merge conflict in locales/aeb.json\nAuto-merging locales/ar.json\nCONFLICT (add/add): Merge conflict in locales/ar.json\nAuto-merging locales/ars.json\nCONFLICT (add/add): Merge conflict in locales/ars.json\nAuto-merging locales/arz.json\nCONFLICT (add/add): Merge conflict in locales/arz.json\nAuto-merging locales/de.json\nCONFLICT (add/add): Merge conflict in locales/de.json\nAuto-merging locales/en.json\nCONFLICT (content): Merge conflict in locales/en.json\nAuto-merging locales/es.json\nCONFLICT (add/add): Merge conflict in locales/es.json\nAuto-merging locales/fa.json\nCONFLICT (content): Merge conflict in locales/fa.json\nAuto-merging locales/fr.json\nCONFLICT (add/add): Merge conflict in locales/fr.json\nAuto-merging locales/he.json\nCONFLICT (add/add): Merge conflict in locales/he.json\nAuto-merging locales/hi.json\nCONFLICT (add/add): Merge conflict in locales/hi.json\nAuto-merging locales/hu.json\nCONFLICT (add/add): Merge conflict in locales/hu.json\nAuto-merging locales/id.json\nCONFLICT (add/add): Merge conflict in locales/id.json\nAuto-merging locales/it.json\nCONFLICT (add/add): Merge conflict in locales/it.json\nAuto-merging locales/ja.json\nCONFLICT (add/add): Merge conflict in locales/ja.json\nAuto-merging locales/ko.json\nCONFLICT (add/add): Merge conflict in locales/ko.json\nAuto-merging locales/mod.ts\nCONFLICT (add/add): Merge conflict in locales/mod.ts\nAuto-merging locales/my.json\nCONFLICT (add/add): Merge conflict in locales/my.json\nAuto-merging locales/pt-BR.json\nCONFLICT (add/add): Merge conflict in locales/pt-BR.json\nAuto-merging locales/pt-PT.json\nCONFLICT (add/add): Merge conflict in locales/pt-PT.json\nAuto-merging locales/ru.json\nCONFLICT (add/add): Merge conflict in locales/ru.json\nAuto-merging locales/tr.json\nCONFLICT (add/add): Merge conflict in locales/tr.json\nAuto-merging locales/uk.json\nCONFLICT (add/add): Merge conflict in locales/uk.json\nAuto-merging locales/vi.json\nCONFLICT (add/add): Merge conflict in locales/vi.json\nAuto-merging locales/zh-CN.json\nCONFLICT (content): Merge conflict in locales/zh-CN.json\nAuto-merging locales/zh-TW.json\nCONFLICT (content): Merge conflict in locales/zh-TW.json\nAuto-merging manifest.json\nCONFLICT (content): Merge conflict in manifest.json\nAuto-merging menu.ts\nCONFLICT (content): Merge conflict in menu.ts\nCONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main.  Version main of messager.ts left in tree.\nAuto-merging offscreen.ts\nCONFLICT (add/add): Merge conflict in offscreen.ts\nCONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main.  Version main of page_popup.tsx left in tree.\nAuto-merging pages/about.tsx\nCONFLICT (content): Merge conflict in pages/about.tsx\nAuto-merging pages/advanced.tsx\nCONFLICT (content): Merge conflict in pages/advanced.tsx\nAuto-merging pages/ai_writing.tsx\nCONFLICT (add/add): Merge conflict in pages/ai_writing.tsx\nAuto-merging pages/assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/assistants.tsx\nAuto-merging pages/components/assistants_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx\nAuto-merging pages/components/custom_assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx\nAuto-merging pages/components/header.tsx\nCONFLICT (add/add): Merge conflict in pages/components/header.tsx\nAuto-merging pages/components/input_select.tsx\nCONFLICT (add/add): Merge conflict in pages/components/input_select.tsx\nAuto-merging pages/components/loading.tsx\nCONFLICT (add/add): Merge conflict in pages/components/loading.tsx\nAuto-merging pages/components/subtitle_style_preview.tsx\nCONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx\nAuto-merging pages/components/translation_service.tsx\nCONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx\nAuto-merging pages/contact.tsx\nCONFLICT (add/add): Merge conflict in pages/contact.tsx\nAuto-merging pages/developer.tsx\nCONFLICT (content): Merge conflict in pages/developer.tsx\nAuto-merging pages/download_config.tsx\nCONFLICT (add/add): Merge conflict in pages/download_config.tsx\nAuto-merging pages/floating.tsx\nCONFLICT (add/add): Merge conflict in pages/floating.tsx\nAuto-merging pages/general.tsx\nCONFLICT (content): Merge conflict in pages/general.tsx\nAuto-merging pages/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/hooks.ts\nAuto-merging pages/import_export/helper.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/helper.ts\nAuto-merging pages/import_export/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts\nAuto-merging pages/import_export/index.tsx\nCONFLICT (add/add): Merge conflict in pages/import_export/index.tsx\nAuto-merging pages/input.tsx\nCONFLICT (add/add): Merge conflict in pages/input.tsx\nAuto-merging pages/manga.tsx\nCONFLICT (add/add): Merge conflict in pages/manga.tsx\nAuto-merging pages/mouse_hover.tsx\nCONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx\nAuto-merging pages/options.tsx\nCONFLICT (content): Merge conflict in pages/options.tsx\nAuto-merging pages/popup.tsx\nCONFLICT (content): Merge conflict in pages/popup.tsx\nAuto-merging pages/selection_translation.tsx\nCONFLICT (add/add): Merge conflict in pages/selection_translation.tsx\nAuto-merging pages/services.tsx\nCONFLICT (add/add): Merge conflict in pages/services.tsx\nAuto-merging pages/shortcuts.tsx\nCONFLICT (add/add): Merge conflict in pages/shortcuts.tsx\nAuto-merging pages/side-panel/count-tag.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx\nAuto-merging pages/side-panel/dropdown.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/dropdown.tsx\nAuto-merging pages/side-panel/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts\nAuto-merging pages/side-panel/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx\nAuto-merging pages/side-panel/reward-center/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts\nAuto-merging pages/side-panel/reward-center/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx\nAuto-merging pages/side-panel/reward-center/mod.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts\nAuto-merging pages/side-panel/select-language.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-language.tsx\nAuto-merging pages/side-panel/select-service.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx\nAuto-merging pages/side-panel/translate-input.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx\nAuto-merging pages/subtitle.tsx\nCONFLICT (add/add): Merge conflict in pages/subtitle.tsx\nAuto-merging pages/terms/glossary_editor.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx\nAuto-merging pages/terms/helper.ts\nCONFLICT (add/add): Merge conflict in pages/terms/helper.ts\nAuto-merging pages/terms/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/terms/hooks.ts\nAuto-merging pages/terms/index.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/index.tsx\nAuto-merging pages/terms/terms_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx\nAuto-merging pages/translation-services/consent_modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx\nAuto-merging pages/translation-services/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts\nAuto-merging pages/translation-services/modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx\nAuto-merging pages/translation-services/service-group.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx\nAuto-merging pages/translation-services/service-item.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx\nAuto-merging pages/translation-services/service-setting.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx\nAuto-merging pages/util.ts\nCONFLICT (add/add): Merge conflict in pages/util.ts\nAuto-merging pages/util_test.ts\nCONFLICT (add/add): Merge conflict in pages/util_test.ts\nAuto-merging pages/verify-service.ts\nCONFLICT (add/add): Merge conflict in pages/verify-service.ts\nAuto-merging popup.tsx\nCONFLICT (content): Merge conflict in popup.tsx\nAuto-merging scripts/check-i18n-params.ts\nCONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts\nAuto-merging scripts/deno.lock\nCONFLICT (add/add): Merge conflict in scripts/deno.lock\nAuto-merging scripts/generate_icon.ts\nCONFLICT (content): Merge conflict in scripts/generate_icon.ts\nAuto-merging scripts/generate_icon_badge.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts\nAuto-merging scripts/generate_translatedText.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts\nAuto-merging scripts/quality/common.js\nCONFLICT (add/add): Merge conflict in scripts/quality/common.js\nAuto-merging scripts/quality/test_services.js\nCONFLICT (add/add): Merge conflict in scripts/quality/test_services.js\nAuto-merging scripts/remove_unused_keys.sh\nCONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh\nAuto-merging scripts/update_locales.ts\nCONFLICT (add/add): Merge conflict in scripts/update_locales.ts\nAuto-merging serve.ts\nCONFLICT (content): Merge conflict in serve.ts\nAuto-merging services/access_token.ts\nCONFLICT (add/add): Merge conflict in services/access_token.ts\nAuto-merging services/ai.ts\nCONFLICT (add/add): Merge conflict in services/ai.ts\nAuto-merging services/ai_test.ts\nCONFLICT (add/add): Merge conflict in services/ai_test.ts\nAuto-merging services/bai.ts\nCONFLICT (content): Merge conflict in services/bai.ts\nAuto-merging services/baidu_qianfan.ts\nCONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts\nAuto-merging services/bing/mod.ts\nCONFLICT (content): Merge conflict in services/bing/mod.ts\nCONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main.  Version main of services/cache.ts left in tree.\nAuto-merging services/claude.ts\nCONFLICT (add/add): Merge conflict in services/claude.ts\nAuto-merging services/config.ts\nCONFLICT (add/add): Merge conflict in services/config.ts\nAuto-merging services/deepl.ts\nCONFLICT (content): Merge conflict in services/deepl.ts\nAuto-merging services/gemini.ts\nCONFLICT (add/add): Merge conflict in services/gemini.ts\nAuto-merging services/google.ts\nAuto-merging services/helper.ts\nCONFLICT (add/add): Merge conflict in services/helper.ts\nAuto-merging services/helper_test.ts\nCONFLICT (add/add): Merge conflict in services/helper_test.ts\nAuto-merging services/mock.ts\nCONFLICT (content): Merge conflict in services/mock.ts\nAuto-merging services/mod.ts\nCONFLICT (content): Merge conflict in services/mod.ts\nAuto-merging services/pro.ts\nCONFLICT (add/add): Merge conflict in services/pro.ts\nAuto-merging services/silicon_cloud.ts\nCONFLICT (add/add): Merge conflict in services/silicon_cloud.ts\nAuto-merging services/tencent_hunyuan.ts\nCONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts\nAuto-merging services/translation.ts\nCONFLICT (content): Merge conflict in services/translation.ts\nAuto-merging services/translation_test.ts\nCONFLICT (add/add): Merge conflict in services/translation_test.ts\nAuto-merging services/util.ts\nCONFLICT (content): Merge conflict in services/util.ts\nAuto-merging services/util_test.ts\nCONFLICT (content): Merge conflict in services/util_test.ts\nAuto-merging services/zhipu.ts\nCONFLICT (add/add): Merge conflict in services/zhipu.ts\nAuto-merging side-panel.tsx\nCONFLICT (add/add): Merge conflict in side-panel.tsx\nAuto-merging src/ai-assistant/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts\nAuto-merging src/ai-assistant/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts\nAuto-merging src/ai-writing/components/Insert-btn.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx\nAuto-merging src/ai-writing/components/ai-writing-button-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx\nAuto-merging src/ai-writing/components/chat.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx\nAuto-merging src/ai-writing/components/close-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx\nAuto-merging src/ai-writing/components/error.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx\nAuto-merging src/ai-writing/components/language-select.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx\nAuto-merging src/ai-writing/components/prompt-style.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx\nAuto-merging src/ai-writing/components/suggestion.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx\nAuto-merging src/ai-writing/components/summary.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx\nAuto-merging src/ai-writing/components/translate-result.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx\nAuto-merging src/ai-writing/components/user-input-text.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx\nAuto-merging src/ai-writing/components/user-input.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx\nAuto-merging src/ai-writing/hooks/use-ai-writing-config.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts\nAuto-merging src/ai-writing/hooks/use-drag-modal.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts\nAuto-merging src/ai-writing/hooks/use-translate.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts\nAuto-merging src/ai-writing/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts\nAuto-merging src/ai-writing/prompts.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts\nAuto-merging src/ai-writing/styles.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts\nAuto-merging src/ai-writing/types.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/types.ts\nAuto-merging src/auto_translate_referrer.ts\nCONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts\nAuto-merging src/body-filter.ts\nCONFLICT (add/add): Merge conflict in src/body-filter.ts\nAuto-merging src/browser-bridge/dom-event.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts\nAuto-merging src/browser-bridge/inject.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts\nAuto-merging src/browser-bridge/message.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts\nAuto-merging src/constant-urls.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls.ts\nAuto-merging src/constant-urls_test.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls_test.ts\nAuto-merging src/contexts/mod.ts\nCONFLICT (add/add): Merge conflict in src/contexts/mod.ts\nAuto-merging src/dialogs/ai-context-upgrade.tsx\nCONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx\nAuto-merging src/ebook-builder/mod.ts\nCONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts\nAuto-merging src/encode.ts\nCONFLICT (add/add): Merge conflict in src/encode.ts\nAuto-merging src/encode_test.ts\nCONFLICT (add/add): Merge conflict in src/encode_test.ts\nAuto-merging src/error/modal-ui.ts\nCONFLICT (add/add): Merge conflict in src/error/modal-ui.ts\nAuto-merging src/error/modal.ts\nCONFLICT (add/add): Merge conflict in src/error/modal.ts\nAuto-merging src/global_state.ts\nCONFLICT (add/add): Merge conflict in src/global_state.ts\nAuto-merging src/gpt/mod.ts\nCONFLICT (add/add): Merge conflict in src/gpt/mod.ts\nAuto-merging src/hotkey-hover/mod.ts\nCONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts\nAuto-merging src/html-engine/core.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/core.ts\nAuto-merging src/html-engine/interface.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/interface.ts\nAuto-merging src/html-engine/mod.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/mod.ts\nAuto-merging src/html-engine/report.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/report.ts\nAuto-merging src/html-engine/rule.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/rule.ts\nAuto-merging src/html-engine/util.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/util.ts\nAuto-merging src/image/menu.ts\nCONFLICT (add/add): Merge conflict in src/image/menu.ts\nAuto-merging src/image/mod.ts\nCONFLICT (add/add): Merge conflict in src/image/mod.ts\nAuto-merging src/image/tools/hook.ts\nCONFLICT (add/add): Merge conflict in src/image/tools/hook.ts\nAuto-merging src/image/tools/index.tsx\nCONFLICT (add/add): Merge conflict in src/image/tools/index.tsx\nAuto-merging src/image/translate.ts\nCONFLICT (add/add): Merge conflict in src/image/translate.ts\nAuto-merging src/image/util.ts\nCONFLICT (add/add): Merge conflict in src/image/util.ts\nAuto-merging src/input/mod.ts\nCONFLICT (add/add): Merge conflict in src/input/mod.ts\nAuto-merging src/main.ts\nCONFLICT (add/add): Merge conflict in src/main.ts\nAuto-merging src/mock-side-panel/mod.tsx\nCONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx\nAuto-merging src/new-user-guide/components/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx\nAuto-merging src/new-user-guide/components/index.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx\nAuto-merging src/new-user-guide/components/select-service-guide.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx\nAuto-merging src/new-user-guide/mod.ts\nCONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts\nAuto-merging src/notification/hook.ts\nCONFLICT (add/add): Merge conflict in src/notification/hook.ts\nAuto-merging src/notification/mod.tsx\nCONFLICT (add/add): Merge conflict in src/notification/mod.tsx\nAuto-merging src/notification/utils.ts\nCONFLICT (add/add): Merge conflict in src/notification/utils.ts\nAuto-merging src/pdf/util.ts\nCONFLICT (add/add): Merge conflict in src/pdf/util.ts\nAuto-merging src/resources/build-in-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts\nAuto-merging src/resources/build-in-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts\nAuto-merging src/resources/build-in-config.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts\nAuto-merging src/resources/final-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts\nAuto-merging src/resources/final-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.ts\nAuto-merging src/resources/locales.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.ts\nAuto-merging src/resources/locales.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts\nAuto-merging src/rich-translate.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate.ts\nAuto-merging src/rich-translate_test.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate_test.ts\nAuto-merging src/selection-translation/components/copy_text.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx\nAuto-merging src/selection-translation/components/dropdown.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx\nAuto-merging src/selection-translation/components/feedback.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx\nAuto-merging src/selection-translation/components/inner_translator.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx\nAuto-merging src/selection-translation/components/speaker.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx\nAuto-merging src/selection-translation/components/styles.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx\nAuto-merging src/selection-translation/components/translation_modal.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx\nAuto-merging src/selection-translation/components/trigger_icon.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx\nAuto-merging src/selection-translation/hooks/use-modal-position.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts\nAuto-merging src/selection-translation/hooks/use-selection-service.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts\nAuto-merging src/selection-translation/mod.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts\nAuto-merging src/selection-translation/types.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/types.ts\nAuto-merging src/selection-translation/utils.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts\nAuto-merging src/subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/subtitle/mod.ts\nAuto-merging src/translate-context/mod.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod.ts\nAuto-merging src/translate-context/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts\nAuto-merging src/tts/index.ts\nCONFLICT (add/add): Merge conflict in src/tts/index.ts\nAuto-merging src/utils/chrome-util.ts\nCONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts\nAuto-merging src/utils/crypto-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts\nAuto-merging src/utils/crypto-config_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts\nAuto-merging src/utils/hash.ts\nCONFLICT (add/add): Merge conflict in src/utils/hash.ts\nAuto-merging src/utils/secret-regex.ts\nCONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts\nAuto-merging src/utils/translation_theme.ts\nCONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts\nAuto-merging src/utils/user-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/user-config.ts\nAuto-merging src/utils/util.ts\nCONFLICT (add/add): Merge conflict in src/utils/util.ts\nAuto-merging src/utils/util_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/util_test.ts\nAuto-merging src/video-subtitle/attach-subtitle/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts\nAuto-merging src/video-subtitle/attach-subtitle/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx\nAuto-merging src/video-subtitle/deduplicate_subtitle_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts\nAuto-merging src/video-subtitle/download_manager.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts\nAuto-merging src/video-subtitle/inject.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts\nAuto-merging src/video-subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts\nAuto-merging src/video-subtitle/quick-button/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts\nAuto-merging src/video-subtitle/quick-button/icon.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx\nAuto-merging src/video-subtitle/quick-button/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx\nAuto-merging src/video-subtitle/translators/ai.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts\nAuto-merging src/video-subtitle/translators/av.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts\nAuto-merging src/video-subtitle/translators/disneyplus.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts\nAuto-merging src/video-subtitle/translators/index.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts\nAuto-merging src/video-subtitle/translators/inject_util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts\nAuto-merging src/video-subtitle/translators/khanacademy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts\nAuto-merging src/video-subtitle/translators/live.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts\nAuto-merging src/video-subtitle/translators/mubi.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts\nAuto-merging src/video-subtitle/translators/multi_attach_vtt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts\nAuto-merging src/video-subtitle/translators/subsrt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts\nAuto-merging src/video-subtitle/translators/text_track.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts\nAuto-merging src/video-subtitle/translators/text_track_dynamic.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts\nAuto-merging src/video-subtitle/translators/udemy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts\nAuto-merging src/video-subtitle/translators/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts\nAuto-merging src/video-subtitle/translators/util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts\nAuto-merging src/video-subtitle/translators/youtube.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts\nAuto-merging src/video-subtitle/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts\nAuto-merging src/video-subtitle/youtube/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts\nAuto-merging src/walk_container.ts\nCONFLICT (add/add): Merge conflict in src/walk_container.ts\nAuto-merging src/yaml.ts\nCONFLICT (add/add): Merge conflict in src/yaml.ts\nAuto-merging src/yaml_test.ts\nCONFLICT (add/add): Merge conflict in src/yaml_test.ts\nwarning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main)\nAuto-merging static/badge-icons/128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/128.png\nwarning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main)\nAuto-merging static/badge-icons/256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/256.png\nwarning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main)\nAuto-merging static/badge-icons/32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/32.png\nwarning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main)\nAuto-merging static/badge-icons/48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/48.png\nwarning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main)\nAuto-merging static/badge-icons/64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/64.png\nwarning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png\nwarning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png\nwarning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png\nwarning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png\nwarning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main)\nAuto-merging static/icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-128.png\nwarning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main)\nAuto-merging static/icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-256.png\nwarning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main)\nAuto-merging static/icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-32.png\nwarning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main)\nAuto-merging static/icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-48.png\nwarning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main)\nAuto-merging static/icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main)\nAuto-merging static/icons/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png\nAuto-merging static/offscreen.html\nCONFLICT (add/add): Merge conflict in static/offscreen.html\nAuto-merging static/side-panel.html\nCONFLICT (add/add): Merge conflict in static/side-panel.html\nAuto-merging static/styles/inject.css\nCONFLICT (content): Merge conflict in static/styles/inject.css\nAuto-merging static/styles/input.css\nCONFLICT (add/add): Merge conflict in static/styles/input.css\nAuto-merging static/styles/options.css\nCONFLICT (content): Merge conflict in static/styles/options.css\nAuto-merging static/styles/popup.css\nCONFLICT (content): Merge conflict in static/styles/popup.css\nAuto-merging static/styles/side-panel.css\nCONFLICT (add/add): Merge conflict in static/styles/side-panel.css\nAuto-merging sync/google_auth.ts\nCONFLICT (content): Merge conflict in sync/google_auth.ts\nAuto-merging sync/util.ts\nCONFLICT (content): Merge conflict in sync/util.ts\nAuto-merging throttle_request_bus.ts\nCONFLICT (add/add): Merge conflict in throttle_request_bus.ts\nAuto-merging touch_shortcuts.ts\nCONFLICT (add/add): Merge conflict in touch_shortcuts.ts\nAuto-merging twind_config.ts\nCONFLICT (content): Merge conflict in twind_config.ts\nAuto-merging userscript.ts\nCONFLICT (content): Merge conflict in userscript.ts\nAuto-merging userscript/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx\nAuto-merging userscript/close_modal.tsx\nCONFLICT (add/add): Merge conflict in userscript/close_modal.tsx\nAuto-merging userscript/float_ball.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball.tsx\nAuto-merging userscript/float_ball_entry.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx\nAuto-merging userscript/float_ball_hook.ts\nCONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts\nAuto-merging userscript/float_ball_icon.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx\nAuto-merging userscript/guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/guide.tsx\nAuto-merging userscript/init_popup.tsx\nCONFLICT (add/add): Merge conflict in userscript/init_popup.tsx\nAuto-merging userscript/manga_guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx\nwarning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main)\nAuto-merging userscript/options/favicon.ico\nCONFLICT (add/add): Merge conflict in userscript/options/favicon.ico\nAuto-merging userscript/options/index.html\nCONFLICT (content): Merge conflict in userscript/options/index.html\nAuto-merging userscript/options_entry.ts\nCONFLICT (content): Merge conflict in userscript/options_entry.ts\nAuto-merging userscript/popup_app.tsx\nCONFLICT (content): Merge conflict in userscript/popup_app.tsx\nAuto-merging userscript/sdk/lite-entry.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts\nAuto-merging userscript/sdk/lite-helper.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts\nAuto-merging userscript/sdk/lite-main.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts\nAuto-merging userscript/sdk/lite-view.tsx\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx\nAuto-merging userscript/sheet.tsx\nCONFLICT (add/add): Merge conflict in userscript/sheet.tsx\nCONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main.  Version main of userscript_command_listeners.ts left in tree.\nCONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main.  Version main of userscript_message.ts left in tree.\nAuto-merging utils/aes_safe_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts\nAuto-merging utils/aes_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_test.ts\nAuto-merging utils/app_version.ts\nCONFLICT (add/add): Merge conflict in utils/app_version.ts\nAuto-merging utils/app_version_test.ts\nCONFLICT (add/add): Merge conflict in utils/app_version_test.ts\nAuto-merging utils/append_tsx.tsx\nCONFLICT (add/add): Merge conflict in utils/append_tsx.tsx\nAuto-merging utils/browser_app.ts\nCONFLICT (add/add): Merge conflict in utils/browser_app.ts\nAuto-merging utils/compare_version.ts\nAuto-merging utils/date.ts\nCONFLICT (content): Merge conflict in utils/date.ts\nAuto-merging utils/date_test.ts\nCONFLICT (add/add): Merge conflict in utils/date_test.ts\nAuto-merging utils/discount_activity.ts\nCONFLICT (add/add): Merge conflict in utils/discount_activity.ts\nAuto-merging utils/expression.ts\nCONFLICT (add/add): Merge conflict in utils/expression.ts\nAuto-merging utils/expression_test.ts\nCONFLICT (add/add): Merge conflict in utils/expression_test.ts\nAuto-merging utils/fake_user.ts\nCONFLICT (add/add): Merge conflict in utils/fake_user.ts\nAuto-merging utils/format_language.ts\nCONFLICT (content): Merge conflict in utils/format_language.ts\nAuto-merging utils/iframe.ts\nCONFLICT (content): Merge conflict in utils/iframe.ts\nAuto-merging utils/is_pro.ts\nCONFLICT (add/add): Merge conflict in utils/is_pro.ts\nAuto-merging utils/is_valid_html_url.ts\nCONFLICT (content): Merge conflict in utils/is_valid_html_url.ts\nAuto-merging utils/js_sdk.ts\nCONFLICT (add/add): Merge conflict in utils/js_sdk.ts\nAuto-merging utils/language_detect_api.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_api.ts\nAuto-merging utils/language_detect_google.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_google.ts\nAuto-merging utils/mac_test.ts\nCONFLICT (add/add): Merge conflict in utils/mac_test.ts\nAuto-merging utils/merge_rule_test.ts\nCONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts\nAuto-merging utils/page_view_report.ts\nCONFLICT (add/add): Merge conflict in utils/page_view_report.ts\nAuto-merging utils/platform.ts\nCONFLICT (content): Merge conflict in utils/platform.ts\nAuto-merging utils/pro_service_trial.ts\nCONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts\nAuto-merging utils/rate_limiter.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter.ts\nAuto-merging utils/rate_limiter_test.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts\nAuto-merging utils/split_text.ts\nCONFLICT (add/add): Merge conflict in utils/split_text.ts\nAuto-merging utils/split_text_test.ts\nCONFLICT (add/add): Merge conflict in utils/split_text_test.ts\nAuto-merging utils/subtitle_styles_items.ts\nCONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts\nAuto-merging utils/update_models_test.ts\nCONFLICT (add/add): Merge conflict in utils/update_models_test.ts\nAuto-merging utils/url_match_test.ts\nCONFLICT (content): Merge conflict in utils/url_match_test.ts\nAuto-merging web-options/setup_web_options_page.ts\nCONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
            "id": 151166,
            "action_name": "Repository merge failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151166/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T02:42:02.834845Z",
            "action": 53,
            "target": "",
            "id": 151165,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151165/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T02:28:43.505701Z",
            "action": 22,
            "target": "Auto-merging .gitignore\nCONFLICT (content): Merge conflict in .gitignore\nAuto-merging Makefile\nCONFLICT (content): Merge conflict in Makefile\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAuto-merging assets/constant.ts\nCONFLICT (add/add): Merge conflict in assets/constant.ts\nwarning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main)\nAuto-merging assets/dark-icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png\nwarning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main)\nAuto-merging assets/dark-icon.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon.png\nwarning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main)\nAuto-merging assets/icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/icon-badge.png\nwarning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main)\nAuto-merging assets/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in assets/toolbar-icon.png\nAuto-merging background.ts\nCONFLICT (content): Merge conflict in background.ts\nAuto-merging background/read_time.ts\nCONFLICT (add/add): Merge conflict in background/read_time.ts\nAuto-merging background/video_time.ts\nCONFLICT (add/add): Merge conflict in background/video_time.ts\nCONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main.  Version main of background_command_listeners.ts left in tree.\nCONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main.  Version main of background_message_listeners.ts left in tree.\nAuto-merging background_test.ts\nCONFLICT (content): Merge conflict in background_test.ts\nAuto-merging browser/background_fetch_stream.ts\nCONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts\nCONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main.  Version main of browser/cache_manager.ts left in tree.\nAuto-merging browser/mock_browser.ts\nCONFLICT (content): Merge conflict in browser/mock_browser.ts\nAuto-merging browser/request.ts\nCONFLICT (content): Merge conflict in browser/request.ts\nAuto-merging browser/userscript_polyfill.ts\nCONFLICT (content): Merge conflict in browser/userscript_polyfill.ts\nCONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main.  Version main of browser_deps.ts left in tree.\nAuto-merging browser_proxy.ts\nCONFLICT (content): Merge conflict in browser_proxy.ts\nCONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main.  Version main of browser_updated_listeners.ts left in tree.\nCONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main.  Version main of buildin_config.json left in tree.\nAuto-merging cli.ts\nCONFLICT (content): Merge conflict in cli.ts\nAuto-merging components/add_models_modal.tsx\nCONFLICT (add/add): Merge conflict in components/add_models_modal.tsx\nAuto-merging components/add_url_modal.tsx\nCONFLICT (content): Merge conflict in components/add_url_modal.tsx\nAuto-merging components/always_lang.tsx\nCONFLICT (content): Merge conflict in components/always_lang.tsx\nAuto-merging components/button_drop_down.tsx\nCONFLICT (content): Merge conflict in components/button_drop_down.tsx\nAuto-merging components/config_sync.tsx\nCONFLICT (content): Merge conflict in components/config_sync.tsx\nAuto-merging components/download_app.tsx\nCONFLICT (add/add): Merge conflict in components/download_app.tsx\nAuto-merging components/error_wrapper.tsx\nCONFLICT (add/add): Merge conflict in components/error_wrapper.tsx\nAuto-merging components/icons.tsx\nCONFLICT (add/add): Merge conflict in components/icons.tsx\nAuto-merging components/input_row.tsx\nCONFLICT (content): Merge conflict in components/input_row.tsx\nAuto-merging components/modal.tsx\nCONFLICT (add/add): Merge conflict in components/modal.tsx\nAuto-merging components/nav_left.tsx\nCONFLICT (content): Merge conflict in components/nav_left.tsx\nAuto-merging components/option_field.tsx\nCONFLICT (content): Merge conflict in components/option_field.tsx\nAuto-merging components/options_button.tsx\nCONFLICT (content): Merge conflict in components/options_button.tsx\nAuto-merging components/popup.tsx\nCONFLICT (content): Merge conflict in components/popup.tsx\nAuto-merging components/popup/always_translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx\nAuto-merging components/popup/footer.tsx\nCONFLICT (add/add): Merge conflict in components/popup/footer.tsx\nAuto-merging components/popup/for_this_site.tsx\nCONFLICT (add/add): Merge conflict in components/popup/for_this_site.tsx\nAuto-merging components/popup/mouse_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/mouse_translate.tsx\nAuto-merging components/popup/selection_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/selection_translate.tsx\nAuto-merging components/popup/services_icon.ts\nCONFLICT (add/add): Merge conflict in components/popup/services_icon.ts\nAuto-merging components/popup/translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx\nAuto-merging components/popup/translation_service.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx\nAuto-merging components/popup/trial_pro.tsx\nCONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx\nAuto-merging components/popup/widgets.tsx\nCONFLICT (add/add): Merge conflict in components/popup/widgets.tsx\nAuto-merging components/popup_generic.tsx\nCONFLICT (add/add): Merge conflict in components/popup_generic.tsx\nAuto-merging components/popup_types.ts\nCONFLICT (add/add): Merge conflict in components/popup_types.ts\nCONFLICT (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.\nAuto-merging components/select_link.tsx\nCONFLICT (content): Merge conflict in components/select_link.tsx\nAuto-merging components/service_select.tsx\nCONFLICT (add/add): Merge conflict in components/service_select.tsx\nAuto-merging components/shadow_components/error_result/error_result.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx\nAuto-merging components/shadow_components/service_select/select_select.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx\nAuto-merging components/shadow_components/service_select/style.ts\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts\nAuto-merging components/shortcut.tsx\nCONFLICT (add/add): Merge conflict in components/shortcut.tsx\nAuto-merging components/switch.tsx\nCONFLICT (content): Merge conflict in components/switch.tsx\nAuto-merging components/sync_latest.tsx\nCONFLICT (content): Merge conflict in components/sync_latest.tsx\nAuto-merging components/tags_input.tsx\nCONFLICT (add/add): Merge conflict in components/tags_input.tsx\nAuto-merging components/tooltip.tsx\nCONFLICT (add/add): Merge conflict in components/tooltip.tsx\nAuto-merging components/touch_mouse_helper.tsx\nCONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx\nAuto-merging components/url_list.tsx\nCONFLICT (content): Merge conflict in components/url_list.tsx\nCONFLICT (modify/delete): config.ts deleted in HEAD and modified in main.  Version main of config.ts left in tree.\nAuto-merging constant.ts\nCONFLICT (content): Merge conflict in constant.ts\nCONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main.  Version main of content_dom_listeners.ts left in tree.\nAuto-merging content_main.ts\nCONFLICT (content): Merge conflict in content_main.ts\nCONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main.  Version main of content_message_listeners.ts left in tree.\nAuto-merging content_script.ts\nAuto-merging content_start.ts\nCONFLICT (add/add): Merge conflict in content_start.ts\nAuto-merging cron.ts\nCONFLICT (content): Merge conflict in cron.ts\nAuto-merging default_config.json\nCONFLICT (add/add): Merge conflict in default_config.json\nAuto-merging deno.json\nCONFLICT (content): Merge conflict in deno.json\nAuto-merging deno.lock\nCONFLICT (add/add): Merge conflict in deno.lock\nCONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main.  Version main of deps.ts left in tree.\nAuto-merging deps/dev_deps.ts\nCONFLICT (content): Merge conflict in deps/dev_deps.ts\nCONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main.  Version main of docs/TODO.md left in tree.\nCONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main.  Version main of docs/config.md left in tree.\nCONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main.  Version main of docs/edge.md left in tree.\nAuto-merging docs/issues.md\nCONFLICT (content): Merge conflict in docs/issues.md\nCONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main.  Version main of docs/sale.md left in tree.\nAuto-merging dom/apply_user_config_css.ts\nCONFLICT (content): Merge conflict in dom/apply_user_config_css.ts\nAuto-merging dom/context.ts\nCONFLICT (content): Merge conflict in dom/context.ts\nAuto-merging dom/inject_css_to_frame.ts\nCONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts\nAuto-merging dom/main.ts\nCONFLICT (content): Merge conflict in dom/main.ts\nAuto-merging dom/paragraph_to_html.ts\nCONFLICT (content): Merge conflict in dom/paragraph_to_html.ts\nAuto-merging dom/util.ts\nCONFLICT (content): Merge conflict in dom/util.ts\nAuto-merging dom/util_test.ts\nCONFLICT (content): Merge conflict in dom/util_test.ts\nAuto-merging env.ts\nCONFLICT (content): Merge conflict in env.ts\nAuto-merging errors.ts\nCONFLICT (content): Merge conflict in errors.ts\nAuto-merging example/demo.tsx\nCONFLICT (content): Merge conflict in example/demo.tsx\nAuto-merging example/frame.html\nCONFLICT (content): Merge conflict in example/frame.html\nAuto-merging example/iframe.html\nCONFLICT (content): Merge conflict in example/iframe.html\nAuto-merging example/index.html\nCONFLICT (content): Merge conflict in example/index.html\nAuto-merging example/js-sdk.html\nCONFLICT (add/add): Merge conflict in example/js-sdk.html\nAuto-merging example/popup.html\nCONFLICT (add/add): Merge conflict in example/popup.html\nAuto-merging example/simple-p.html\nCONFLICT (add/add): Merge conflict in example/simple-p.html\nAuto-merging hooks/use_i18n.ts\nCONFLICT (content): Merge conflict in hooks/use_i18n.ts\nAuto-merging hooks/use_page_theme.ts\nCONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts\nAuto-merging hooks/use_position_adjuster.ts\nCONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts\nAuto-merging hooks/use_route.ts\nCONFLICT (content): Merge conflict in hooks/use_route.ts\nAuto-merging hooks/use_user_config.ts\nCONFLICT (content): Merge conflict in hooks/use_user_config.ts\nAuto-merging interface.ts\nCONFLICT (content): Merge conflict in interface.ts\nAuto-merging language/config.ts\nCONFLICT (add/add): Merge conflict in language/config.ts\nAuto-merging language/index.ts\nCONFLICT (add/add): Merge conflict in language/index.ts\nAuto-merging libs/preact-translation/translateProvider.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx\nAuto-merging libs/preact-translation/useTranslate.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx\nAuto-merging libs/preact-translation/utils.ts\nCONFLICT (content): Merge conflict in libs/preact-translation/utils.ts\nAuto-merging libs/protoframe/connector.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts\nAuto-merging libs/protoframe/mod.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts\nAuto-merging libs/retry.ts\nCONFLICT (add/add): Merge conflict in libs/retry.ts\nAuto-merging libs/subsrt-ts/subsrt_test.ts\nCONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts\nAuto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts\nAuto-merging libs/use-chrome-storage/useChromeStorage.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts\nAuto-merging locales/aeb.json\nCONFLICT (add/add): Merge conflict in locales/aeb.json\nAuto-merging locales/ar.json\nCONFLICT (add/add): Merge conflict in locales/ar.json\nAuto-merging locales/ars.json\nCONFLICT (add/add): Merge conflict in locales/ars.json\nAuto-merging locales/arz.json\nCONFLICT (add/add): Merge conflict in locales/arz.json\nAuto-merging locales/de.json\nCONFLICT (add/add): Merge conflict in locales/de.json\nAuto-merging locales/en.json\nCONFLICT (content): Merge conflict in locales/en.json\nAuto-merging locales/es.json\nCONFLICT (add/add): Merge conflict in locales/es.json\nAuto-merging locales/fa.json\nCONFLICT (content): Merge conflict in locales/fa.json\nAuto-merging locales/fr.json\nCONFLICT (add/add): Merge conflict in locales/fr.json\nAuto-merging locales/he.json\nCONFLICT (add/add): Merge conflict in locales/he.json\nAuto-merging locales/hi.json\nCONFLICT (add/add): Merge conflict in locales/hi.json\nAuto-merging locales/hu.json\nCONFLICT (add/add): Merge conflict in locales/hu.json\nAuto-merging locales/id.json\nCONFLICT (add/add): Merge conflict in locales/id.json\nAuto-merging locales/it.json\nCONFLICT (add/add): Merge conflict in locales/it.json\nAuto-merging locales/ja.json\nCONFLICT (add/add): Merge conflict in locales/ja.json\nAuto-merging locales/ko.json\nCONFLICT (add/add): Merge conflict in locales/ko.json\nAuto-merging locales/mod.ts\nCONFLICT (add/add): Merge conflict in locales/mod.ts\nAuto-merging locales/my.json\nCONFLICT (add/add): Merge conflict in locales/my.json\nAuto-merging locales/pt-BR.json\nCONFLICT (add/add): Merge conflict in locales/pt-BR.json\nAuto-merging locales/pt-PT.json\nCONFLICT (add/add): Merge conflict in locales/pt-PT.json\nAuto-merging locales/ru.json\nCONFLICT (add/add): Merge conflict in locales/ru.json\nAuto-merging locales/tr.json\nCONFLICT (add/add): Merge conflict in locales/tr.json\nAuto-merging locales/uk.json\nCONFLICT (add/add): Merge conflict in locales/uk.json\nAuto-merging locales/vi.json\nCONFLICT (add/add): Merge conflict in locales/vi.json\nAuto-merging locales/zh-CN.json\nCONFLICT (content): Merge conflict in locales/zh-CN.json\nAuto-merging locales/zh-TW.json\nCONFLICT (content): Merge conflict in locales/zh-TW.json\nAuto-merging manifest.json\nCONFLICT (content): Merge conflict in manifest.json\nAuto-merging menu.ts\nCONFLICT (content): Merge conflict in menu.ts\nCONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main.  Version main of messager.ts left in tree.\nAuto-merging offscreen.ts\nCONFLICT (add/add): Merge conflict in offscreen.ts\nCONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main.  Version main of page_popup.tsx left in tree.\nAuto-merging pages/about.tsx\nCONFLICT (content): Merge conflict in pages/about.tsx\nAuto-merging pages/advanced.tsx\nCONFLICT (content): Merge conflict in pages/advanced.tsx\nAuto-merging pages/ai_writing.tsx\nCONFLICT (add/add): Merge conflict in pages/ai_writing.tsx\nAuto-merging pages/assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/assistants.tsx\nAuto-merging pages/components/assistants_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx\nAuto-merging pages/components/custom_assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx\nAuto-merging pages/components/header.tsx\nCONFLICT (add/add): Merge conflict in pages/components/header.tsx\nAuto-merging pages/components/input_select.tsx\nCONFLICT (add/add): Merge conflict in pages/components/input_select.tsx\nAuto-merging pages/components/loading.tsx\nCONFLICT (add/add): Merge conflict in pages/components/loading.tsx\nAuto-merging pages/components/subtitle_style_preview.tsx\nCONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx\nAuto-merging pages/components/translation_service.tsx\nCONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx\nAuto-merging pages/contact.tsx\nCONFLICT (add/add): Merge conflict in pages/contact.tsx\nAuto-merging pages/developer.tsx\nCONFLICT (content): Merge conflict in pages/developer.tsx\nAuto-merging pages/download_config.tsx\nCONFLICT (add/add): Merge conflict in pages/download_config.tsx\nAuto-merging pages/floating.tsx\nCONFLICT (add/add): Merge conflict in pages/floating.tsx\nAuto-merging pages/general.tsx\nCONFLICT (content): Merge conflict in pages/general.tsx\nAuto-merging pages/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/hooks.ts\nAuto-merging pages/import_export/helper.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/helper.ts\nAuto-merging pages/import_export/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts\nAuto-merging pages/import_export/index.tsx\nCONFLICT (add/add): Merge conflict in pages/import_export/index.tsx\nAuto-merging pages/input.tsx\nCONFLICT (add/add): Merge conflict in pages/input.tsx\nAuto-merging pages/manga.tsx\nCONFLICT (add/add): Merge conflict in pages/manga.tsx\nAuto-merging pages/mouse_hover.tsx\nCONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx\nAuto-merging pages/options.tsx\nCONFLICT (content): Merge conflict in pages/options.tsx\nAuto-merging pages/popup.tsx\nCONFLICT (content): Merge conflict in pages/popup.tsx\nAuto-merging pages/selection_translation.tsx\nCONFLICT (add/add): Merge conflict in pages/selection_translation.tsx\nAuto-merging pages/services.tsx\nCONFLICT (add/add): Merge conflict in pages/services.tsx\nAuto-merging pages/shortcuts.tsx\nCONFLICT (add/add): Merge conflict in pages/shortcuts.tsx\nAuto-merging pages/side-panel/count-tag.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx\nAuto-merging pages/side-panel/dropdown.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/dropdown.tsx\nAuto-merging pages/side-panel/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts\nAuto-merging pages/side-panel/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx\nAuto-merging pages/side-panel/reward-center/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts\nAuto-merging pages/side-panel/reward-center/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx\nAuto-merging pages/side-panel/reward-center/mod.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts\nAuto-merging pages/side-panel/select-language.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-language.tsx\nAuto-merging pages/side-panel/select-service.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx\nAuto-merging pages/side-panel/translate-input.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx\nAuto-merging pages/subtitle.tsx\nCONFLICT (add/add): Merge conflict in pages/subtitle.tsx\nAuto-merging pages/terms/glossary_editor.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx\nAuto-merging pages/terms/helper.ts\nCONFLICT (add/add): Merge conflict in pages/terms/helper.ts\nAuto-merging pages/terms/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/terms/hooks.ts\nAuto-merging pages/terms/index.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/index.tsx\nAuto-merging pages/terms/terms_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx\nAuto-merging pages/translation-services/consent_modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx\nAuto-merging pages/translation-services/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts\nAuto-merging pages/translation-services/modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx\nAuto-merging pages/translation-services/service-group.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx\nAuto-merging pages/translation-services/service-item.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx\nAuto-merging pages/translation-services/service-setting.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx\nAuto-merging pages/util.ts\nCONFLICT (add/add): Merge conflict in pages/util.ts\nAuto-merging pages/util_test.ts\nCONFLICT (add/add): Merge conflict in pages/util_test.ts\nAuto-merging pages/verify-service.ts\nCONFLICT (add/add): Merge conflict in pages/verify-service.ts\nAuto-merging popup.tsx\nCONFLICT (content): Merge conflict in popup.tsx\nAuto-merging scripts/check-i18n-params.ts\nCONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts\nAuto-merging scripts/deno.lock\nCONFLICT (add/add): Merge conflict in scripts/deno.lock\nAuto-merging scripts/generate_icon.ts\nCONFLICT (content): Merge conflict in scripts/generate_icon.ts\nAuto-merging scripts/generate_icon_badge.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts\nAuto-merging scripts/generate_translatedText.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts\nAuto-merging scripts/quality/common.js\nCONFLICT (add/add): Merge conflict in scripts/quality/common.js\nAuto-merging scripts/quality/test_services.js\nCONFLICT (add/add): Merge conflict in scripts/quality/test_services.js\nAuto-merging scripts/remove_unused_keys.sh\nCONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh\nAuto-merging scripts/update_locales.ts\nCONFLICT (add/add): Merge conflict in scripts/update_locales.ts\nAuto-merging serve.ts\nCONFLICT (content): Merge conflict in serve.ts\nAuto-merging services/access_token.ts\nCONFLICT (add/add): Merge conflict in services/access_token.ts\nAuto-merging services/ai.ts\nCONFLICT (add/add): Merge conflict in services/ai.ts\nAuto-merging services/ai_test.ts\nCONFLICT (add/add): Merge conflict in services/ai_test.ts\nAuto-merging services/bai.ts\nCONFLICT (content): Merge conflict in services/bai.ts\nAuto-merging services/baidu_qianfan.ts\nCONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts\nAuto-merging services/bing/mod.ts\nCONFLICT (content): Merge conflict in services/bing/mod.ts\nCONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main.  Version main of services/cache.ts left in tree.\nAuto-merging services/claude.ts\nCONFLICT (add/add): Merge conflict in services/claude.ts\nAuto-merging services/config.ts\nCONFLICT (add/add): Merge conflict in services/config.ts\nAuto-merging services/deepl.ts\nCONFLICT (content): Merge conflict in services/deepl.ts\nAuto-merging services/gemini.ts\nCONFLICT (add/add): Merge conflict in services/gemini.ts\nAuto-merging services/google.ts\nAuto-merging services/helper.ts\nCONFLICT (add/add): Merge conflict in services/helper.ts\nAuto-merging services/helper_test.ts\nCONFLICT (add/add): Merge conflict in services/helper_test.ts\nAuto-merging services/mock.ts\nCONFLICT (content): Merge conflict in services/mock.ts\nAuto-merging services/mod.ts\nCONFLICT (content): Merge conflict in services/mod.ts\nAuto-merging services/pro.ts\nCONFLICT (add/add): Merge conflict in services/pro.ts\nAuto-merging services/silicon_cloud.ts\nCONFLICT (add/add): Merge conflict in services/silicon_cloud.ts\nAuto-merging services/tencent_hunyuan.ts\nCONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts\nAuto-merging services/translation.ts\nCONFLICT (content): Merge conflict in services/translation.ts\nAuto-merging services/translation_test.ts\nCONFLICT (add/add): Merge conflict in services/translation_test.ts\nAuto-merging services/util.ts\nCONFLICT (content): Merge conflict in services/util.ts\nAuto-merging services/util_test.ts\nCONFLICT (content): Merge conflict in services/util_test.ts\nAuto-merging services/zhipu.ts\nCONFLICT (add/add): Merge conflict in services/zhipu.ts\nAuto-merging side-panel.tsx\nCONFLICT (add/add): Merge conflict in side-panel.tsx\nAuto-merging src/ai-assistant/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts\nAuto-merging src/ai-assistant/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts\nAuto-merging src/ai-writing/components/Insert-btn.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx\nAuto-merging src/ai-writing/components/ai-writing-button-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx\nAuto-merging src/ai-writing/components/chat.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx\nAuto-merging src/ai-writing/components/close-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx\nAuto-merging src/ai-writing/components/error.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx\nAuto-merging src/ai-writing/components/language-select.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx\nAuto-merging src/ai-writing/components/prompt-style.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx\nAuto-merging src/ai-writing/components/suggestion.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx\nAuto-merging src/ai-writing/components/summary.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx\nAuto-merging src/ai-writing/components/translate-result.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx\nAuto-merging src/ai-writing/components/user-input-text.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx\nAuto-merging src/ai-writing/components/user-input.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx\nAuto-merging src/ai-writing/hooks/use-ai-writing-config.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts\nAuto-merging src/ai-writing/hooks/use-drag-modal.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts\nAuto-merging src/ai-writing/hooks/use-translate.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts\nAuto-merging src/ai-writing/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts\nAuto-merging src/ai-writing/prompts.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts\nAuto-merging src/ai-writing/styles.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts\nAuto-merging src/ai-writing/types.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/types.ts\nAuto-merging src/auto_translate_referrer.ts\nCONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts\nAuto-merging src/body-filter.ts\nCONFLICT (add/add): Merge conflict in src/body-filter.ts\nAuto-merging src/browser-bridge/dom-event.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts\nAuto-merging src/browser-bridge/inject.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts\nAuto-merging src/browser-bridge/message.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts\nAuto-merging src/constant-urls.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls.ts\nAuto-merging src/constant-urls_test.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls_test.ts\nAuto-merging src/contexts/mod.ts\nCONFLICT (add/add): Merge conflict in src/contexts/mod.ts\nAuto-merging src/dialogs/ai-context-upgrade.tsx\nCONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx\nAuto-merging src/ebook-builder/mod.ts\nCONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts\nAuto-merging src/encode.ts\nCONFLICT (add/add): Merge conflict in src/encode.ts\nAuto-merging src/encode_test.ts\nCONFLICT (add/add): Merge conflict in src/encode_test.ts\nAuto-merging src/error/modal-ui.ts\nCONFLICT (add/add): Merge conflict in src/error/modal-ui.ts\nAuto-merging src/error/modal.ts\nCONFLICT (add/add): Merge conflict in src/error/modal.ts\nAuto-merging src/global_state.ts\nCONFLICT (add/add): Merge conflict in src/global_state.ts\nAuto-merging src/gpt/mod.ts\nCONFLICT (add/add): Merge conflict in src/gpt/mod.ts\nAuto-merging src/hotkey-hover/mod.ts\nCONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts\nAuto-merging src/html-engine/core.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/core.ts\nAuto-merging src/html-engine/interface.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/interface.ts\nAuto-merging src/html-engine/mod.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/mod.ts\nAuto-merging src/html-engine/report.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/report.ts\nAuto-merging src/html-engine/rule.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/rule.ts\nAuto-merging src/html-engine/util.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/util.ts\nAuto-merging src/image/menu.ts\nCONFLICT (add/add): Merge conflict in src/image/menu.ts\nAuto-merging src/image/mod.ts\nCONFLICT (add/add): Merge conflict in src/image/mod.ts\nAuto-merging src/image/tools/hook.ts\nCONFLICT (add/add): Merge conflict in src/image/tools/hook.ts\nAuto-merging src/image/tools/index.tsx\nCONFLICT (add/add): Merge conflict in src/image/tools/index.tsx\nAuto-merging src/image/translate.ts\nCONFLICT (add/add): Merge conflict in src/image/translate.ts\nAuto-merging src/image/util.ts\nCONFLICT (add/add): Merge conflict in src/image/util.ts\nAuto-merging src/input/mod.ts\nCONFLICT (add/add): Merge conflict in src/input/mod.ts\nAuto-merging src/main.ts\nCONFLICT (add/add): Merge conflict in src/main.ts\nAuto-merging src/mock-side-panel/mod.tsx\nCONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx\nAuto-merging src/new-user-guide/components/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx\nAuto-merging src/new-user-guide/components/index.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx\nAuto-merging src/new-user-guide/components/select-service-guide.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx\nAuto-merging src/new-user-guide/mod.ts\nCONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts\nAuto-merging src/notification/hook.ts\nCONFLICT (add/add): Merge conflict in src/notification/hook.ts\nAuto-merging src/notification/mod.tsx\nCONFLICT (add/add): Merge conflict in src/notification/mod.tsx\nAuto-merging src/notification/utils.ts\nCONFLICT (add/add): Merge conflict in src/notification/utils.ts\nAuto-merging src/pdf/util.ts\nCONFLICT (add/add): Merge conflict in src/pdf/util.ts\nAuto-merging src/resources/build-in-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts\nAuto-merging src/resources/build-in-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts\nAuto-merging src/resources/build-in-config.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts\nAuto-merging src/resources/final-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts\nAuto-merging src/resources/final-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.ts\nAuto-merging src/resources/locales.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.ts\nAuto-merging src/resources/locales.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts\nAuto-merging src/rich-translate.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate.ts\nAuto-merging src/rich-translate_test.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate_test.ts\nAuto-merging src/selection-translation/components/copy_text.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx\nAuto-merging src/selection-translation/components/dropdown.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx\nAuto-merging src/selection-translation/components/feedback.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx\nAuto-merging src/selection-translation/components/inner_translator.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx\nAuto-merging src/selection-translation/components/speaker.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx\nAuto-merging src/selection-translation/components/styles.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx\nAuto-merging src/selection-translation/components/translation_modal.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx\nAuto-merging src/selection-translation/components/trigger_icon.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx\nAuto-merging src/selection-translation/hooks/use-modal-position.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts\nAuto-merging src/selection-translation/hooks/use-selection-service.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts\nAuto-merging src/selection-translation/mod.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts\nAuto-merging src/selection-translation/types.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/types.ts\nAuto-merging src/selection-translation/utils.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts\nAuto-merging src/subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/subtitle/mod.ts\nAuto-merging src/translate-context/mod.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod.ts\nAuto-merging src/translate-context/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts\nAuto-merging src/tts/index.ts\nCONFLICT (add/add): Merge conflict in src/tts/index.ts\nAuto-merging src/utils/chrome-util.ts\nCONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts\nAuto-merging src/utils/crypto-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts\nAuto-merging src/utils/crypto-config_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts\nAuto-merging src/utils/hash.ts\nCONFLICT (add/add): Merge conflict in src/utils/hash.ts\nAuto-merging src/utils/secret-regex.ts\nCONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts\nAuto-merging src/utils/translation_theme.ts\nCONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts\nAuto-merging src/utils/user-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/user-config.ts\nAuto-merging src/utils/util.ts\nCONFLICT (add/add): Merge conflict in src/utils/util.ts\nAuto-merging src/utils/util_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/util_test.ts\nAuto-merging src/video-subtitle/attach-subtitle/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts\nAuto-merging src/video-subtitle/attach-subtitle/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx\nAuto-merging src/video-subtitle/deduplicate_subtitle_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts\nAuto-merging src/video-subtitle/download_manager.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts\nAuto-merging src/video-subtitle/inject.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts\nAuto-merging src/video-subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts\nAuto-merging src/video-subtitle/quick-button/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts\nAuto-merging src/video-subtitle/quick-button/icon.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx\nAuto-merging src/video-subtitle/quick-button/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx\nAuto-merging src/video-subtitle/translators/ai.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts\nAuto-merging src/video-subtitle/translators/av.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts\nAuto-merging src/video-subtitle/translators/disneyplus.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts\nAuto-merging src/video-subtitle/translators/index.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts\nAuto-merging src/video-subtitle/translators/inject_util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts\nAuto-merging src/video-subtitle/translators/khanacademy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts\nAuto-merging src/video-subtitle/translators/live.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts\nAuto-merging src/video-subtitle/translators/mubi.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts\nAuto-merging src/video-subtitle/translators/multi_attach_vtt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts\nAuto-merging src/video-subtitle/translators/subsrt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts\nAuto-merging src/video-subtitle/translators/text_track.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts\nAuto-merging src/video-subtitle/translators/text_track_dynamic.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts\nAuto-merging src/video-subtitle/translators/udemy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts\nAuto-merging src/video-subtitle/translators/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts\nAuto-merging src/video-subtitle/translators/util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts\nAuto-merging src/video-subtitle/translators/youtube.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts\nAuto-merging src/video-subtitle/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts\nAuto-merging src/video-subtitle/youtube/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts\nAuto-merging src/walk_container.ts\nCONFLICT (add/add): Merge conflict in src/walk_container.ts\nAuto-merging src/yaml.ts\nCONFLICT (add/add): Merge conflict in src/yaml.ts\nAuto-merging src/yaml_test.ts\nCONFLICT (add/add): Merge conflict in src/yaml_test.ts\nwarning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main)\nAuto-merging static/badge-icons/128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/128.png\nwarning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main)\nAuto-merging static/badge-icons/256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/256.png\nwarning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main)\nAuto-merging static/badge-icons/32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/32.png\nwarning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main)\nAuto-merging static/badge-icons/48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/48.png\nwarning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main)\nAuto-merging static/badge-icons/64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/64.png\nwarning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png\nwarning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png\nwarning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png\nwarning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png\nwarning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main)\nAuto-merging static/icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-128.png\nwarning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main)\nAuto-merging static/icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-256.png\nwarning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main)\nAuto-merging static/icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-32.png\nwarning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main)\nAuto-merging static/icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-48.png\nwarning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main)\nAuto-merging static/icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main)\nAuto-merging static/icons/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png\nAuto-merging static/offscreen.html\nCONFLICT (add/add): Merge conflict in static/offscreen.html\nAuto-merging static/side-panel.html\nCONFLICT (add/add): Merge conflict in static/side-panel.html\nAuto-merging static/styles/inject.css\nCONFLICT (content): Merge conflict in static/styles/inject.css\nAuto-merging static/styles/input.css\nCONFLICT (add/add): Merge conflict in static/styles/input.css\nAuto-merging static/styles/options.css\nCONFLICT (content): Merge conflict in static/styles/options.css\nAuto-merging static/styles/popup.css\nCONFLICT (content): Merge conflict in static/styles/popup.css\nAuto-merging static/styles/side-panel.css\nCONFLICT (add/add): Merge conflict in static/styles/side-panel.css\nAuto-merging sync/google_auth.ts\nCONFLICT (content): Merge conflict in sync/google_auth.ts\nAuto-merging sync/util.ts\nCONFLICT (content): Merge conflict in sync/util.ts\nAuto-merging throttle_request_bus.ts\nCONFLICT (add/add): Merge conflict in throttle_request_bus.ts\nAuto-merging touch_shortcuts.ts\nCONFLICT (add/add): Merge conflict in touch_shortcuts.ts\nAuto-merging twind_config.ts\nCONFLICT (content): Merge conflict in twind_config.ts\nAuto-merging userscript.ts\nCONFLICT (content): Merge conflict in userscript.ts\nAuto-merging userscript/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx\nAuto-merging userscript/close_modal.tsx\nCONFLICT (add/add): Merge conflict in userscript/close_modal.tsx\nAuto-merging userscript/float_ball.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball.tsx\nAuto-merging userscript/float_ball_entry.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx\nAuto-merging userscript/float_ball_hook.ts\nCONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts\nAuto-merging userscript/float_ball_icon.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx\nAuto-merging userscript/guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/guide.tsx\nAuto-merging userscript/init_popup.tsx\nCONFLICT (add/add): Merge conflict in userscript/init_popup.tsx\nAuto-merging userscript/manga_guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx\nwarning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main)\nAuto-merging userscript/options/favicon.ico\nCONFLICT (add/add): Merge conflict in userscript/options/favicon.ico\nAuto-merging userscript/options/index.html\nCONFLICT (content): Merge conflict in userscript/options/index.html\nAuto-merging userscript/options_entry.ts\nCONFLICT (content): Merge conflict in userscript/options_entry.ts\nAuto-merging userscript/popup_app.tsx\nCONFLICT (content): Merge conflict in userscript/popup_app.tsx\nAuto-merging userscript/sdk/lite-entry.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts\nAuto-merging userscript/sdk/lite-helper.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts\nAuto-merging userscript/sdk/lite-main.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts\nAuto-merging userscript/sdk/lite-view.tsx\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx\nAuto-merging userscript/sheet.tsx\nCONFLICT (add/add): Merge conflict in userscript/sheet.tsx\nCONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main.  Version main of userscript_command_listeners.ts left in tree.\nCONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main.  Version main of userscript_message.ts left in tree.\nAuto-merging utils/aes_safe_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts\nAuto-merging utils/aes_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_test.ts\nAuto-merging utils/app_version.ts\nCONFLICT (add/add): Merge conflict in utils/app_version.ts\nAuto-merging utils/app_version_test.ts\nCONFLICT (add/add): Merge conflict in utils/app_version_test.ts\nAuto-merging utils/append_tsx.tsx\nCONFLICT (add/add): Merge conflict in utils/append_tsx.tsx\nAuto-merging utils/browser_app.ts\nCONFLICT (add/add): Merge conflict in utils/browser_app.ts\nAuto-merging utils/compare_version.ts\nAuto-merging utils/date.ts\nCONFLICT (content): Merge conflict in utils/date.ts\nAuto-merging utils/date_test.ts\nCONFLICT (add/add): Merge conflict in utils/date_test.ts\nAuto-merging utils/discount_activity.ts\nCONFLICT (add/add): Merge conflict in utils/discount_activity.ts\nAuto-merging utils/expression.ts\nCONFLICT (add/add): Merge conflict in utils/expression.ts\nAuto-merging utils/expression_test.ts\nCONFLICT (add/add): Merge conflict in utils/expression_test.ts\nAuto-merging utils/fake_user.ts\nCONFLICT (add/add): Merge conflict in utils/fake_user.ts\nAuto-merging utils/format_language.ts\nCONFLICT (content): Merge conflict in utils/format_language.ts\nAuto-merging utils/iframe.ts\nCONFLICT (content): Merge conflict in utils/iframe.ts\nAuto-merging utils/is_pro.ts\nCONFLICT (add/add): Merge conflict in utils/is_pro.ts\nAuto-merging utils/is_valid_html_url.ts\nCONFLICT (content): Merge conflict in utils/is_valid_html_url.ts\nAuto-merging utils/js_sdk.ts\nCONFLICT (add/add): Merge conflict in utils/js_sdk.ts\nAuto-merging utils/language_detect_api.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_api.ts\nAuto-merging utils/language_detect_google.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_google.ts\nAuto-merging utils/mac_test.ts\nCONFLICT (add/add): Merge conflict in utils/mac_test.ts\nAuto-merging utils/merge_rule_test.ts\nCONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts\nAuto-merging utils/page_view_report.ts\nCONFLICT (add/add): Merge conflict in utils/page_view_report.ts\nAuto-merging utils/platform.ts\nCONFLICT (content): Merge conflict in utils/platform.ts\nAuto-merging utils/pro_service_trial.ts\nCONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts\nAuto-merging utils/rate_limiter.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter.ts\nAuto-merging utils/rate_limiter_test.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts\nAuto-merging utils/split_text.ts\nCONFLICT (add/add): Merge conflict in utils/split_text.ts\nAuto-merging utils/split_text_test.ts\nCONFLICT (add/add): Merge conflict in utils/split_text_test.ts\nAuto-merging utils/subtitle_styles_items.ts\nCONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts\nAuto-merging utils/update_models_test.ts\nCONFLICT (add/add): Merge conflict in utils/update_models_test.ts\nAuto-merging utils/url_match_test.ts\nCONFLICT (content): Merge conflict in utils/url_match_test.ts\nAuto-merging web-options/setup_web_options_page.ts\nCONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
            "id": 151164,
            "action_name": "Repository merge failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151164/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-04-01T02:28:35.502548Z",
            "action": 53,
            "target": "",
            "id": 151163,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151163/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T15:01:04.106725Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151162,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151162/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T15:01:00.497341Z",
            "action": 21,
            "target": "",
            "id": 151161,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151161/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T15:00:54.176197Z",
            "action": 53,
            "target": "",
            "id": 151160,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151160/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T13:54:21.919049Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151159,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151159/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T13:54:18.271958Z",
            "action": 21,
            "target": "",
            "id": 151158,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151158/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T13:54:12.204613Z",
            "action": 53,
            "target": "",
            "id": 151157,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151157/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T11:36:42.782520Z",
            "action": 22,
            "target": "Auto-merging .gitignore\nCONFLICT (content): Merge conflict in .gitignore\nAuto-merging Makefile\nCONFLICT (content): Merge conflict in Makefile\nAuto-merging README.md\nCONFLICT (content): Merge conflict in README.md\nAuto-merging assets/constant.ts\nCONFLICT (add/add): Merge conflict in assets/constant.ts\nwarning: Cannot merge binary files: assets/dark-icon-badge.png (HEAD vs. main)\nAuto-merging assets/dark-icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon-badge.png\nwarning: Cannot merge binary files: assets/dark-icon.png (HEAD vs. main)\nAuto-merging assets/dark-icon.png\nCONFLICT (add/add): Merge conflict in assets/dark-icon.png\nwarning: Cannot merge binary files: assets/icon-badge.png (HEAD vs. main)\nAuto-merging assets/icon-badge.png\nCONFLICT (add/add): Merge conflict in assets/icon-badge.png\nwarning: Cannot merge binary files: assets/toolbar-icon.png (HEAD vs. main)\nAuto-merging assets/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in assets/toolbar-icon.png\nAuto-merging background.ts\nCONFLICT (content): Merge conflict in background.ts\nAuto-merging background/read_time.ts\nCONFLICT (add/add): Merge conflict in background/read_time.ts\nAuto-merging background/video_time.ts\nCONFLICT (add/add): Merge conflict in background/video_time.ts\nCONFLICT (modify/delete): background_command_listeners.ts deleted in HEAD and modified in main.  Version main of background_command_listeners.ts left in tree.\nCONFLICT (modify/delete): background_message_listeners.ts deleted in HEAD and modified in main.  Version main of background_message_listeners.ts left in tree.\nAuto-merging background_test.ts\nCONFLICT (content): Merge conflict in background_test.ts\nAuto-merging browser/background_fetch_stream.ts\nCONFLICT (add/add): Merge conflict in browser/background_fetch_stream.ts\nCONFLICT (modify/delete): browser/cache_manager.ts deleted in HEAD and modified in main.  Version main of browser/cache_manager.ts left in tree.\nAuto-merging browser/mock_browser.ts\nCONFLICT (content): Merge conflict in browser/mock_browser.ts\nAuto-merging browser/request.ts\nCONFLICT (content): Merge conflict in browser/request.ts\nAuto-merging browser/userscript_polyfill.ts\nCONFLICT (content): Merge conflict in browser/userscript_polyfill.ts\nCONFLICT (modify/delete): browser_deps.ts deleted in HEAD and modified in main.  Version main of browser_deps.ts left in tree.\nAuto-merging browser_proxy.ts\nCONFLICT (content): Merge conflict in browser_proxy.ts\nCONFLICT (modify/delete): browser_updated_listeners.ts deleted in HEAD and modified in main.  Version main of browser_updated_listeners.ts left in tree.\nCONFLICT (modify/delete): buildin_config.json deleted in HEAD and modified in main.  Version main of buildin_config.json left in tree.\nAuto-merging cli.ts\nCONFLICT (content): Merge conflict in cli.ts\nAuto-merging components/add_models_modal.tsx\nCONFLICT (add/add): Merge conflict in components/add_models_modal.tsx\nAuto-merging components/add_url_modal.tsx\nCONFLICT (content): Merge conflict in components/add_url_modal.tsx\nAuto-merging components/always_lang.tsx\nCONFLICT (content): Merge conflict in components/always_lang.tsx\nAuto-merging components/button_drop_down.tsx\nCONFLICT (content): Merge conflict in components/button_drop_down.tsx\nAuto-merging components/config_sync.tsx\nCONFLICT (content): Merge conflict in components/config_sync.tsx\nAuto-merging components/download_app.tsx\nCONFLICT (add/add): Merge conflict in components/download_app.tsx\nAuto-merging components/error_wrapper.tsx\nCONFLICT (add/add): Merge conflict in components/error_wrapper.tsx\nAuto-merging components/icons.tsx\nCONFLICT (add/add): Merge conflict in components/icons.tsx\nAuto-merging components/input_row.tsx\nCONFLICT (content): Merge conflict in components/input_row.tsx\nAuto-merging components/modal.tsx\nCONFLICT (add/add): Merge conflict in components/modal.tsx\nAuto-merging components/nav_left.tsx\nCONFLICT (content): Merge conflict in components/nav_left.tsx\nAuto-merging components/option_field.tsx\nCONFLICT (content): Merge conflict in components/option_field.tsx\nAuto-merging components/options_button.tsx\nCONFLICT (content): Merge conflict in components/options_button.tsx\nAuto-merging components/popup.tsx\nCONFLICT (content): Merge conflict in components/popup.tsx\nAuto-merging components/popup/always_translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/always_translate_language.tsx\nAuto-merging components/popup/footer.tsx\nCONFLICT (add/add): Merge conflict in components/popup/footer.tsx\nAuto-merging components/popup/for_this_site.tsx\nCONFLICT (add/add): Merge conflict in components/popup/for_this_site.tsx\nAuto-merging components/popup/mouse_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/mouse_translate.tsx\nAuto-merging components/popup/selection_translate.tsx\nCONFLICT (add/add): Merge conflict in components/popup/selection_translate.tsx\nAuto-merging components/popup/services_icon.ts\nCONFLICT (add/add): Merge conflict in components/popup/services_icon.ts\nAuto-merging components/popup/translate_language.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translate_language.tsx\nAuto-merging components/popup/translation_service.tsx\nCONFLICT (add/add): Merge conflict in components/popup/translation_service.tsx\nAuto-merging components/popup/trial_pro.tsx\nCONFLICT (add/add): Merge conflict in components/popup/trial_pro.tsx\nAuto-merging components/popup/widgets.tsx\nCONFLICT (add/add): Merge conflict in components/popup/widgets.tsx\nAuto-merging components/popup_generic.tsx\nCONFLICT (add/add): Merge conflict in components/popup_generic.tsx\nAuto-merging components/popup_types.ts\nCONFLICT (add/add): Merge conflict in components/popup_types.ts\nCONFLICT (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.\nAuto-merging components/select_link.tsx\nCONFLICT (content): Merge conflict in components/select_link.tsx\nAuto-merging components/service_select.tsx\nCONFLICT (add/add): Merge conflict in components/service_select.tsx\nAuto-merging components/shadow_components/error_result/error_result.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/error_result/error_result.tsx\nAuto-merging components/shadow_components/service_select/select_select.tsx\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/select_select.tsx\nAuto-merging components/shadow_components/service_select/style.ts\nCONFLICT (add/add): Merge conflict in components/shadow_components/service_select/style.ts\nAuto-merging components/shortcut.tsx\nCONFLICT (add/add): Merge conflict in components/shortcut.tsx\nAuto-merging components/switch.tsx\nCONFLICT (content): Merge conflict in components/switch.tsx\nAuto-merging components/sync_latest.tsx\nCONFLICT (content): Merge conflict in components/sync_latest.tsx\nAuto-merging components/tags_input.tsx\nCONFLICT (add/add): Merge conflict in components/tags_input.tsx\nAuto-merging components/tooltip.tsx\nCONFLICT (add/add): Merge conflict in components/tooltip.tsx\nAuto-merging components/touch_mouse_helper.tsx\nCONFLICT (add/add): Merge conflict in components/touch_mouse_helper.tsx\nAuto-merging components/url_list.tsx\nCONFLICT (content): Merge conflict in components/url_list.tsx\nCONFLICT (modify/delete): config.ts deleted in HEAD and modified in main.  Version main of config.ts left in tree.\nAuto-merging constant.ts\nCONFLICT (content): Merge conflict in constant.ts\nCONFLICT (modify/delete): content_dom_listeners.ts deleted in HEAD and modified in main.  Version main of content_dom_listeners.ts left in tree.\nAuto-merging content_main.ts\nCONFLICT (content): Merge conflict in content_main.ts\nCONFLICT (modify/delete): content_message_listeners.ts deleted in HEAD and modified in main.  Version main of content_message_listeners.ts left in tree.\nAuto-merging content_script.ts\nAuto-merging content_start.ts\nCONFLICT (add/add): Merge conflict in content_start.ts\nAuto-merging cron.ts\nCONFLICT (content): Merge conflict in cron.ts\nAuto-merging default_config.json\nCONFLICT (add/add): Merge conflict in default_config.json\nAuto-merging deno.json\nCONFLICT (content): Merge conflict in deno.json\nAuto-merging deno.lock\nCONFLICT (add/add): Merge conflict in deno.lock\nCONFLICT (modify/delete): deps.ts deleted in HEAD and modified in main.  Version main of deps.ts left in tree.\nAuto-merging deps/dev_deps.ts\nCONFLICT (content): Merge conflict in deps/dev_deps.ts\nCONFLICT (modify/delete): docs/TODO.md deleted in HEAD and modified in main.  Version main of docs/TODO.md left in tree.\nCONFLICT (modify/delete): docs/config.md deleted in HEAD and modified in main.  Version main of docs/config.md left in tree.\nCONFLICT (modify/delete): docs/edge.md deleted in HEAD and modified in main.  Version main of docs/edge.md left in tree.\nAuto-merging docs/issues.md\nCONFLICT (content): Merge conflict in docs/issues.md\nCONFLICT (modify/delete): docs/sale.md deleted in HEAD and modified in main.  Version main of docs/sale.md left in tree.\nAuto-merging dom/apply_user_config_css.ts\nCONFLICT (content): Merge conflict in dom/apply_user_config_css.ts\nAuto-merging dom/context.ts\nCONFLICT (content): Merge conflict in dom/context.ts\nAuto-merging dom/inject_css_to_frame.ts\nCONFLICT (content): Merge conflict in dom/inject_css_to_frame.ts\nAuto-merging dom/main.ts\nCONFLICT (content): Merge conflict in dom/main.ts\nAuto-merging dom/paragraph_to_html.ts\nCONFLICT (content): Merge conflict in dom/paragraph_to_html.ts\nAuto-merging dom/util.ts\nCONFLICT (content): Merge conflict in dom/util.ts\nAuto-merging dom/util_test.ts\nCONFLICT (content): Merge conflict in dom/util_test.ts\nAuto-merging env.ts\nCONFLICT (content): Merge conflict in env.ts\nAuto-merging errors.ts\nCONFLICT (content): Merge conflict in errors.ts\nAuto-merging example/demo.tsx\nCONFLICT (content): Merge conflict in example/demo.tsx\nAuto-merging example/frame.html\nCONFLICT (content): Merge conflict in example/frame.html\nAuto-merging example/iframe.html\nCONFLICT (content): Merge conflict in example/iframe.html\nAuto-merging example/index.html\nCONFLICT (content): Merge conflict in example/index.html\nAuto-merging example/js-sdk.html\nCONFLICT (add/add): Merge conflict in example/js-sdk.html\nAuto-merging example/popup.html\nCONFLICT (add/add): Merge conflict in example/popup.html\nAuto-merging example/simple-p.html\nCONFLICT (add/add): Merge conflict in example/simple-p.html\nAuto-merging hooks/use_i18n.ts\nCONFLICT (content): Merge conflict in hooks/use_i18n.ts\nAuto-merging hooks/use_page_theme.ts\nCONFLICT (add/add): Merge conflict in hooks/use_page_theme.ts\nAuto-merging hooks/use_position_adjuster.ts\nCONFLICT (add/add): Merge conflict in hooks/use_position_adjuster.ts\nAuto-merging hooks/use_route.ts\nCONFLICT (content): Merge conflict in hooks/use_route.ts\nAuto-merging hooks/use_user_config.ts\nCONFLICT (content): Merge conflict in hooks/use_user_config.ts\nAuto-merging interface.ts\nCONFLICT (content): Merge conflict in interface.ts\nAuto-merging language/config.ts\nCONFLICT (add/add): Merge conflict in language/config.ts\nAuto-merging language/index.ts\nCONFLICT (add/add): Merge conflict in language/index.ts\nAuto-merging libs/preact-translation/translateProvider.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/translateProvider.tsx\nAuto-merging libs/preact-translation/useTranslate.tsx\nCONFLICT (content): Merge conflict in libs/preact-translation/useTranslate.tsx\nAuto-merging libs/preact-translation/utils.ts\nCONFLICT (content): Merge conflict in libs/preact-translation/utils.ts\nAuto-merging libs/protoframe/connector.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/connector.ts\nAuto-merging libs/protoframe/mod.ts\nCONFLICT (add/add): Merge conflict in libs/protoframe/mod.ts\nAuto-merging libs/retry.ts\nCONFLICT (add/add): Merge conflict in libs/retry.ts\nAuto-merging libs/subsrt-ts/subsrt_test.ts\nCONFLICT (add/add): Merge conflict in libs/subsrt-ts/subsrt_test.ts\nAuto-merging libs/use-chrome-storage/createChromeStorageStateHook.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/createChromeStorageStateHook.ts\nAuto-merging libs/use-chrome-storage/useChromeStorage.ts\nCONFLICT (content): Merge conflict in libs/use-chrome-storage/useChromeStorage.ts\nAuto-merging locales/aeb.json\nCONFLICT (add/add): Merge conflict in locales/aeb.json\nAuto-merging locales/ar.json\nCONFLICT (add/add): Merge conflict in locales/ar.json\nAuto-merging locales/ars.json\nCONFLICT (add/add): Merge conflict in locales/ars.json\nAuto-merging locales/arz.json\nCONFLICT (add/add): Merge conflict in locales/arz.json\nAuto-merging locales/de.json\nCONFLICT (add/add): Merge conflict in locales/de.json\nAuto-merging locales/en.json\nCONFLICT (content): Merge conflict in locales/en.json\nAuto-merging locales/es.json\nCONFLICT (add/add): Merge conflict in locales/es.json\nAuto-merging locales/fa.json\nCONFLICT (content): Merge conflict in locales/fa.json\nAuto-merging locales/fr.json\nCONFLICT (add/add): Merge conflict in locales/fr.json\nAuto-merging locales/he.json\nCONFLICT (add/add): Merge conflict in locales/he.json\nAuto-merging locales/hi.json\nCONFLICT (add/add): Merge conflict in locales/hi.json\nAuto-merging locales/hu.json\nCONFLICT (add/add): Merge conflict in locales/hu.json\nAuto-merging locales/id.json\nCONFLICT (add/add): Merge conflict in locales/id.json\nAuto-merging locales/it.json\nCONFLICT (add/add): Merge conflict in locales/it.json\nAuto-merging locales/ja.json\nCONFLICT (add/add): Merge conflict in locales/ja.json\nAuto-merging locales/ko.json\nCONFLICT (add/add): Merge conflict in locales/ko.json\nAuto-merging locales/mod.ts\nCONFLICT (add/add): Merge conflict in locales/mod.ts\nAuto-merging locales/my.json\nCONFLICT (add/add): Merge conflict in locales/my.json\nAuto-merging locales/pt-BR.json\nCONFLICT (add/add): Merge conflict in locales/pt-BR.json\nAuto-merging locales/pt-PT.json\nCONFLICT (add/add): Merge conflict in locales/pt-PT.json\nAuto-merging locales/ru.json\nCONFLICT (add/add): Merge conflict in locales/ru.json\nAuto-merging locales/tr.json\nCONFLICT (add/add): Merge conflict in locales/tr.json\nAuto-merging locales/uk.json\nCONFLICT (add/add): Merge conflict in locales/uk.json\nAuto-merging locales/vi.json\nCONFLICT (add/add): Merge conflict in locales/vi.json\nAuto-merging locales/zh-CN.json\nCONFLICT (content): Merge conflict in locales/zh-CN.json\nAuto-merging locales/zh-TW.json\nCONFLICT (content): Merge conflict in locales/zh-TW.json\nAuto-merging manifest.json\nCONFLICT (content): Merge conflict in manifest.json\nAuto-merging menu.ts\nCONFLICT (content): Merge conflict in menu.ts\nCONFLICT (modify/delete): messager.ts deleted in HEAD and modified in main.  Version main of messager.ts left in tree.\nAuto-merging offscreen.ts\nCONFLICT (add/add): Merge conflict in offscreen.ts\nCONFLICT (modify/delete): page_popup.tsx deleted in HEAD and modified in main.  Version main of page_popup.tsx left in tree.\nAuto-merging pages/about.tsx\nCONFLICT (content): Merge conflict in pages/about.tsx\nAuto-merging pages/advanced.tsx\nCONFLICT (content): Merge conflict in pages/advanced.tsx\nAuto-merging pages/ai_writing.tsx\nCONFLICT (add/add): Merge conflict in pages/ai_writing.tsx\nAuto-merging pages/assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/assistants.tsx\nAuto-merging pages/components/assistants_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/components/assistants_detail.tsx\nAuto-merging pages/components/custom_assistants.tsx\nCONFLICT (add/add): Merge conflict in pages/components/custom_assistants.tsx\nAuto-merging pages/components/header.tsx\nCONFLICT (add/add): Merge conflict in pages/components/header.tsx\nAuto-merging pages/components/input_select.tsx\nCONFLICT (add/add): Merge conflict in pages/components/input_select.tsx\nAuto-merging pages/components/loading.tsx\nCONFLICT (add/add): Merge conflict in pages/components/loading.tsx\nAuto-merging pages/components/subtitle_style_preview.tsx\nCONFLICT (add/add): Merge conflict in pages/components/subtitle_style_preview.tsx\nAuto-merging pages/components/translation_service.tsx\nCONFLICT (add/add): Merge conflict in pages/components/translation_service.tsx\nAuto-merging pages/contact.tsx\nCONFLICT (add/add): Merge conflict in pages/contact.tsx\nAuto-merging pages/developer.tsx\nCONFLICT (content): Merge conflict in pages/developer.tsx\nAuto-merging pages/download_config.tsx\nCONFLICT (add/add): Merge conflict in pages/download_config.tsx\nAuto-merging pages/floating.tsx\nCONFLICT (add/add): Merge conflict in pages/floating.tsx\nAuto-merging pages/general.tsx\nCONFLICT (content): Merge conflict in pages/general.tsx\nAuto-merging pages/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/hooks.ts\nAuto-merging pages/import_export/helper.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/helper.ts\nAuto-merging pages/import_export/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/import_export/hooks.ts\nAuto-merging pages/import_export/index.tsx\nCONFLICT (add/add): Merge conflict in pages/import_export/index.tsx\nAuto-merging pages/input.tsx\nCONFLICT (add/add): Merge conflict in pages/input.tsx\nAuto-merging pages/manga.tsx\nCONFLICT (add/add): Merge conflict in pages/manga.tsx\nAuto-merging pages/mouse_hover.tsx\nCONFLICT (add/add): Merge conflict in pages/mouse_hover.tsx\nAuto-merging pages/options.tsx\nCONFLICT (content): Merge conflict in pages/options.tsx\nAuto-merging pages/popup.tsx\nCONFLICT (content): Merge conflict in pages/popup.tsx\nAuto-merging pages/selection_translation.tsx\nCONFLICT (add/add): Merge conflict in pages/selection_translation.tsx\nAuto-merging pages/services.tsx\nCONFLICT (add/add): Merge conflict in pages/services.tsx\nAuto-merging pages/shortcuts.tsx\nCONFLICT (add/add): Merge conflict in pages/shortcuts.tsx\nAuto-merging pages/side-panel/count-tag.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/count-tag.tsx\nAuto-merging pages/side-panel/dropdown.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/dropdown.tsx\nAuto-merging pages/side-panel/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/hooks.ts\nAuto-merging pages/side-panel/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/index.tsx\nAuto-merging pages/side-panel/reward-center/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/hooks.ts\nAuto-merging pages/side-panel/reward-center/index.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/index.tsx\nAuto-merging pages/side-panel/reward-center/mod.ts\nCONFLICT (add/add): Merge conflict in pages/side-panel/reward-center/mod.ts\nAuto-merging pages/side-panel/select-language.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-language.tsx\nAuto-merging pages/side-panel/select-service.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/select-service.tsx\nAuto-merging pages/side-panel/translate-input.tsx\nCONFLICT (add/add): Merge conflict in pages/side-panel/translate-input.tsx\nAuto-merging pages/subtitle.tsx\nCONFLICT (add/add): Merge conflict in pages/subtitle.tsx\nAuto-merging pages/terms/glossary_editor.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/glossary_editor.tsx\nAuto-merging pages/terms/helper.ts\nCONFLICT (add/add): Merge conflict in pages/terms/helper.ts\nAuto-merging pages/terms/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/terms/hooks.ts\nAuto-merging pages/terms/index.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/index.tsx\nAuto-merging pages/terms/terms_detail.tsx\nCONFLICT (add/add): Merge conflict in pages/terms/terms_detail.tsx\nAuto-merging pages/translation-services/consent_modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/consent_modal.tsx\nAuto-merging pages/translation-services/hooks.ts\nCONFLICT (add/add): Merge conflict in pages/translation-services/hooks.ts\nAuto-merging pages/translation-services/modal.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/modal.tsx\nAuto-merging pages/translation-services/service-group.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-group.tsx\nAuto-merging pages/translation-services/service-item.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-item.tsx\nAuto-merging pages/translation-services/service-setting.tsx\nCONFLICT (add/add): Merge conflict in pages/translation-services/service-setting.tsx\nAuto-merging pages/util.ts\nCONFLICT (add/add): Merge conflict in pages/util.ts\nAuto-merging pages/util_test.ts\nCONFLICT (add/add): Merge conflict in pages/util_test.ts\nAuto-merging pages/verify-service.ts\nCONFLICT (add/add): Merge conflict in pages/verify-service.ts\nAuto-merging popup.tsx\nCONFLICT (content): Merge conflict in popup.tsx\nAuto-merging scripts/check-i18n-params.ts\nCONFLICT (add/add): Merge conflict in scripts/check-i18n-params.ts\nAuto-merging scripts/deno.lock\nCONFLICT (add/add): Merge conflict in scripts/deno.lock\nAuto-merging scripts/generate_icon.ts\nCONFLICT (content): Merge conflict in scripts/generate_icon.ts\nAuto-merging scripts/generate_icon_badge.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_icon_badge.ts\nAuto-merging scripts/generate_translatedText.ts\nCONFLICT (add/add): Merge conflict in scripts/generate_translatedText.ts\nAuto-merging scripts/quality/common.js\nCONFLICT (add/add): Merge conflict in scripts/quality/common.js\nAuto-merging scripts/quality/test_services.js\nCONFLICT (add/add): Merge conflict in scripts/quality/test_services.js\nAuto-merging scripts/remove_unused_keys.sh\nCONFLICT (add/add): Merge conflict in scripts/remove_unused_keys.sh\nAuto-merging scripts/update_locales.ts\nCONFLICT (add/add): Merge conflict in scripts/update_locales.ts\nAuto-merging serve.ts\nCONFLICT (content): Merge conflict in serve.ts\nAuto-merging services/access_token.ts\nCONFLICT (add/add): Merge conflict in services/access_token.ts\nAuto-merging services/ai.ts\nCONFLICT (add/add): Merge conflict in services/ai.ts\nAuto-merging services/ai_test.ts\nCONFLICT (add/add): Merge conflict in services/ai_test.ts\nAuto-merging services/bai.ts\nCONFLICT (content): Merge conflict in services/bai.ts\nAuto-merging services/baidu_qianfan.ts\nCONFLICT (add/add): Merge conflict in services/baidu_qianfan.ts\nAuto-merging services/bing/mod.ts\nCONFLICT (content): Merge conflict in services/bing/mod.ts\nCONFLICT (modify/delete): services/cache.ts deleted in HEAD and modified in main.  Version main of services/cache.ts left in tree.\nAuto-merging services/claude.ts\nCONFLICT (add/add): Merge conflict in services/claude.ts\nAuto-merging services/config.ts\nCONFLICT (add/add): Merge conflict in services/config.ts\nAuto-merging services/deepl.ts\nCONFLICT (content): Merge conflict in services/deepl.ts\nAuto-merging services/gemini.ts\nCONFLICT (add/add): Merge conflict in services/gemini.ts\nAuto-merging services/google.ts\nAuto-merging services/helper.ts\nCONFLICT (add/add): Merge conflict in services/helper.ts\nAuto-merging services/helper_test.ts\nCONFLICT (add/add): Merge conflict in services/helper_test.ts\nAuto-merging services/mock.ts\nCONFLICT (content): Merge conflict in services/mock.ts\nAuto-merging services/mod.ts\nCONFLICT (content): Merge conflict in services/mod.ts\nAuto-merging services/pro.ts\nCONFLICT (add/add): Merge conflict in services/pro.ts\nAuto-merging services/silicon_cloud.ts\nCONFLICT (add/add): Merge conflict in services/silicon_cloud.ts\nAuto-merging services/tencent_hunyuan.ts\nCONFLICT (add/add): Merge conflict in services/tencent_hunyuan.ts\nAuto-merging services/translation.ts\nCONFLICT (content): Merge conflict in services/translation.ts\nAuto-merging services/translation_test.ts\nCONFLICT (add/add): Merge conflict in services/translation_test.ts\nAuto-merging services/util.ts\nCONFLICT (content): Merge conflict in services/util.ts\nAuto-merging services/util_test.ts\nCONFLICT (content): Merge conflict in services/util_test.ts\nAuto-merging services/zhipu.ts\nCONFLICT (add/add): Merge conflict in services/zhipu.ts\nAuto-merging side-panel.tsx\nCONFLICT (add/add): Merge conflict in side-panel.tsx\nAuto-merging src/ai-assistant/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod.ts\nAuto-merging src/ai-assistant/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/ai-assistant/mod_test.ts\nAuto-merging src/ai-writing/components/Insert-btn.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/Insert-btn.tsx\nAuto-merging src/ai-writing/components/ai-writing-button-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-button-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal-container.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal-container.tsx\nAuto-merging src/ai-writing/components/ai-writing-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/ai-writing-modal.tsx\nAuto-merging src/ai-writing/components/chat.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/chat.tsx\nAuto-merging src/ai-writing/components/close-modal.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/close-modal.tsx\nAuto-merging src/ai-writing/components/error.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/error.tsx\nAuto-merging src/ai-writing/components/language-select.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/language-select.tsx\nAuto-merging src/ai-writing/components/prompt-style.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/prompt-style.tsx\nAuto-merging src/ai-writing/components/suggestion.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/suggestion.tsx\nAuto-merging src/ai-writing/components/summary.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/summary.tsx\nAuto-merging src/ai-writing/components/translate-result.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/translate-result.tsx\nAuto-merging src/ai-writing/components/user-input-text.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input-text.tsx\nAuto-merging src/ai-writing/components/user-input.tsx\nCONFLICT (add/add): Merge conflict in src/ai-writing/components/user-input.tsx\nAuto-merging src/ai-writing/hooks/use-ai-writing-config.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-ai-writing-config.ts\nAuto-merging src/ai-writing/hooks/use-drag-modal.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-drag-modal.ts\nAuto-merging src/ai-writing/hooks/use-translate.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/hooks/use-translate.ts\nAuto-merging src/ai-writing/mod.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/mod.ts\nAuto-merging src/ai-writing/prompts.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/prompts.ts\nAuto-merging src/ai-writing/styles.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/styles.ts\nAuto-merging src/ai-writing/types.ts\nCONFLICT (add/add): Merge conflict in src/ai-writing/types.ts\nAuto-merging src/auto_translate_referrer.ts\nCONFLICT (add/add): Merge conflict in src/auto_translate_referrer.ts\nAuto-merging src/body-filter.ts\nCONFLICT (add/add): Merge conflict in src/body-filter.ts\nAuto-merging src/browser-bridge/dom-event.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/dom-event.ts\nAuto-merging src/browser-bridge/inject.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/inject.ts\nAuto-merging src/browser-bridge/message.ts\nCONFLICT (add/add): Merge conflict in src/browser-bridge/message.ts\nAuto-merging src/constant-urls.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls.ts\nAuto-merging src/constant-urls_test.ts\nCONFLICT (add/add): Merge conflict in src/constant-urls_test.ts\nAuto-merging src/contexts/mod.ts\nCONFLICT (add/add): Merge conflict in src/contexts/mod.ts\nAuto-merging src/dialogs/ai-context-upgrade.tsx\nCONFLICT (add/add): Merge conflict in src/dialogs/ai-context-upgrade.tsx\nAuto-merging src/ebook-builder/mod.ts\nCONFLICT (add/add): Merge conflict in src/ebook-builder/mod.ts\nAuto-merging src/encode.ts\nCONFLICT (add/add): Merge conflict in src/encode.ts\nAuto-merging src/encode_test.ts\nCONFLICT (add/add): Merge conflict in src/encode_test.ts\nAuto-merging src/error/modal-ui.ts\nCONFLICT (add/add): Merge conflict in src/error/modal-ui.ts\nAuto-merging src/error/modal.ts\nCONFLICT (add/add): Merge conflict in src/error/modal.ts\nAuto-merging src/global_state.ts\nCONFLICT (add/add): Merge conflict in src/global_state.ts\nAuto-merging src/gpt/mod.ts\nCONFLICT (add/add): Merge conflict in src/gpt/mod.ts\nAuto-merging src/hotkey-hover/mod.ts\nCONFLICT (add/add): Merge conflict in src/hotkey-hover/mod.ts\nAuto-merging src/html-engine/core.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/core.ts\nAuto-merging src/html-engine/interface.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/interface.ts\nAuto-merging src/html-engine/mod.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/mod.ts\nAuto-merging src/html-engine/report.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/report.ts\nAuto-merging src/html-engine/rule.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/rule.ts\nAuto-merging src/html-engine/util.ts\nCONFLICT (add/add): Merge conflict in src/html-engine/util.ts\nAuto-merging src/image/menu.ts\nCONFLICT (add/add): Merge conflict in src/image/menu.ts\nAuto-merging src/image/mod.ts\nCONFLICT (add/add): Merge conflict in src/image/mod.ts\nAuto-merging src/image/tools/hook.ts\nCONFLICT (add/add): Merge conflict in src/image/tools/hook.ts\nAuto-merging src/image/tools/index.tsx\nCONFLICT (add/add): Merge conflict in src/image/tools/index.tsx\nAuto-merging src/image/translate.ts\nCONFLICT (add/add): Merge conflict in src/image/translate.ts\nAuto-merging src/image/util.ts\nCONFLICT (add/add): Merge conflict in src/image/util.ts\nAuto-merging src/input/mod.ts\nCONFLICT (add/add): Merge conflict in src/input/mod.ts\nAuto-merging src/main.ts\nCONFLICT (add/add): Merge conflict in src/main.ts\nAuto-merging src/mock-side-panel/mod.tsx\nCONFLICT (add/add): Merge conflict in src/mock-side-panel/mod.tsx\nAuto-merging src/new-user-guide/components/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/arrow_animation.tsx\nAuto-merging src/new-user-guide/components/index.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/index.tsx\nAuto-merging src/new-user-guide/components/select-service-guide.tsx\nCONFLICT (add/add): Merge conflict in src/new-user-guide/components/select-service-guide.tsx\nAuto-merging src/new-user-guide/mod.ts\nCONFLICT (add/add): Merge conflict in src/new-user-guide/mod.ts\nAuto-merging src/notification/hook.ts\nCONFLICT (add/add): Merge conflict in src/notification/hook.ts\nAuto-merging src/notification/mod.tsx\nCONFLICT (add/add): Merge conflict in src/notification/mod.tsx\nAuto-merging src/notification/utils.ts\nCONFLICT (add/add): Merge conflict in src/notification/utils.ts\nAuto-merging src/pdf/util.ts\nCONFLICT (add/add): Merge conflict in src/pdf/util.ts\nAuto-merging src/resources/build-in-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.content.ts\nAuto-merging src/resources/build-in-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.ts\nAuto-merging src/resources/build-in-config.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/build-in-config.userscript.ts\nAuto-merging src/resources/final-config.content.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.content.ts\nAuto-merging src/resources/final-config.ts\nCONFLICT (add/add): Merge conflict in src/resources/final-config.ts\nAuto-merging src/resources/locales.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.ts\nAuto-merging src/resources/locales.userscript.ts\nCONFLICT (add/add): Merge conflict in src/resources/locales.userscript.ts\nAuto-merging src/rich-translate.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate.ts\nAuto-merging src/rich-translate_test.ts\nCONFLICT (add/add): Merge conflict in src/rich-translate_test.ts\nAuto-merging src/selection-translation/components/copy_text.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/copy_text.tsx\nAuto-merging src/selection-translation/components/dropdown.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/dropdown.tsx\nAuto-merging src/selection-translation/components/feedback.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/feedback.tsx\nAuto-merging src/selection-translation/components/inner_translator.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/inner_translator.tsx\nAuto-merging src/selection-translation/components/speaker.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/speaker.tsx\nAuto-merging src/selection-translation/components/styles.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/styles.tsx\nAuto-merging src/selection-translation/components/translation_modal.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/translation_modal.tsx\nAuto-merging src/selection-translation/components/trigger_icon.tsx\nCONFLICT (add/add): Merge conflict in src/selection-translation/components/trigger_icon.tsx\nAuto-merging src/selection-translation/hooks/use-modal-position.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-modal-position.ts\nAuto-merging src/selection-translation/hooks/use-selection-service.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/hooks/use-selection-service.ts\nAuto-merging src/selection-translation/mod.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/mod.ts\nAuto-merging src/selection-translation/types.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/types.ts\nAuto-merging src/selection-translation/utils.ts\nCONFLICT (add/add): Merge conflict in src/selection-translation/utils.ts\nAuto-merging src/subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/subtitle/mod.ts\nAuto-merging src/translate-context/mod.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod.ts\nAuto-merging src/translate-context/mod_test.ts\nCONFLICT (add/add): Merge conflict in src/translate-context/mod_test.ts\nAuto-merging src/tts/index.ts\nCONFLICT (add/add): Merge conflict in src/tts/index.ts\nAuto-merging src/utils/chrome-util.ts\nCONFLICT (add/add): Merge conflict in src/utils/chrome-util.ts\nAuto-merging src/utils/crypto-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config.ts\nAuto-merging src/utils/crypto-config_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/crypto-config_test.ts\nAuto-merging src/utils/hash.ts\nCONFLICT (add/add): Merge conflict in src/utils/hash.ts\nAuto-merging src/utils/secret-regex.ts\nCONFLICT (add/add): Merge conflict in src/utils/secret-regex.ts\nAuto-merging src/utils/translation_theme.ts\nCONFLICT (add/add): Merge conflict in src/utils/translation_theme.ts\nAuto-merging src/utils/user-config.ts\nCONFLICT (add/add): Merge conflict in src/utils/user-config.ts\nAuto-merging src/utils/util.ts\nCONFLICT (add/add): Merge conflict in src/utils/util.ts\nAuto-merging src/utils/util_test.ts\nCONFLICT (add/add): Merge conflict in src/utils/util_test.ts\nAuto-merging src/video-subtitle/attach-subtitle/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/hook.ts\nAuto-merging src/video-subtitle/attach-subtitle/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/attach-subtitle/index.tsx\nAuto-merging src/video-subtitle/deduplicate_subtitle_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/deduplicate_subtitle_test.ts\nAuto-merging src/video-subtitle/download_manager.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/download_manager.ts\nAuto-merging src/video-subtitle/inject.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/inject.ts\nAuto-merging src/video-subtitle/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/mod.ts\nAuto-merging src/video-subtitle/quick-button/hook.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/hook.ts\nAuto-merging src/video-subtitle/quick-button/icon.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/icon.tsx\nAuto-merging src/video-subtitle/quick-button/index.tsx\nCONFLICT (add/add): Merge conflict in src/video-subtitle/quick-button/index.tsx\nAuto-merging src/video-subtitle/translators/ai.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/ai.ts\nAuto-merging src/video-subtitle/translators/av.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/av.ts\nAuto-merging src/video-subtitle/translators/disneyplus.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/disneyplus.ts\nAuto-merging src/video-subtitle/translators/index.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/index.ts\nAuto-merging src/video-subtitle/translators/inject_util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/inject_util_test.ts\nAuto-merging src/video-subtitle/translators/khanacademy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/khanacademy.ts\nAuto-merging src/video-subtitle/translators/live.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/live.ts\nAuto-merging src/video-subtitle/translators/mubi.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/mubi.ts\nAuto-merging src/video-subtitle/translators/multi_attach_vtt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/multi_attach_vtt.ts\nAuto-merging src/video-subtitle/translators/subsrt.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/subsrt.ts\nAuto-merging src/video-subtitle/translators/text_track.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track.ts\nAuto-merging src/video-subtitle/translators/text_track_dynamic.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/text_track_dynamic.ts\nAuto-merging src/video-subtitle/translators/udemy.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/udemy.ts\nAuto-merging src/video-subtitle/translators/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util.ts\nAuto-merging src/video-subtitle/translators/util_test.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/util_test.ts\nAuto-merging src/video-subtitle/translators/youtube.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/translators/youtube.ts\nAuto-merging src/video-subtitle/util.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/util.ts\nAuto-merging src/video-subtitle/youtube/mod.ts\nCONFLICT (add/add): Merge conflict in src/video-subtitle/youtube/mod.ts\nAuto-merging src/walk_container.ts\nCONFLICT (add/add): Merge conflict in src/walk_container.ts\nAuto-merging src/yaml.ts\nCONFLICT (add/add): Merge conflict in src/yaml.ts\nAuto-merging src/yaml_test.ts\nCONFLICT (add/add): Merge conflict in src/yaml_test.ts\nwarning: Cannot merge binary files: static/badge-icons/128.png (HEAD vs. main)\nAuto-merging static/badge-icons/128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/128.png\nwarning: Cannot merge binary files: static/badge-icons/256.png (HEAD vs. main)\nAuto-merging static/badge-icons/256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/256.png\nwarning: Cannot merge binary files: static/badge-icons/32.png (HEAD vs. main)\nAuto-merging static/badge-icons/32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/32.png\nwarning: Cannot merge binary files: static/badge-icons/48.png (HEAD vs. main)\nAuto-merging static/badge-icons/48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/48.png\nwarning: Cannot merge binary files: static/badge-icons/64.png (HEAD vs. main)\nAuto-merging static/badge-icons/64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/64.png\nwarning: Cannot merge binary files: static/badge-icons/dark-128.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-128.png\nwarning: Cannot merge binary files: static/badge-icons/dark-256.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-256.png\nwarning: Cannot merge binary files: static/badge-icons/dark-32.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-32.png\nwarning: Cannot merge binary files: static/badge-icons/dark-48.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-48.png\nwarning: Cannot merge binary files: static/badge-icons/dark-64.png (HEAD vs. main)\nAuto-merging static/badge-icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/badge-icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/dark-128.png (HEAD vs. main)\nAuto-merging static/icons/dark-128.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-128.png\nwarning: Cannot merge binary files: static/icons/dark-256.png (HEAD vs. main)\nAuto-merging static/icons/dark-256.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-256.png\nwarning: Cannot merge binary files: static/icons/dark-32.png (HEAD vs. main)\nAuto-merging static/icons/dark-32.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-32.png\nwarning: Cannot merge binary files: static/icons/dark-48.png (HEAD vs. main)\nAuto-merging static/icons/dark-48.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-48.png\nwarning: Cannot merge binary files: static/icons/dark-64.png (HEAD vs. main)\nAuto-merging static/icons/dark-64.png\nCONFLICT (add/add): Merge conflict in static/icons/dark-64.png\nwarning: Cannot merge binary files: static/icons/toolbar-icon.png (HEAD vs. main)\nAuto-merging static/icons/toolbar-icon.png\nCONFLICT (add/add): Merge conflict in static/icons/toolbar-icon.png\nAuto-merging static/offscreen.html\nCONFLICT (add/add): Merge conflict in static/offscreen.html\nAuto-merging static/side-panel.html\nCONFLICT (add/add): Merge conflict in static/side-panel.html\nAuto-merging static/styles/inject.css\nCONFLICT (content): Merge conflict in static/styles/inject.css\nAuto-merging static/styles/input.css\nCONFLICT (add/add): Merge conflict in static/styles/input.css\nAuto-merging static/styles/options.css\nCONFLICT (content): Merge conflict in static/styles/options.css\nAuto-merging static/styles/popup.css\nCONFLICT (content): Merge conflict in static/styles/popup.css\nAuto-merging static/styles/side-panel.css\nCONFLICT (add/add): Merge conflict in static/styles/side-panel.css\nAuto-merging sync/google_auth.ts\nCONFLICT (content): Merge conflict in sync/google_auth.ts\nAuto-merging sync/util.ts\nCONFLICT (content): Merge conflict in sync/util.ts\nAuto-merging throttle_request_bus.ts\nCONFLICT (add/add): Merge conflict in throttle_request_bus.ts\nAuto-merging touch_shortcuts.ts\nCONFLICT (add/add): Merge conflict in touch_shortcuts.ts\nAuto-merging twind_config.ts\nCONFLICT (content): Merge conflict in twind_config.ts\nAuto-merging userscript.ts\nCONFLICT (content): Merge conflict in userscript.ts\nAuto-merging userscript/arrow_animation.tsx\nCONFLICT (add/add): Merge conflict in userscript/arrow_animation.tsx\nAuto-merging userscript/close_modal.tsx\nCONFLICT (add/add): Merge conflict in userscript/close_modal.tsx\nAuto-merging userscript/float_ball.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball.tsx\nAuto-merging userscript/float_ball_entry.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_entry.tsx\nAuto-merging userscript/float_ball_hook.ts\nCONFLICT (add/add): Merge conflict in userscript/float_ball_hook.ts\nAuto-merging userscript/float_ball_icon.tsx\nCONFLICT (add/add): Merge conflict in userscript/float_ball_icon.tsx\nAuto-merging userscript/guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/guide.tsx\nAuto-merging userscript/init_popup.tsx\nCONFLICT (add/add): Merge conflict in userscript/init_popup.tsx\nAuto-merging userscript/manga_guide.tsx\nCONFLICT (add/add): Merge conflict in userscript/manga_guide.tsx\nwarning: Cannot merge binary files: userscript/options/favicon.ico (HEAD vs. main)\nAuto-merging userscript/options/favicon.ico\nCONFLICT (add/add): Merge conflict in userscript/options/favicon.ico\nAuto-merging userscript/options/index.html\nCONFLICT (content): Merge conflict in userscript/options/index.html\nAuto-merging userscript/options_entry.ts\nCONFLICT (content): Merge conflict in userscript/options_entry.ts\nAuto-merging userscript/popup_app.tsx\nCONFLICT (content): Merge conflict in userscript/popup_app.tsx\nAuto-merging userscript/sdk/lite-entry.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-entry.ts\nAuto-merging userscript/sdk/lite-helper.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-helper.ts\nAuto-merging userscript/sdk/lite-main.ts\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-main.ts\nAuto-merging userscript/sdk/lite-view.tsx\nCONFLICT (add/add): Merge conflict in userscript/sdk/lite-view.tsx\nAuto-merging userscript/sheet.tsx\nCONFLICT (add/add): Merge conflict in userscript/sheet.tsx\nCONFLICT (modify/delete): userscript_command_listeners.ts deleted in HEAD and modified in main.  Version main of userscript_command_listeners.ts left in tree.\nCONFLICT (modify/delete): userscript_message.ts deleted in HEAD and modified in main.  Version main of userscript_message.ts left in tree.\nAuto-merging utils/aes_safe_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_safe_test.ts\nAuto-merging utils/aes_test.ts\nCONFLICT (add/add): Merge conflict in utils/aes_test.ts\nAuto-merging utils/app_version.ts\nCONFLICT (add/add): Merge conflict in utils/app_version.ts\nAuto-merging utils/app_version_test.ts\nCONFLICT (add/add): Merge conflict in utils/app_version_test.ts\nAuto-merging utils/append_tsx.tsx\nCONFLICT (add/add): Merge conflict in utils/append_tsx.tsx\nAuto-merging utils/browser_app.ts\nCONFLICT (add/add): Merge conflict in utils/browser_app.ts\nAuto-merging utils/compare_version.ts\nAuto-merging utils/date.ts\nCONFLICT (content): Merge conflict in utils/date.ts\nAuto-merging utils/date_test.ts\nCONFLICT (add/add): Merge conflict in utils/date_test.ts\nAuto-merging utils/discount_activity.ts\nCONFLICT (add/add): Merge conflict in utils/discount_activity.ts\nAuto-merging utils/expression.ts\nCONFLICT (add/add): Merge conflict in utils/expression.ts\nAuto-merging utils/expression_test.ts\nCONFLICT (add/add): Merge conflict in utils/expression_test.ts\nAuto-merging utils/fake_user.ts\nCONFLICT (add/add): Merge conflict in utils/fake_user.ts\nAuto-merging utils/format_language.ts\nCONFLICT (content): Merge conflict in utils/format_language.ts\nAuto-merging utils/iframe.ts\nCONFLICT (content): Merge conflict in utils/iframe.ts\nAuto-merging utils/is_pro.ts\nCONFLICT (add/add): Merge conflict in utils/is_pro.ts\nAuto-merging utils/is_valid_html_url.ts\nCONFLICT (content): Merge conflict in utils/is_valid_html_url.ts\nAuto-merging utils/js_sdk.ts\nCONFLICT (add/add): Merge conflict in utils/js_sdk.ts\nAuto-merging utils/language_detect_api.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_api.ts\nAuto-merging utils/language_detect_google.ts\nCONFLICT (add/add): Merge conflict in utils/language_detect_google.ts\nAuto-merging utils/mac_test.ts\nCONFLICT (add/add): Merge conflict in utils/mac_test.ts\nAuto-merging utils/merge_rule_test.ts\nCONFLICT (add/add): Merge conflict in utils/merge_rule_test.ts\nAuto-merging utils/page_view_report.ts\nCONFLICT (add/add): Merge conflict in utils/page_view_report.ts\nAuto-merging utils/platform.ts\nCONFLICT (content): Merge conflict in utils/platform.ts\nAuto-merging utils/pro_service_trial.ts\nCONFLICT (add/add): Merge conflict in utils/pro_service_trial.ts\nAuto-merging utils/rate_limiter.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter.ts\nAuto-merging utils/rate_limiter_test.ts\nCONFLICT (add/add): Merge conflict in utils/rate_limiter_test.ts\nAuto-merging utils/split_text.ts\nCONFLICT (add/add): Merge conflict in utils/split_text.ts\nAuto-merging utils/split_text_test.ts\nCONFLICT (add/add): Merge conflict in utils/split_text_test.ts\nAuto-merging utils/subtitle_styles_items.ts\nCONFLICT (add/add): Merge conflict in utils/subtitle_styles_items.ts\nAuto-merging utils/update_models_test.ts\nCONFLICT (add/add): Merge conflict in utils/update_models_test.ts\nAuto-merging utils/url_match_test.ts\nCONFLICT (content): Merge conflict in utils/url_match_test.ts\nAuto-merging web-options/setup_web_options_page.ts\nCONFLICT (content): Merge conflict in web-options/setup_web_options_page.ts\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
            "id": 151156,
            "action_name": "Repository merge failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151156/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-translate/extension/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T11:36:34.804333Z",
            "action": 53,
            "target": "",
            "id": 151155,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151155/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T10:37:24.118012Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151154,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151154/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T10:37:20.606060Z",
            "action": 21,
            "target": "",
            "id": 151153,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151153/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T10:37:14.574482Z",
            "action": 53,
            "target": "",
            "id": 151152,
            "action_name": "Repository notification received",
            "url": "https://weblate.immersivetranslate.com/api/changes/151152/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:52.638398Z",
            "action": 28,
            "target": "To github.com:immersive-translate/site.git\n ! [rejected]            main -> weblate_i18n_main (non-fast-forward)\nerror: failed to push some refs to 'github.com:immersive-translate/site.git'\nhint: Updates were rejected because a pushed branch tip is behind its remote\nhint: counterpart. Check out this branch and integrate the remote changes\nhint: (e.g. 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n (1)",
            "id": 151151,
            "action_name": "Repository push failed",
            "url": "https://weblate.immersivetranslate.com/api/changes/151151/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:48.102227Z",
            "action": 0,
            "target": "",
            "id": 151150,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151150/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/25749/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:48.102167Z",
            "action": 59,
            "target": "當前版本存在以下限制，我們正在積極優化：<ol><li>部分公式段落可能出現重疊</li><li>譯文中傾斜的文本會消失</li><li>小型段落（如作者信息、引文、目錄條目等）可能識別不準</li><li>僅支持使用拉丁字母或中日韓文書寫的語言作為原語言</li><li>不支持越南語作為原語言的文件</li><li>不支持下劃線</li><li>不支持圖表區域翻譯</li><li>不支持首字下沉效果</li><li>不支持 PDF Outline 翻譯</li><li>不支持掃描版、圖片版及 OCR 版 PDF</li><li>不支持連字</li><li>不支持圖紙</li><li>不支持使用 Type3 字體</li><li>不支持圖片格式的行內公式</li><li>不支持從右到左排版的文件</li><li>僅支持水平橫排文本</li><li>當前暫不支持選擇性忽略翻譯區域（系統默認會忽略參考文獻區域的翻譯）</li></ol>",
            "id": 151149,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151149/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant_HK/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.892774Z",
            "action": 0,
            "target": "",
            "id": 151148,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151148/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/83765/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hant_HK/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.892685Z",
            "action": 59,
            "target": "當前版本存在以下限制，我們正在積極優化：<ol><li>部分公式段落可能出現重疊</li><li>譯文中傾斜的文本會消失</li><li>小型段落（如作者信息、引文、目錄條目等）可能識別不準</li><li>僅支持使用拉丁字母或中日韓文書寫的語言作為原語言</li><li>不支持越南語作為原語言的文件</li><li>不支持下劃線</li><li>不支持圖表區域翻譯</li><li>不支持首字下沉效果</li><li>不支持 PDF Outline 翻譯</li><li>不支持掃描版、圖片版及 OCR 版 PDF</li><li>不支持連字</li><li>不支持圖紙</li><li>不支持使用 Type3 字體</li><li>不支持圖片格式的行內公式</li><li>不支持從右到左排版的文件</li><li>僅支持水平橫排文本</li></ol>",
            "id": 151147,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151147/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hans/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.483860Z",
            "action": 0,
            "target": "",
            "id": 151146,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151146/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/48863/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/zh_Hans/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.483798Z",
            "action": 59,
            "target": "当前版本存在以下限制，我们正在积极优化：<ol><li>部分公式段落可能出现重叠</li><li>译文中倾斜的文本会消失</li><li>小型段落（如作者信息、引文、目录条目等）可能识别不准</li><li>仅支持使用拉丁字母或中日韩文书写的语言作为原语言</li><li>不支持越南语作为原语言的文档</li><li>不支持下划线</li><li>不支持图表区域翻译</li><li>不支持首字下沉效果</li><li>不支持 PDF Outline 翻译</li><li>不支持扫描版、图片版及 OCR 版 PDF</li><li>不支持连字</li><li>不支持图纸</li><li>不支持使用 Type3 字体</li><li>不支持图片格式的行内公式</li><li>不支持从右到左排版的文件</li><li>仅支持水平横排文本</li><li>当前暂不支持选择性忽略翻译区域（系统默认会忽略参考文献区域的翻译）</li></ol>",
            "id": 151145,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151145/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/th/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.269050Z",
            "action": 0,
            "target": "",
            "id": 151144,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151144/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/25634/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/th/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:47.268984Z",
            "action": 59,
            "target": "",
            "id": 151143,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151143/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ru/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.842445Z",
            "action": 0,
            "target": "",
            "id": 151142,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151142/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/61353/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ru/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.842379Z",
            "action": 59,
            "target": "Текущая версия имеет следующие ограничения, над устранением которых мы активно работаем:\n<ol>\n<li>Некоторые разделы формул могут перекрываться.</li>\n<li>Курсив в переводах исчезнет.</li>\n<li>Мелкие разделы (такие как информация об авторе, цитаты, записи оглавления и т.д.) могут быть распознаны некорректно.</li>\n<li>Поддерживает только языки, написанные латиницей, китайскими, японскими или корейскими письменностями в качестве исходного языка.</li>\n<li>Не поддерживает документы с вьетнамским языком в качестве исходного языка.</li>\n<li>Не поддерживает подчеркивание.</li>\n<li>Не поддерживает перевод областей диаграмм.</li>\n<li>Не поддерживает буквицы.</li>\n<li>Не поддерживает перевод структуры PDF.</li>\n<li>Не поддерживает сканированные PDF, основанные на изображениях или OCR.</li>\n<li>Не поддерживает лигатуры.</li>\n<li>Не поддерживает чертежи.</li>\n<li>Не поддерживает шрифты Type3.</li>\n<li>Не поддерживает формулы в формате изображений в тексте.</li>\n<li>Не поддерживает документы с форматированием справа налево.</li>\n<li>Поддерживает только горизонтально выровненный текст.</li>\n<li>В настоящее время не поддерживается выборочное игнорирование областей перевода (система по умолчанию будет игнорировать перевод областей ссылок)</li></ol>",
            "id": 151141,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151141/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/pt/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.631849Z",
            "action": 0,
            "target": "",
            "id": 151140,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151140/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/60631/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/pt/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.631792Z",
            "action": 59,
            "target": "A versão atual possui as seguintes limitações, que estamos ativamente otimizando:\n<ol>\n<li>Algumas seções de fórmulas podem se sobrepor.</li>\n<li>O texto em itálico nas traduções desaparecerá.</li>\n<li>Pequenas seções (como informações do autor, citações, entradas de índice, etc.) podem não ser reconhecidas com precisão.</li>\n<li>Suporta apenas idiomas escritos em alfabetos latino, chinês, japonês ou coreano como idioma de origem.</li>\n<li>Não suporta documentos com vietnamita como idioma de origem.</li>\n<li>Não suporta sublinhado.</li>\n<li>Não suporta a tradução de áreas de gráficos.</li>\n<li>Não suporta letras capitulares.</li>\n<li>Não suporta a tradução de contornos em PDF.</li>\n<li>Não suporta PDFs digitalizados, baseados em imagens ou em OCR.</li>\n<li>Não suporta ligaduras.</li>\n<li>Não suporta plantas baixas.</li>\n<li>Não suporta fontes Type3.</li>\n<li>Não suporta fórmulas em formato de imagem.</li>\n<li>Não suporta documentos formatados da direita para a esquerda.</li>\n<li>Suporta apenas texto alinhado horizontalmente.</li>\n<li>Atualmente, não é suportado o ignorar seletivo de áreas de tradução (o sistema irá por padrão ignorar a tradução de áreas de referência)</li></ol>",
            "id": 151139,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151139/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ko/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.256592Z",
            "action": 0,
            "target": "",
            "id": 151138,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151138/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/25519/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ko/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.256515Z",
            "action": 59,
            "target": "현재 버전은 다음과 같은 제한 사항이 있으며, 우리는 이를 적극적으로 최적화하고 있습니다:\n<ol>\n<li>일부 수식 섹션이 겹칠 수 있습니다.</li>\n<li>번역에서 이탤릭체 텍스트가 사라집니다.</li>\n<li>작은 섹션(예: 저자 정보, 인용문, 목차 항목 등)이 정확하게 인식되지 않을 수 있습니다.</li>\n<li>출처 언어로 라틴어, 중국어, 일본어, 한국어로 작성된 언어만 지원합니다.</li>\n<li>베트남어를 출처 언어로 사용하는 문서는 지원하지 않습니다.</li>\n<li>밑줄을 지원하지 않습니다.</li>\n<li>차트 영역의 번역을 지원하지 않습니다.</li>\n<li>드롭 캡을 지원하지 않습니다.</li>\n<li>PDF 개요 번역을 지원하지 않습니다.</li>\n<li>스캔된 이미지 기반 또는 OCR 기반 PDF를 지원하지 않습니다.</li>\n<li>리게이처를 지원하지 않습니다.</li>\n<li>청사진을 지원하지 않습니다.</li>\n<li>Type3 폰트를 지원하지 않습니다.</li>\n<li>이미지 형식 인라인 수식을 지원하지 않습니다.</li>\n<li>오른쪽에서 왼쪽으로 포맷된 문서를 지원하지 않습니다.</li>\n<li>수평으로 정렬된 텍스트만 지원합니다.</li>\n<li>현재 번역 영역의 선택적 무시를 지원하지 않습니다(시스템은 참조 영역의 번역을 기본적으로 무시하도록 설정됩니다)</li></ol>",
            "id": 151137,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151137/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ja/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.035400Z",
            "action": 0,
            "target": "",
            "id": 151136,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151136/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/24942/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ja/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:46.035340Z",
            "action": 59,
            "target": "現在のバージョンには以下の制限があり、私たちは積極的に最適化を進めています：\n<ol>\n<li>一部の数式セクションが重なることがあります。</li>\n<li>翻訳中のイタリック体のテキストが消えます。</li>\n<li>小さなセクション（著者情報、引用文、目次エントリーなど）が正確に認識されないことがあります。</li>\n<li>ソース言語としてラテン文字、中国語、日本語、韓国語のスクリプトのみをサポートします。</li>\n<li>ベトナム語をソース言語とするドキュメントには対応していません。</li>\n<li>下線をサポートしていません。</li>\n<li>チャートエリアの翻訳をサポートしていません。</li>\n<li>ドロップキャップをサポートしていません。</li>\n<li>PDFアウトラインの翻訳をサポートしていません。</li>\n<li>スキャンされた、画像ベースの、またはOCRベースのPDFをサポートしていません。</li>\n<li>合字をサポートしていません。</li>\n<li>設計図をサポートしていません。</li>\n<li>Type3フォントをサポートしていません。</li>\n<li>画像形式のインライン数式をサポートしていません。</li>\n<li>右から左へのフォーマットされたドキュメントをサポートしていません。</li>\n<li>水平に配置されたテキストのみをサポートします。</li>\n<li>現在、翻訳エリアの選択的な無視はサポートされていません（システムは参照エリアの翻訳を無視することをデフォルトにします）</li></ol>",
            "id": 151135,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151135/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/it/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:45.570965Z",
            "action": 0,
            "target": "",
            "id": 151134,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151134/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/59909/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/it/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:45.570876Z",
            "action": 59,
            "target": "La versione attuale presenta le seguenti limitazioni, che stiamo attivamente ottimizzando:\n<ol>\n<li>Alcune sezioni delle formule possono sovrapporsi.</li>\n<li>Il testo in corsivo nelle traduzioni scomparirà.</li>\n<li>Le piccole sezioni (come informazioni sull'autore, citazioni, voci di indice, ecc.) potrebbero non essere riconosciute accuratamente.</li>\n<li>Supporta solo le lingue scritte in caratteri latini, cinesi, giapponesi o coreani come lingua sorgente.</li>\n<li>Non supporta i documenti con il vietnamita come lingua sorgente.</li>\n<li>Non supporta il sottolineamento.</li>\n<li>Non supporta la traduzione delle aree dei grafici.</li>\n<li>Non supporta le lettere maiuscole all'inizio dei capitoli.</li>\n<li>Non supporta la traduzione degli outline dei PDF.</li>\n<li>Non supporta i PDF scansionati, basati su immagini o su OCR.</li>\n<li>Non supporta le legature.</li>\n<li>Non supporta i progetti tecnici.</li>\n<li>Non supporta i font di tipo Type3.</li>\n<li>Non supporta le formule in formato immagine all'interno del testo.</li>\n<li>Non supporta i documenti formattati da destra a sinistra.</li>\n<li>Supporta solo il testo allineato orizzontalmente.</li>\n<li>Attualmente, non è supportata l'ignoranza selettiva delle aree di traduzione (il sistema ignorerà di default la traduzione delle aree di riferimento)</li></ol>",
            "id": 151133,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151133/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/hi/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:45.340797Z",
            "action": 0,
            "target": "",
            "id": 151132,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151132/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/59187/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/hi/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:45.340735Z",
            "action": 59,
            "target": "वर्तमान संस्करण में निम्नलिखित सीमाएँ हैं, जिन्हें हम सक्रिय रूप से अनुकूलित कर रहे हैं:\n<ol>\n<li>कुछ सूत्र खंड ओवरलैप हो सकते हैं।</li>\n<li>अनुवादों में इटैलिक पाठ गायब हो जाएगा।</li>\n<li>छोटे खंड (जैसे लेखक की जानकारी, उद्धरण, अनुक्रमणिका प्रविष्टियाँ, आदि) सही ढंग से पहचाने नहीं जा सकते हैं।</li>\n<li>केवल लैटिन, चीनी, जापानी, या कोरियाई लिपियों में लिखी गई भाषाओं का समर्थन करता है।</li>\n<li>वियतनामी को स्रोत भाषा के रूप में उपयोग करने वाले दस्तावेज़ों का समर्थन नहीं करता है।</li>\n<li>रेखांकन का समर्थन नहीं करता है।</li>\n<li>चार्ट क्षेत्रों का अनुवाद करने का समर्थन नहीं करता है।</li>\n<li>ड्रॉप कैप्स का समर्थन नहीं करता है।</li>\n<li>PDF आउटलाइन अनुवाद का समर्थन नहीं करता है।</li>\n<li>स्कैन किए गए, छवि-आधारित, या OCR-आधारित PDFs का समर्थन नहीं करता है।</li>\n<li>लिगेचर्स का समर्थन नहीं करता है।</li>\n<li>ब्लूप्रिंट्स का समर्थन नहीं करता है।</li>\n<li>Type3 फोंट्स का समर्थन नहीं करता है।</li>\n<li>इमेज फॉर्मेट इनलाइन सूत्रों का समर्थन नहीं करता है।</li>\n<li>दाएं से बाएं फॉर्मेटेड दस्तावेज़ों का समर्थन नहीं करता है।</li>\n<li>केवल क्षैतिज रूप से संरेखित पाठ का समर्थन करता है।</li>\n<li>वर्तमान में, अनुवाद क्षेत्रों की चयनात्मक उपेक्षा का समर्थन नहीं किया जाता है (प्रणाली संदर्भ क्षेत्रों के अनुवाद को उपेक्षित करने के लिए डिफ़ॉल्ट होगी)</li></ol>",
            "id": 151131,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151131/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.938441Z",
            "action": 0,
            "target": "",
            "id": 151130,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151130/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/58465/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/fr/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.938384Z",
            "action": 59,
            "target": "La version actuelle présente les limitations suivantes, que nous optimisons activement :\n<ol>\n<li>Certaines sections de formules peuvent se chevaucher.</li>\n<li>Le texte en italique dans les traductions disparaîtra.</li>\n<li>Les petites sections (telles que les informations sur l'auteur, les citations, les entrées de la table des matières, etc.) peuvent ne pas être reconnues avec précision.</li>\n<li>Ne prend en charge que les langues écrites en caractères latins, chinois, japonais ou coréens comme langue source.</li>\n<li>Ne prend pas en charge les documents dont la langue source est le vietnamien.</li>\n<li>Ne prend pas en charge le soulignement.</li>\n<li>Ne prend pas en charge la traduction des zones de graphiques.</li>\n<li>Ne prend pas en charge les lettrines.</li>\n<li>Ne prend pas en charge la traduction du plan du PDF.</li>\n<li>Ne prend pas en charge les PDF scannés, basés sur des images ou basés sur l'OCR.</li>\n<li>Ne prend pas en charge les ligatures.</li>\n<li>Ne prend pas en charge les plans techniques.</li>\n<li>Ne prend pas en charge les polices de type Type3.</li>\n<li>Ne prend pas en charge les formules en format d'image intégré.</li>\n<li>Ne prend pas en charge les documents formatés de droite à gauche.</li>\n<li>Ne prend en charge que le texte aligné horizontalement.</li>\n<li>Actuellement, l'ignorance sélective des zones de traduction n'est pas prise en charge (le système ignorera par défaut la traduction des zones de référence)</li></ol>",
            "id": 151129,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151129/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/es/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.736274Z",
            "action": 0,
            "target": "",
            "id": 151128,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151128/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/56285/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/es/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.736215Z",
            "action": 59,
            "target": "La versión actual tiene las siguientes limitaciones, las cuales estamos optimizando activamente:\n<ol>\n<li>Algunas secciones de fórmulas pueden solaparse.</li>\n<li>El texto en cursiva en las traducciones desaparecerá.</li>\n<li>Secciones pequeñas (como información del autor, citas, entradas del índice, etc.) pueden no ser reconocidas con precisión.</li>\n<li>Solo admite idiomas escritos en alfabetos latino, chino, japonés o coreano como idioma de origen.</li>\n<li>No admite documentos con vietnamita como idioma de origen.</li>\n<li>No admite subrayado.</li>\n<li>No admite la traducción de áreas de gráficos.</li>\n<li>No admite letras capitales al inicio de los párrafos.</li>\n<li>No admite la traducción del esquema de PDF.</li>\n<li>No admite PDFs escaneados, basados en imágenes o en OCR.</li>\n<li>No admite ligaduras.</li>\n<li>No admite planos.</li>\n<li>No admite fuentes Type3.</li>\n<li>No admite fórmulas en formato de imagen dentro del texto.</li>\n<li>No admite documentos formateados de derecha a izquierda.</li>\n<li>Solo admite texto alineado horizontalmente.</li>\n<li>Actualmente, no se admite la ignorancia selectiva de áreas de traducción (el sistema por defecto ignorará la traducción de áreas de referencia)</li></ol>",
            "id": 151127,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151127/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/de/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.390564Z",
            "action": 0,
            "target": "",
            "id": 151126,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151126/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/57743/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/de/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.390507Z",
            "action": 59,
            "target": "Die aktuelle Version hat die folgenden Einschränkungen, an deren Optimierung wir aktiv arbeiten:\n<ol>\n<li>Einige Formelabschnitte können sich überlappen.</li>\n<li>Kursiver Text in Übersetzungen wird verschwinden.</li>\n<li>Kleine Abschnitte (wie Autorinformationen, Zitate, Inhaltsverzeichniseinträge usw.) werden möglicherweise nicht genau erkannt.</li>\n<li>Unterstützt nur Sprachen, die in lateinischer, chinesischer, japanischer oder koreanischer Schrift als Quellsprache geschrieben sind.</li>\n<li>Unterstützt keine Dokumente mit Vietnamesisch als Quellsprache.</li>\n<li>Unterstützt keine Unterstreichungen.</li>\n<li>Unterstützt keine Übersetzung von Diagrammbereichen.</li>\n<li>Unterstützt keine Initialen.</li>\n<li>Unterstützt keine Übersetzung von PDF-Inhalten.</li>\n<li>Unterstützt keine gescannten, bildbasierten oder OCR-basierten PDFs.</li>\n<li>Unterstützt keine Ligaturen.</li>\n<li>Unterstützt keine Baupläne.</li>\n<li>Unterstützt keine Type3-Schriften.</li>\n<li>Unterstützt keine Bildformat-In-Formeln.</li>\n<li>Unterstützt keine von rechts nach links formatierten Dokumente.</li>\n<li>Unterstützt nur horizontal ausgerichteten Text.</li>\n<li>Derzeit wird das selektive Ignorieren von Übersetzungsbereichen nicht unterstützt (das System wird standardmäßig das Ignorieren der Übersetzung von Referenzbereichen voreinstellen)</li></ol>",
            "id": 151125,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151125/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ar/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.196475Z",
            "action": 0,
            "target": "",
            "id": 151124,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151124/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/57021/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/ar/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:44.196416Z",
            "action": 59,
            "target": "الإصدار الحالي يحتوي على القيود التالية، ونحن نعمل بنشاط على تحسينها:\n<ol>\n<li>قد تتداخل بعض أقسام الصيغ.</li>\n<li>سيختفي النص المائل في الترجمات.</li>\n<li>قد لا يتم التعرف بدقة على الأقسام الصغيرة (مثل معلومات المؤلف، الاستشهادات، مداخل جدول المحتويات، إلخ).</li>\n<li>يدعم فقط اللغات المكتوبة بالأبجدية اللاتينية، الصينية، اليابانية، أو الكورية كلغة مصدر.</li>\n<li>لا يدعم المستندات التي تكون اللغة الفيتنامية فيها هي اللغة الأصلية.</li>\n<li>لا يدعم التسطير.</li>\n<li>لا يدعم ترجمة مناطق الرسوم البيانية.</li>\n<li>لا يدعم الأحرف الكبيرة في بداية الفقرات.</li>\n<li>لا يدعم ترجمة مخطط PDF.</li>\n<li>لا يدعم PDFs الممسوحة ضوئيًا، أو المبنية على الصور، أو المبنية على OCR.</li>\n<li>لا يدعم الربط.</li>\n<li>لا يدعم الرسومات التخطيطية.</li>\n<li>لا يدعم خطوط Type3.</li>\n<li>لا يدعم الصيغ الرياضية المضمنة بتنسيق الصور.</li>\n<li>لا يدعم المستندات المنسقة من اليمين إلى اليسار.</li>\n<li>يدعم فقط النص المحاذاة أفقيًا.</li>\n<li>حاليًا، لا يتم دعم تجاهل مناطق الترجمة بشكل انتقائي (سيقوم النظام بشكل افتراضي بتجاهل ترجمة مناطق المراجع)</li></ol>",
            "id": 151123,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151123/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/en/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.798261Z",
            "action": 0,
            "target": "",
            "id": 151122,
            "action_name": "Resource updated",
            "url": "https://weblate.immersivetranslate.com/api/changes/151122/?format=api"
        },
        {
            "unit": "https://weblate.immersivetranslate.com/api/units/24365/?format=api",
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": "https://weblate.immersivetranslate.com/api/translations/immersive-document-translation/immersive-translate-site/en/?format=api",
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.798201Z",
            "action": 59,
            "target": "The current version has the following limitations, which we are actively optimizing:\n<ol>\n<li>Some formula sections may overlap.</li>\n<li>Italicized text in translations will disappear.</li>\n<li>Small sections (such as author information, citations, table of contents entries, etc.) may not be accurately recognized.</li>\n<li>Only supports languages written in Latin, Chinese, Japanese, or Korean scripts as the source language.</li>\n<li>Does not support documents with Vietnamese as the source language.</li>\n<li>Does not support underlining.</li>\n<li>Does not support translation of chart areas.</li>\n<li>Does not support drop caps.</li>\n<li>Does not support PDF Outline translation.</li>\n<li>Does not support scanned, image-based, or OCR-based PDFs.</li>\n<li>Does not support ligatures.</li>\n<li>Does not support blueprints.</li>\n<li>Does not support Type3 fonts.</li>\n<li>Does not support image format inline formulas.</li>\n<li>Does not support right-to-left formatted documents.</li>\n<li>Only supports horizontally aligned text.</li>\n<li>Currently, selective ignoring of translation areas is not supported (the system will default to ignoring the translation of reference areas)</li></ol>",
            "id": 151121,
            "action_name": "String updated in the repository",
            "url": "https://weblate.immersivetranslate.com/api/changes/151121/?format=api"
        },
        {
            "unit": null,
            "component": "https://weblate.immersivetranslate.com/api/components/immersive-document-translation/immersive-translate-site/?format=api",
            "translation": null,
            "user": null,
            "author": null,
            "timestamp": "2026-03-31T08:41:43.461544Z",
            "action": 21,
            "target": "",
            "id": 151120,
            "action_name": "Repository rebased",
            "url": "https://weblate.immersivetranslate.com/api/changes/151120/?format=api"
        }
    ]
}