Merge remote-tracking branch 'origin/master' into fadein

This commit is contained in:
MrTimscampi
2020-02-01 19:54:06 +01:00
255 changed files with 6006 additions and 3239 deletions
-1
View File
@@ -1305,7 +1305,6 @@
"OptionEnableM2tsModeHelp": "Enable m2ts mode when encoding to mpegts.",
"OptionEnableM2tsMode": "Enable M2ts mode",
"OptionEnableExternalContentInSuggestions": "Enable external content in suggestions",
"OptionEnableAutomaticServerUpdates": "Enable automatic server updates",
"OptionEnableAccessToAllLibraries": "Enable access to all libraries",
"OptionEnableAccessToAllChannels": "Enable access to all channels",
"OptionEnableAccessFromAllDevices": "Enable access from all devices",