Merge master

client/strings/zh-cn.json

@@ -132,8 +132,10 @@
   "HeaderNewAccount": "新建帐户",
   "HeaderNewLibrary": "新建媒体库",
   "HeaderNotifications": "通知",
+  "HeaderOpenIDConnectAuthentication": "OpenID Connect Authentication",
   "HeaderOpenRSSFeed": "打开 RSS 源",
   "HeaderOtherFiles": "其他文件",
+  "HeaderPasswordAuthentication": "Password Authentication",
   "HeaderPermissions": "权限",
   "HeaderPlayerQueue": "播放队列",
   "HeaderPlaylist": "播放列表",
@@ -194,6 +196,10 @@
   "LabelAuthorLastFirst": "作者 (名, 姓)",
   "LabelAuthors": "作者",
   "LabelAutoDownloadEpisodes": "自动下载剧集",
+  "LabelAutoLaunch": "Auto Launch",
+  "LabelAutoLaunchDescription": "Redirect to the auth provider automatically when navigating to the login page (manual override path <code>/login?autoLaunch=0</code>)",
+  "LabelAutoRegister": "Auto Register",
+  "LabelAutoRegisterDescription": "Automatically create new users after logging in",
   "LabelBackToUser": "返回到用户",
   "LabelBackupLocation": "备份位置",
   "LabelBackupsEnableAutomaticBackups": "启用自动备份",
@@ -204,6 +210,7 @@
   "LabelBackupsNumberToKeepHelp": "一次只能删除一个备份, 因此如果你已经有超过此数量的备份, 则应手动删除它们.",
   "LabelBitrate": "比特率",
   "LabelBooks": "图书",
+  "LabelButtonText": "Button Text",
   "LabelChangePassword": "修改密码",
   "LabelChannels": "声道",
   "LabelChapters": "章节",
@@ -319,6 +326,8 @@
   "LabelLogLevelWarn": "警告",
   "LabelLookForNewEpisodesAfterDate": "在此日期后查找新剧集",
   "LabelLowestPriority": "Lowest Priority",
+  "LabelMatchExistingUsersBy": "Match existing users by",
+  "LabelMatchExistingUsersByDescription": "Used for connecting existing users. Once connected, users will be matched by a unique id from your SSO provider",
   "LabelMediaPlayer": "媒体播放器",
   "LabelMediaType": "媒体类型",
   "LabelMetadataOrderOfPrecedenceDescription": "Higher priority metadata sources will override lower priority metadata sources",