From 3f075068a9cde4aef5512d6baf9a563f15abde3c Mon Sep 17 00:00:00 2001 From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com> Date: Mon, 20 Aug 2018 01:40:43 +0300 Subject: [PATCH 1/3] Update bundle_ru.properties (#196) --- core/assets/bundles/bundle_ru.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 1475485e06..04e1466047 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -244,7 +244,7 @@ text.editor=Редактор text.mapeditor=Редактор карт text.donate=Донат text.settings.reset=Сбросить по умолчанию -text.settings.rebind=Переназначить +text.settings.rebind=Смена text.settings.controls=Управление text.settings.game=Игра text.settings.sound=Звук @@ -338,6 +338,9 @@ setting.mutemusic.name=Заглушить музыку setting.sfxvol.name=Громкость звуковых эффектов setting.mutesound.name=Заглушить звук text.keybind.title=Переназначение клавиш +category.general.name=Основное +category.view.name=Просмотр +category.multiplayer.name=Мультиплеер keybind.move_x.name=Движение по x keybind.move_y.name=Движение по y keybind.select.name=Выбор @@ -542,6 +545,3 @@ unit.monsoon.name=Муссон unit.monsoon.description=Тяжелый ковровый бомбардировщик. Использует взрывоопасное соединение или пиратит в качестве боеприпасов. unit.interceptor.name=Истребитель-перехватчик unit.interceptor.description=Быстрая и ударная боевая единица, которая использует набег с отскоком. -category.general.name=General -category.view.name=View -category.multiplayer.name=Multiplayer From 0288daa39d12c0b4064dbbe5317f750ce6b39f78 Mon Sep 17 00:00:00 2001 From: Leone25 <39310565+Leone25@users.noreply.github.com> Date: Mon, 20 Aug 2018 00:40:53 +0200 Subject: [PATCH 2/3] Update bundle_ita.properties (#195) --- core/assets/bundles/bundle_ita.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/assets/bundles/bundle_ita.properties b/core/assets/bundles/bundle_ita.properties index 6be7b5ed97..a9933789f7 100644 --- a/core/assets/bundles/bundle_ita.properties +++ b/core/assets/bundles/bundle_ita.properties @@ -536,12 +536,12 @@ block.blackrock.name=roccia nera block.icerock.name=roccia di ghiaccio unit.dagger.name=Pericolo unit.dagger.description=Un unità terrena base, molto più efficiente se in branco. -category.general.name=General -category.view.name=View -category.multiplayer.name=Multiplayer -keybind.toggle_menus.name=Toggle menus -keybind.chat_history_prev.name=Chat history prev -keybind.chat_history_next.name=Chat history next -keybind.chat_scroll.name=Chat scroll -keybind.drop_unit.name=drop unit -keybind.zoom_minimap.name=Zoom minimap +category.general.name=Generale +category.view.name=Visualizzazione +category.multiplayer.name=Multigiocatore +keybind.toggle_menus.name=Abilita menù +keybind.chat_history_prev.name=Scorri chat vero l'alto +keybind.chat_history_next.name=Scorri chatt verso il basso +keybind.chat_scroll.name=Scorri chat +keybind.drop_unit.name=droppa materiali +keybind.zoom_minimap.name=Zomma minimappa From 467047a0119fea2845819fff69def4a99641e855 Mon Sep 17 00:00:00 2001 From: iczero Date: Sun, 19 Aug 2018 19:46:41 -0700 Subject: [PATCH 3/3] Fix typo (#197) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee7e800b58..f73a12c3c7 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ _Building:_ `./gradlew desktop:dist` --- Gradle may take up to several minutes to download files. Be patient.
-After building, the output .JAR file should be in the output JAR file should be in `/desktop/build/libs/desktop-release.jar.` +After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar.` ### Downloads