Merge branch 'master' into release-10.2.z

2019-02-17 13:10:55 -05:00
parent f7e5946c79 29e100c476
commit 058b3c8ab0
14 changed files with 11 additions and 30 deletions
@@ -2258,4 +2258,4 @@
    "PlaybackSettings": "Параметры воспроизведения",
    "SubtitleSettings": "Параметры субтитров",
    "OptionResElement": "res-элемент"
-}
+}