1
0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-11 17:16:50 -05:00

feat: rebase

This commit is contained in:
Aiden Vigue
2021-02-15 11:10:33 -05:00
parent 3743edab8d
commit 9582196e1f

View File

@@ -148,13 +148,9 @@
"components.PersonDetails.nobiography": "No biography available.",
"components.PlexLoginButton.loading": "Loading…",
"components.PlexLoginButton.signingin": "Signing in…",
<<<<<<< HEAD
"components.PlexLoginButton.signinwithplex": "Sign In",
"components.RegionSelector.regionDefault": "All Regions",
"components.RegionSelector.regionServerDefault": "{applicationTitle} Default ({region})",
=======
"components.PlexLoginButton.signinwithplex": "Sign In with Plex",
>>>>>>> feat(all): add initial Jellyfin/Emby support
"components.RequestBlock.profilechanged": "Quality Profile",
"components.RequestBlock.requestoverrides": "Request Overrides",
"components.RequestBlock.rootfolder": "Root Folder",