mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2026-01-11 17:16:50 -05:00
feat: rebase
This commit is contained in:
@@ -148,13 +148,9 @@
|
|||||||
"components.PersonDetails.nobiography": "No biography available.",
|
"components.PersonDetails.nobiography": "No biography available.",
|
||||||
"components.PlexLoginButton.loading": "Loading…",
|
"components.PlexLoginButton.loading": "Loading…",
|
||||||
"components.PlexLoginButton.signingin": "Signing in…",
|
"components.PlexLoginButton.signingin": "Signing in…",
|
||||||
<<<<<<< HEAD
|
|
||||||
"components.PlexLoginButton.signinwithplex": "Sign In",
|
|
||||||
"components.RegionSelector.regionDefault": "All Regions",
|
"components.RegionSelector.regionDefault": "All Regions",
|
||||||
"components.RegionSelector.regionServerDefault": "{applicationTitle} Default ({region})",
|
"components.RegionSelector.regionServerDefault": "{applicationTitle} Default ({region})",
|
||||||
=======
|
|
||||||
"components.PlexLoginButton.signinwithplex": "Sign In with Plex",
|
"components.PlexLoginButton.signinwithplex": "Sign In with Plex",
|
||||||
>>>>>>> feat(all): add initial Jellyfin/Emby support
|
|
||||||
"components.RequestBlock.profilechanged": "Quality Profile",
|
"components.RequestBlock.profilechanged": "Quality Profile",
|
||||||
"components.RequestBlock.requestoverrides": "Request Overrides",
|
"components.RequestBlock.requestoverrides": "Request Overrides",
|
||||||
"components.RequestBlock.rootfolder": "Root Folder",
|
"components.RequestBlock.rootfolder": "Root Folder",
|
||||||
|
|||||||
Reference in New Issue
Block a user