diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f49ffc9852..622c2fbc97 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -650,7 +650,7 @@ setting.touchscreen.name = Touchscreen Controls setting.fpscap.name = Max FPS setting.fpscap.none = None setting.fpscap.text = {0} FPS -setting.uiscale.name = UI Scaling[lightgray] (require restart)[] +setting.uiscale.name = UI Scaling[lightgray] (restart required)[] setting.swapdiagonal.name = Always Diagonal Placement setting.difficulty.training = Training setting.difficulty.easy = Easy @@ -670,7 +670,7 @@ setting.seconds = {0} seconds setting.blockselecttimeout.name = Block Select Timeout setting.milliseconds = {0} milliseconds setting.fullscreen.name = Fullscreen -setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart) +setting.borderlesswindow.name = Borderless Window[lightgray] (restart may be required) setting.fps.name = Show FPS & Ping setting.blockselectkeys.name = Show Block Select Keys setting.vsync.name = VSync diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 59f9e576d8..cb78be37b8 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -678,6 +678,7 @@ setting.pixelate.name = ピクセル化[lightgray] (アニメーションが無 setting.minimap.name = ミニマップを表示 setting.position.name = プレイヤーの位置表示 setting.musicvol.name = 音楽 音量 +setting.atmosphere.name = 惑星の雰囲気を表示 setting.ambientvol.name = 環境音 音量 setting.mutemusic.name = 音楽をミュート setting.sfxvol.name = 効果音 音量 @@ -1233,3 +1234,4 @@ block.crawler-factory.description = 高速の自爆型ユニットを製造し block.titan-factory.description = 高度な武装地上ユニットを製造します。 block.fortress-factory.description = 地上重砲ユニットを製造します。 block.repair-point.description = 近くの負傷したユニットを修復します。 + diff --git a/tests/build.gradle b/tests/build.gradle index 14b7dccb41..b501c8de32 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -2,10 +2,4 @@ apply plugin: "java" sourceCompatibility = 1.8 -sourceSets{ - test{ - resources{ - srcDir "src/test/resources" - } - } -} +sourceSets.test.resources.srcDir = "src/test/resources"