mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2025-12-30 11:31:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
broquemonsieur
2023-10-21 14:05:29 -07:00
parent ee5d7f287f 2414e7db41
commit 3758d225c4
13 changed files with 163 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
locales/en-US.json
View File

@@ -40,6 +40,7 @@
"Import Invidious data": "Import Invidious JSON data",
"Import YouTube subscriptions": "Import YouTube/OPML subscriptions",
"Import YouTube playlist (.csv)": "Import YouTube playlist (.csv)",
"Import YouTube watch history (.json)": "Import YouTube watch history (.json)",
"Import FreeTube subscriptions (.db)": "Import FreeTube subscriptions (.db)",
"Import NewPipe subscriptions (.json)": "Import NewPipe subscriptions (.json)",
"Import NewPipe data (.zip)": "Import NewPipe data (.zip)",