d3b51e84f2
# Conflicts: # src/components/video-editor/SettingsPanel.tsx # src/i18n/locales/ja-JP/settings.json
# Conflicts: # src/components/video-editor/SettingsPanel.tsx # src/i18n/locales/ja-JP/settings.json