mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 06:51:30 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2020-05-07 21:37:54 -04:00
commit 372b1311f7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/assets/bundles/bundle_ja.properties
View file

@ -663,7 +663,7 @@ setting.effects.name = 画面効果
setting.destroyedblocks.name = 破壊されたブロックを表示
setting.blockstatus.name = ブロックの状態を表示
setting.conveyorpathfinding.name = コンベアー配置経路探索
setting.coreselect.name = 回路図コアを許可
setting.coreselect.name = 設計図にコアを表示
setting.sensitivity.name = 操作感度
setting.saveinterval.name = 自動保存間隔
setting.seconds = {0} 秒

2
core/assets/bundles/bundle_ru.properties
View file

@ -637,7 +637,7 @@ setting.shadows.name = Тени
setting.blockreplace.name = Автоматическая замена блоков
setting.linear.name = Линейная фильтрация
setting.hints.name = Подсказки
setting.flow.name = Показывать оценку потока ресурсов[scarlet] (экспериментально)
setting.flow.name = Показывать оценку потока ресурсов
setting.buildautopause.name = Автоматическая приостановка строительства
setting.animatedwater.name = Анимированная вода
setting.animatedshields.name = Анимированные щиты