From fd3c6ad55313bc4640d7adcbc6470cf5685a201f Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 21 Nov 2020 12:47:43 +0800 Subject: [PATCH] resolve confict --- src/strings/zh-cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json index d9f79bb091..ff10f7c3af 100644 --- a/src/strings/zh-cn.json +++ b/src/strings/zh-cn.json @@ -1443,7 +1443,7 @@ "LabelDirectStreamingInfo": "直接串流信息", "LabelRemuxingInfo": "转封装信息", "LabelOriginalMediaInfo": "媒体源信息", - "LabelSyncPlayInfo": "同步播放信息" + "LabelSyncPlayInfo": "同步播放信息", "PreferFmp4HlsContainer": "优先使用 fMP4-HLS 媒体容器", "PreferFmp4HlsContainerHelp": "优先使用 fMP4 作为 HLS 播放的默认容器，从而可以在支持的设备上直接串流 HEVC 格式的内容。", "AllowHevcEncoding": "允许以 HEVC 格式编码",