wjones/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-subtitle-line-spacing

Browse Source 
Conflicts:
	src/components/subtitlesettings/subtitleappearancehelper.js
	src/components/subtitlesettings/subtitlesettings.js
	src/elements/emby-slider/emby-slider.js
This commit is contained in:
Dmitry Lyzo
2020-07-26 13:35:17 +03:00
parent 597b4258d9 704b2fe9da
commit 450807ff14
244 changed files with 7938 additions and 6524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/strings/en-us.json
+1 -1
View File
@@ -1054,7 +1054,7 @@
"MessageSyncPlayDisabled": "SyncPlay disabled.",
"MessageSyncPlayUserJoined": "<b>{0}</b> has joined the group.",
"MessageSyncPlayUserLeft": "<b>{0}</b> has left the group.",
"MessageSyncPlayGroupWait": "<b>{0}</b> is buffering...",
"MessageSyncPlayGroupWait": "<b>{0}</b> is buffering…",
"MessageSyncPlayNoGroupsAvailable": "No groups available. Start playing something first.",
"MessageSyncPlayPlaybackPermissionRequired": "Playback permission required.",
"MessageSyncPlayGroupDoesNotExist": "Failed to join group because it does not exist.",