1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into copy-stream-url

This commit is contained in:
Joshua M. Boniface 2019-08-31 21:52:48 -04:00 committed by GitHub
commit 505cda6f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 673 additions and 4164 deletions

View file

@ -640,6 +640,7 @@
"LabelFailed": "Failed",
"LabelFileOrUrl": "File or url:",
"LabelFinish": "Finish",
"LabelFolder": "Folder:",
"LabelFont": "Font:",
"LabelForgotPasswordUsernameHelp": "Enter your username, if you remember it.",
"LabelFormat": "Format:",
@ -1348,7 +1349,7 @@
"TabMyPlugins": "My Plugins",
"TabNetworks": "Networks",
"TabNetworking": "Networking",
"TabNfoSettings": "NFO settings",
"TabNfoSettings": "NFO Settings",
"TabNotifications": "Notifications",
"TabOther": "Other",
"TabParentalControl": "Parental Control",