web/src/i18n/locales/fr.json · b2d3fa5d95023f9e4bdfab39d8bcdb9a9ebe02b2 · phsl / new-api

Merge branch 'main-upstream' into pr/custom-currency-1923 · b65e2719

# Conflicts:
#	web/src/components/settings/personal/cards/AccountManagement.jsx
#	web/src/components/table/channels/modals/EditChannelModal.jsx
#	web/src/hooks/channels/useChannelsData.jsx
#	web/src/hooks/common/useSidebar.js
#	web/src/i18n/locales/fr.json
#	web/src/pages/Setting/Operation/SettingsGeneral.jsx

committed Oct 02, 2025

b65e2719

fr.json 171 KB