Merge branch 'master' into master

2019-12-06 18:20:05 +03:00
parent 7f3f27a91e ef24e5ecad
commit 044dac6a9e
76 changed files with 3949 additions and 2122 deletions
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -592,6 +592,8 @@ unit.persecond = /сек
 unit.timesspeed = x скорость
 unit.percent = %
 unit.items = предметов
+unit.thousands = тыс
+unit.millions = мил
 category.general = Основные
 category.power = Энергия
 category.liquids = Жидкости