Merge remote-tracking branch 'upstream/master' into unstable

src/strings/en-gb.json

@@ -1412,7 +1412,7 @@
     "LabelIconMaxResHelp": "Maximum resolution of icons exposed via the upnp:icon property.",
     "LabelCurrentStatus": "Current status:",
     "LabelAlbumArtMaxResHelp": "Maximum resolution of album art exposed via the upnp:albumArtURI property.",
-    "KnownProxiesHelp": "Comma separated list of IP addresses of known proxies used when connecting to your Jellyfin instance. This is required to make proper use of X-Forwarded-For headers. Requires a reboot after saving.",
+    "KnownProxiesHelp": "Comma separated list of IP addresses or hostnames of known proxies used when connecting to your Jellyfin instance. This is required to make proper use of X-Forwarded-For headers. Requires a reboot after saving.",
     "Other": "Other",
     "EnableQuickConnect": "Enable quick connect on this server",
     "ButtonUseQuickConnect": "Use Quick Connect",

src/strings/th.json

@@ -99,5 +99,17 @@
     "ClearQueue": "ล้างคิว",
     "ButtonUninstall": "ถอนการติดตั้ง",
     "ButtonStart": "เริ่มเล่น",
-    "ButtonStop": "หยุด"
+    "ButtonStop": "หยุด",
+    "MusicVideos": "มิวสิควิดีโอ",
+    "ValueSpecialEpisodeName": "พิเศษ - {0}",
+    "Sync": "ซิงค์",
+    "Songs": "เพลง",
+    "Shows": "รายการ",
+    "Photos": "รูปภาพ",
+    "Movies": "ภาพยนตร์",
+    "HeaderContinueWatching": "ดูต่อ",
+    "Genres": "ประเภท",
+    "MediaInfoChannels": "ช่อง",
+    "Channels": "ช่อง",
+    "LabelSelectAudioChannels": "ช่อง"
 }