more bugfixes

Update bundle_ko.properties (#439 )
* Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * match orignal bundle * Update bundle_ko.properties * Update bundle_ko.properties
2019-04-04 22:05:12 -04:00 · 2019-04-04 19:59:09 -06:00 · 2019-04-04 19:58:05 -06:00 · 2019-04-04 19:53:34 -06:00 · 2019-04-04 19:53:02 -06:00 · 2019-04-04 19:52:09 -06:00
12 changed files with 537 additions and 494 deletions
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -46,7 +46,7 @@ task deploy(type: Copy){
    from "build/outputs/apk/release/android-release.apk"
    into "../deploy/"
-    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename ("android-release.apk", appName + "-android-" + getVersionString() + ".apk")
 }
 android {
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -1,44 +1,44 @@
 credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[GRAY](In case you can't tell, this text is currently unfinished.\nTranslators, don't edit it yet!)
 credits = Crédits
-contributors = Translators and Contributors
+contributors = Traducteurs et contributeurs
 discord = Rejoignez le discord de Mindustry
-link.discord.description = Le discord officiel de mindustry
+link.discord.description = Le discord officiel de Mindustry!
-link.github.description = Code source du jeu
+link.github.description = Code source du jeu.
-link.dev-builds.description = Versions instables du jeu
+link.dev-builds.description = Versions instables du jeu.
 link.trello.description = Trello officiel pour les futurs ajouts .
 link.itch.io.description = Page itch.io avec le lien du téléchargement pour PC et la version web .
-link.google-play.description = Listing par le Google Play Store
+link.google-play.description = Accès à la version android du Google Play Store.
 link.wiki.description = Wiki officiel de mindustry .
 linkfail = Erreur lors de l'ouverture du lien !\nL'URL a été copié avec succès.
-screenshot = Screenshot saved to {0}
+screenshot = Capture d'écran sauvegardée à {0}
 gameover = Partie terminée.
 gameover.pvp = L'équipe [accent] {0}[] a gagnée !
 highscore = [YELLOW]Nouveau meilleur score!
-stat.wave = Waves Defeated:[accent] {0}
+stat.wave = Vagues vaincues:[accent] {0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
+stat.enemiesDestroyed = Ennemies détruits:[accent] {0}
-stat.built = Buildings Built:[accent] {0}
+stat.built = Bâtiments construits:[accent] {0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
+stat.destroyed = Bâtiments détruits:[accent] {0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
+stat.deconstructed = Bâtiments déconstruits:[accent] {0}
-stat.delivered = Resources Launched:
+stat.delivered = Ressources transférées:
-stat.rank = Final Rank: [accent]{0}
+stat.rank = Rang Final: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
+placeline = Tu as sélectionné un bloc.\nTu peux les[accent] placer en rangée[] en[accent] maintenant ton doigt sur l'écran pendant quelques secondes[] et en le glissant vers n'importe qu'elle direction.\nEssaye!
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
+removearea = Tu as sélectionné le mode de suppression.\nTu peux[accent] supprimer les blocs en rectangle[] en[accent] maintenant ton doigt sur l'écran pendant quelques secondes[] et en le glissant.\nEssaye!
-launcheditems = [accent]Launched Items
+launcheditems = [accent]ressources transférées
 map.delete = Êtes-vous sûr de supprimer cette carte"[accent]{0}[]"?
 level.highscore = Meilleur score: [accent]{0}
 level.select = Sélection de niveau
 level.mode = Mode de jeu :
 showagain = Ne pas montrer la prochaine fois
 coreattack = [scarlet]<La base est sous les feux ennemis>
-nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
+nearpoint = [[ [scarlet]QUITTEZ LE POINT D'APPARITION ENNEMI IMMÉDIATEMENT[] ]\nannihilation imminente
-outofbounds = [[ OUT OF BOUNDS ]\n[]self-destruct in {0}
+outofbounds = [[ HORS LIMITES ]\n[]auto-destruction dans {0}
-database = Core Database
+database = Base de données
 savegame = Sauvegarder la partie
 loadgame = Charger la partie
 joingame = Rejoindre une partie
 addplayers = Ajouter/Enlever des joueurs
-customgame = Partie personnalisée
+customgame = Partie customisée
-newgame = New Game
+newgame = Nouvelle partie
 none = <vide>
 minimap = Minimap
 close = Fermer
@@ -48,16 +48,16 @@ continue = Continuer
 maps.none = [LIGHT_GRAY]Aucune carte trouvée!
 about.button = À propos
 name = Nom:
-noname = Pick a[accent] player name[] first.
+noname = Commencer par choisir un[accent] nom de joueur[].
 filename = Nom du fichier:
 unlocked = Nouveau bloc débloqué!
-completed = [accent]Completed
+completed = [accent]Complété
-techtree = Tech Tree
+techtree = Arbre technologique
-research.list = [LIGHT_GRAY]Research:
+research.list = [LIGHT_GRAY]Recherche:
-research = Research
+research = Rechercher
-researched = [LIGHT_GRAY]{0} researched.
+researched = [LIGHT_GRAY]{0} recherché(e).
 players = {0} joueurs en ligne
-players.single = {0} joueur en ligne
+players.single = {0} joueurs en ligne
 server.closing = [accent]Fermeture du serveur...
 server.kicked.kick = Vous avez été expulsé du serveur!
 server.kicked.serverClose = Serveur fermé.
@@ -149,7 +149,7 @@ save.wave = Vague {0}
 save.difficulty = Difficulté: {0}
 save.date = Dernière sauvegarde: {0}
 save.playtime = Temps de jeu: {0}
-warning = Warning.
+warning = Avertissement.
 confirm = Confirmer
 delete = Supprimer
 ok = OK
@@ -192,32 +192,32 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos sur la carte
 editor.author = Auteur:
 editor.description = Description:
-editor.waves = Waves:
+editor.waves = Vagues:
-waves.title = Waves
+waves.title = Vagues
 waves.remove = Remove
-waves.never = <never>
+waves.never = <jamais>
-waves.every = every
+waves.every = tous les
-waves.waves = wave(s)
+waves.waves = vague(s)
-waves.perspawn = per spawn
+waves.perspawn = par apparition
-waves.to = to
+waves.to = à
 waves.boss = Boss
-waves.preview = Preview
+waves.preview = Prévisualiser
-waves.edit = Edit...
+waves.edit = Modifier...
-waves.copy = Copy to Clipboard
+waves.copy = Copier dans le Presse-papiers
-waves.load = Load from Clipboard
+waves.load = Coller depuis le Presse-papiers
-waves.invalid = Invalid waves in clipboard.
+waves.invalid = Vagues invalides dans le Presse-papiers.
-waves.copied = Waves copied.
+waves.copied = Vagues copiées
-editor.default = [LIGHT_GRAY]<Default>
+editor.default = [LIGHT_GRAY]<par défaut>
-edit = Edit...
+edit = Modifier...
 editor.name = Nom:
 editor.teams = Équipe
 editor.elevation = Élevation
-editor.errorload = Error loading file:\n[accent]{0}
+editor.errorload = Erreur lors du chargement du fichier:\n[accent]{0}
-editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorsave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
-editor.errorname = Map has no name defined.
+editor.errorname = La carte n'a pas de nom!
-editor.update = Update
+editor.update = Mettre à jour
-editor.randomize = Randomize
+editor.randomize = Randomiser
-editor.apply = Apply
+editor.apply = Appliquer
 editor.generate = Générer
 editor.resize = Redimensionner
 editor.loadmap = Charger une carte
@@ -246,26 +246,26 @@ editor.mapname = Nom de la carte²:
 editor.overwrite = [accent]Attention !\nCeci réécrit une carte existante .
 editor.overwrite.confirm = [scarlet]Attention ![] Une carte avec ce nom existe déjà. Êtes-vous sûr de vouloir la réécrire?
 editor.selectmap = Séléctionnez une carte:
-filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
+filters.empty = [LIGHT_GRAY]Aucun filtre! Ajoutez-en un avec les boutons ci-dessous.
-filter.distort = Distort
+filter.distort = Déformation
-filter.noise = Noise
+filter.noise = Bruit
-filter.ore = Ore
+filter.ore = Minerai
-filter.rivernoise = River Noise
+filter.rivernoise = Bruit des rivières
-filter.scatter = Scatter
+filter.scatter = Dispersement
 filter.terrain = Terrain
-filter.option.scale = Scale
+filter.option.scale = Gamme
 filter.option.chance = Chance
 filter.option.mag = Magnitude
-filter.option.threshold = Threshold
+filter.option.threshold = Seuil
-filter.option.circle-scale = Circle Scale
+filter.option.circle-scale = Gamme du cercle
 filter.option.octaves = Octaves
-filter.option.falloff = Falloff
+filter.option.falloff = Diminution
-filter.option.block = Block
+filter.option.block = Bloc
-filter.option.floor = Floor
+filter.option.floor = Sol
-filter.option.wall = Wall
+filter.option.wall = Mur
-filter.option.ore = Ore
+filter.option.ore = Minerai
-filter.option.floor2 = Secondary Floor
+filter.option.floor2 = Sol secondaire
-filter.option.threshold2 = Secondary Threshold
+filter.option.threshold2 = Seuil secondaire
 width = Largeur:
 height = Hauteur:
 menu = Menu
@@ -282,49 +282,49 @@ editor = Éditeur
 mapeditor = Éditeur de carte
 donate = Faire un\ndon
 abandon = Abandon
-abandon.text = This zone and all its resources will be lost to the enemy.
+abandon.text = Cette zone et tous ses ressources vont être perdues.
-locked = Locked
+locked = Verrouillé
-complete = [LIGHT_GRAY]Complete:
+complete = [LIGHT_GRAY]Compléter:
-zone.requirement = Wave {0} in zone {1}
+zone.requirement = Vague {0} dans la zone {1}
-resume = Resume Zone:\n[LIGHT_GRAY]{0}
+resume = Reprendre la partie en cours:\n[LIGHT_GRAY]{0}
-bestwave = [LIGHT_GRAY]Best: {0}
+bestwave = [LIGHT_GRAY]Meilleur: {0}
-launch = Launch
+launch = Lancement
-launch.title = Launch Successful
+launch.title = Lancement réussi
-launch.next = [LIGHT_GRAY]next opportunity at wave {0}
+launch.next = [LIGHT_GRAY] Prochaine opportunité à la vague {0}
-launch.unable = [scarlet]Unable to LAUNCH.[] Enemies.
+launch.unable = [scarlet]Impossible d'effectuer le lancement.[] Ennemis.
-launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base.
+launch.confirm = Cela va transférer tous tes ressources dans votre coeur.\nTu ne vas pas pouvoir retourner à cette base.
-uncover = Uncover
+uncover = Découvrir
-configure = Configure Loadout
+configure = Configurer le transfert des ressources.
-configure.locked = [LIGHT_GRAY]Reach wave {0}\nto configure loadout.
+configure.locked = [LIGHT_GRAY]Atteigner la vague {0}\npour configurer le transfert des ressources
-zone.unlocked = [LIGHT_GRAY]{0} unlocked.
+zone.unlocked = [LIGHT_GRAY]{0} Débloquée.
-zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
+zone.requirement.complete = Vague {0} atteinte:\n{1} Exigences de la zone complétées
-zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
+zone.config.complete = Vague {0} atteinte:\nConfiguration du transfert débloquée.
-zone.resources = Resources Detected:
+zone.resources = Ressources détectées:
-add = Add...
+add = Ajouter...
-boss.health = Boss Health
+boss.health = Vie du BOSS
 connectfail = [crimson]Échec de la connexion au serveur : [accent]{0}
-error.unreachable = Server injoignable.
+error.unreachable = Serveur injoignable.
 error.invalidaddress = Adresse invalide.
 error.timedout = Délai de connexion dépassé!\nAssurez-vous que l'hôte a autorisé l'accès au port, et que l'adresse soit correcte!
 error.mismatch = Erreur de paquet:\nPossible différence de verison entre le client et le serveur .\nVérifiez que vous et l'hôte avez la plus récente version de Mindustry !
 error.alreadyconnected = Déjà connecté.
 error.mapnotfound = Fichier de la carte introuvable!
-error.io = Network I/O error.
+error.io = Erreur de Réseau (I/O)
 error.any = Erreur réseau inconnue.
-zone.groundZero.name = Ground Zero
+zone.groundZero.name = Première Bataille
-zone.craters.name = The Craters
+zone.craters.name = Les Cratères
-zone.frozenForest.name = Frozen Forest
+zone.frozenForest.name = Forêt Glaciale
-zone.ruinousShores.name = Ruinous Shores
+zone.ruinousShores.name = Rives en Ruine
-zone.stainedMountains.name = Stained Mountains
+zone.stainedMountains.name = Montagnes Tâchetées
-zone.desolateRift.name = Desolate Rift
+zone.desolateRift.name = Fissure abandonnée
-zone.nuclearComplex.name = Nuclear Production Complex
+zone.nuclearComplex.name = Complexe nucléaire
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
 settings.controls = Contrôles
 settings.game = Jeu
 settings.sound = Son
-settings.graphics = Graphiques
+settings.graphics = Graphismes
 settings.cleardata = Effacer les données du jeu...
 settings.clear.confirm = Êtes-vous sûr d'effacer ces données ?\nCe qui est fait ne peut être défait !
 settings.clearall.confirm = [scarlet]ATTENTION![]\nCet action effacera toutes les données , incluant les sauvegarges, les cartes, les déblocages et la configuration des touches.\nUne fois que vous aurez pressé 'ok' le jeu effacera toutes les données et se fermera.
@@ -336,16 +336,19 @@ no = Non
 info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
-blocks.input = Input
+bar.drillspeed = Vitesse de forage: {0}/s
-blocks.output = Output
+bar.efficiency = Efficacité: {0}%
 blocks.booster = Booster
 block.unknown = [LIGHT_GRAY]???
-blocks.powercapacity = capacité d'énergie
+blocks.blockinfo = Info sur le bloc
 bar.powerbalance = Énergie: {0}
 bar.poweroutput = Énergie en sortie: {0}
 blocks.powercapacity = Capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
-blocks.targetsground = Targets Ground
+blocks.targetsground = Cible les unités terrestres
-blocks.itemsmoved = Move Speed
+bar.items = Objets: {0}
-blocks.launchtime = Time Between Launches
+blocks.itemsmoved = Vitesse de Déplacement
 blocks.launchtime = Temps entre chaque lancement
 blocks.shootrange = Portée
 blocks.size = Taille
 blocks.liquidcapacity = Capacité en liquide
@@ -353,42 +356,54 @@ blocks.powerrange = Distance de transmission
 blocks.poweruse = Énergie utilisée
 blocks.powerdamage = Énergie/Dégâts
 blocks.itemcapacity = Stockage
-blocks.basepowergeneration = Generation d'énergie minimale
+blocks.basepowergeneration = Génération d'énergie minimale
-blocks.productiontime = Production Time
+blocks.powertransferspeed = Vitesse de transfert d'énergie
-blocks.repairtime = Block Full Repair Time
+blocks.craftspeed = Vitesse de production
-blocks.speedincrease = Speed Increase
+blocks.repairtime = Temps pour la Réparation Totale du Bloc
-blocks.range = Range
+blocks.range = Portée
 blocks.inputliquid = Liquide requis
 blocks.inputliquidaux = Liquide optionnel
 blocks.inputitem = Objets en entrée
 blocks.inputitems = Objets utilisés
 blocks.outputitem = Objet produit
 blocks.drilltier = Forable
 blocks.drillspeed = Vitesse de forage de base
-blocks.boosteffect = Boost Effect
+blocks.maxunits = Nombre d'unité actives maximal
-blocks.maxunits = Max Active Units
+blocks.liquidoutput = Liquide en sortie
 blocks.liquidoutputspeed = Vitesse de production de liquide
 blocks.liquiduse = Quantité de liquide utilisée
 blocks.coolant = Liquide de refroidissement
 bar.liquid = Liquide
 blocks.coolantuse = Quantité de liquide de refroidissement utilisée
 blocks.inputliquidfuel = Carburant liquide
 blocks.liquidfueluse = Quantité de carburant liquide utilisé
 blocks.boostitem = Objets boosters
 blocks.boostliquid = Liquides boosters
 blocks.health = Santé
 bar.heat = Chaleur
 bar.power = Énergie
 bar.progress = Progression de la construction
 bar.spawned = Unités: {0}/{1}
 blocks.power.satisfaction = Énergie minimum nécessaire
 blocks.inaccuracy = Précision
 blocks.shots = Tir
 blocks.reload = Tirs/Seconde
-blocks.ammo = Ammo
+blocks.inputfuel = Carburant
-bar.drillspeed = Drill Speed: {0}/s
+blocks.fuelburntime = Durée du carburant
-bar.efficiency = Efficiency: {0}%
+blocks.inputcapacity = Capacité d'entrée
-bar.powerbalance = Power: {0}
+blocks.outputcapacity = Capacité de production
-bar.poweramount = Power: {0}
+blocks.ammo = Munitions
 bar.poweroutput = Power Output: {0}
 bar.items = Items: {0}
 bar.liquid = Liquid
 bar.heat = Heat
 bar.power = Power
 bar.progress = Build Progress
 bar.spawned = Units: {0}/{1}
 bullet.damage = [stat]{0}[lightgray] dmg
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.splashdamage = [stat]{0}[lightgray] dmg de zone ~[stat] {1}[lightgray] tuiles
-bullet.incendiary = [stat]incendiary
+bullet.incendiary = [stat]incendiaire
-bullet.homing = [stat]homing
+bullet.homing = [stat]autoguidage
-bullet.shock = [stat]shock
+bullet.shock = [stat]choc
 bullet.frag = [stat]frag
-bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.knockback = [stat]{0}[lightgray] recul
-bullet.freezing = [stat]freezing
+bullet.freezing = [stat]gel
 bullet.tarred = [stat]tarred
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray]x multiplicateur de munitions
-bullet.reload = [stat]{0}[lightgray]x reload
+bullet.reload = [stat]{0}[lightgray]x rechargement
 unit.blocks = blocs
 unit.powersecond = Énergie/seconde
 unit.liquidsecond = Liquides/seconde
@@ -407,23 +422,22 @@ category.liquids = Liquides
 category.items = Objets
 category.crafting = Fabrication
 category.shooting = Défense
-category.optional = Optional Enhancements
+category.optional = Améliorations optionnelles
-setting.landscape.name = Lock Landscape
+setting.landscape.name = Verrouiller la rotation en mode paysage
-setting.shadows.name = Shadows
+setting.shadows.name = Ombres
-setting.animatedwater.name = Animated Water
+setting.animatedwater.name = Eau animée
-setting.animatedshields.name = Animated Shields
+setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'appareil)[]
-setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
+setting.indicators.name = Indicateurs pour les alliés
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Visée automatique
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
 setting.fpscap.text = {0} FPS
-setting.swapdiagonal.name = Always Diagonal Placement
+setting.swapdiagonal.name = Autoriser le placement des blocs en diagonal
 setting.difficulty.training = entraînement
-setting.difficulty.easy = facile
+setting.difficulty.easy = Facile
-setting.difficulty.normal = normal
+setting.difficulty.normal = Normal
-setting.difficulty.hard = difficile
+setting.difficulty.hard = Difficile
-setting.difficulty.insane = Extreme
+setting.difficulty.insane = Extrème
 setting.difficulty.name = Difficulté:
 setting.screenshake.name = Tremblement de l'écran
 setting.effects.name = Montrer les effets
@@ -431,38 +445,37 @@ setting.sensitivity.name = Sensibilité de la manette
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} secondes
 setting.fullscreen.name = Plein écran
-setting.borderless.name = Borderless Window
+setting.borderless.name = Fenêtre sans contour
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
 setting.lasers.name = Afficher les rayons des lasers
-setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
+setting.minimap.name = Montrer la minimap
-setting.minimap.name = montrer la minimap
+setting.musicvol.name = Volume de la musique
 setting.musicvol.name = volume de la musique
 setting.mutemusic.name = Couper la musique
 setting.sfxvol.name = Volume des SFX
 setting.mutesound.name = Couper les SFX
-setting.crashreport.name = Send Anonymous Crash Reports
+setting.crashreport.name = Envoyer un rapport de crash anonyme
 keybind.title = Paramétrer les touches
-category.general.name = General
+category.general.name = Général
 category.view.name = Voir
 category.multiplayer.name = Multijoueur
 command.attack = Attaque
 command.retreat = Retraite
 command.patrol = Patrouille
-keybind.gridMode.name = Block Select
+keybind.gridMode.name = Sélection des blocs
-keybind.gridModeShift.name = Category Select
+keybind.gridModeShift.name = Sélection des catégories
 keybind.press = Appuyer sur une touche...
 keybind.press.axis = Appuyer sur un axe ou une touche...
-keybind.screenshot.name = Map Screenshot
+keybind.screenshot.name = Capture d'écran
 keybind.move_x.name = mouvement x
 keybind.move_y.name = mouvement y
 keybind.select.name = sélectionner
-keybind.diagonal_placement.name = Diagonal Placement
+keybind.diagonal_placement.name = Placement en diagonal
-keybind.pick.name = Pick Block
+keybind.pick.name = Choisir un bloc
-keybind.break_block.name = Break Block
+keybind.break_block.name = Suppprimer un bloc
-keybind.deselect.name = Déselectionner
+keybind.deselect.name = Désélectionner
 keybind.shoot.name = tirer
-keybind.zoom_hold.name = tenir le zoom
+keybind.zoom_hold.name = maintenir le zoom
 keybind.zoom.name = zoom
 keybind.menu.name = menu
 keybind.pause.name = Pause
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -14,24 +14,27 @@ screenshot = 화면 캡쳐가 {0} 경로에 저장되었습니다.
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
 stat.wave = 웨이브 성공:[accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
 stat.built = 건설한 건물 수:[accent]{0}
 stat.destroyed = 파괴된 건물 수:[accent]{0}
-stat.deconstructed = 해체한 건물 수:[accent]{0}
+stat.deconstructed = 파괴한 건물 수:[accent]{0}
 stat.delivered = 획득한 자원:
 stat.rank = 최종 기록: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
+
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
+placeline = 블록을 선택하셨습니다.\n][accent]몇초간 설치 시작지점을 누르고[] 원하는 방향을 향해 드래그 하면 [accent]일렬로[] 설치할 수 있습니다.\n한번 해 보세요.
-launcheditems = [accent]Launched Items
+removearea = 블록 제거모드를 선택하셨습니다.\n[accent]몇초간 제거 시작지점을 누르고[] 원하는 구역 끝을 향해 드래그 하면 [accent]직사각형[] 안에 있는 모든 건물을 제거할 수 있습니다.\n한번 해 보세요.
 launcheditems = [accent]출격 아이템
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?\n
 level.highscore = 최고 점수: [accent]{0}
 level.select = 맵 선택
 level.mode = 게임 모드 :
 showagain = 다음 세션에서 이 메세지를 표시하지 않습니다
 coreattack = < 코어가 공격받고 있습니다! >
-nearpoint = [[ [scarlet]드롭 지점에서 나가세요[] ]\n모든 유닛 및 건물 파괴 임박
+nearpoint = [[ [scarlet]드롭 지점에서 나가세요[] ]\n적 스폰시 건물 및 유닛 파괴
-outofbounds = [[ 출입 금지 구역 ]\n[]{0}초후 건물이 해체됩니다.
+outofbounds = [[ 출입 금지 구역 ]\n[]{0}초후 유닛이 파괴됩니다.
 database = 코어 데이터베이스
 savegame = 게임 저장
 loadgame = 게임 불러오기
@@ -40,7 +43,7 @@ addplayers = 플레이어 추가/제거
 customgame = 커스텀 게임
 newgame = 새 게임
 none = <없음>
-minimap = Minimap
+minimap = 미니맵
 close = 닫기
 quit = 나가기
 maps = 맵
@@ -281,11 +284,12 @@ tutorial = 게임 방법
 editor = 편집기
 mapeditor = 맵 편집기
 donate = 기부
-abandon = 버리기
+
 abandon = 포기
 abandon.text = 이 구역과 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
 complete = [LIGHT_GRAY]완료:
-zone.requirement = Wave {0} in zone {1}
+zone.requirement = 지역 {1} 에서 웨이브 {0} 달성
 resume = 지역 계속 플레이:\n[LIGHT_GRAY]{0}
 bestwave = [LIGHT_GRAY]최고 점수: {0}
 launch = < 출격 >
@@ -297,11 +301,12 @@ uncover = 털어넣기
 configure = 로드아웃 설정
 configure.locked = {0} 단계에서 로드아웃을 설정할 수 있음.
 zone.unlocked = [LIGHT_GRAY] 잠금 해제됨.
-zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
+zone.requirement.complete = 웨이브 {0} 달성:\n{1} 지역 요구사항이 충족됨.
 zone.config.complete = 웨이브 {0} 달성:\n로드아웃 설정 잠금 해제됨.
 zone.resources = 자원 감지됨:
 add = 추가...
 boss.health = 보스 체력
 connectfail = [crimson]{0}[accent] 서버에 연결하지 못했습니다.[]
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -311,6 +316,7 @@ error.alreadyconnected = 이미 접속중입니다.
 error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
 zone.groundZero.name = 그라운드 제로
 zone.craters.name = 분화구
 zone.frozenForest.name = 얼어붙은 숲
@@ -318,6 +324,7 @@ zone.ruinousShores.name = 파멸의 기슭
 zone.stainedMountains.name = 얼룩진 산맥
 zone.desolateRift.name = 황량한 강
 zone.nuclearComplex.name = 핵 생산 단지
 settings.language = 언어
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
@@ -336,16 +343,16 @@ no = 아니오
 info.title = [accent]정보
 error.title = [crimson]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다.
-blocks.input = Input
+blocks.input = 입력
-blocks.output = Output
+blocks.output = 출력
-blocks.booster = Booster
+blocks.booster = 가속
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = 전력 용량
 blocks.powershot = 1발당 전력 소모량
 blocks.targetsair = 공중공격 가능
 blocks.targetsground = 지상공격 가능
 blocks.itemsmoved = 이동 속도
-blocks.launchtime = Time Between Launches
+blocks.launchtime = 출격 시간
 blocks.shootrange = 사거리
 blocks.size = 크기
 blocks.liquidcapacity = 액체 용량
@@ -353,31 +360,31 @@ blocks.powerrange = 전력 범위
 blocks.poweruse = 전력 사용
 blocks.powerdamage = 전력/데미지
 blocks.itemcapacity = 저장 용량
-blocks.basepowergeneration = 기지 전력 생성기
+blocks.basepowergeneration = 기본 전력 생성량
-blocks.productiontime = Production Time
+blocks.productiontime = 제작 시간
-blocks.repairtime = Block Full Repair Time
+blocks.repairtime = 전체 블록 수리시간
-blocks.speedincrease = Speed Increase
+blocks.speedincrease = 속도 증가
-blocks.range = Range
+blocks.range = 사거리
 blocks.drilltier = 드릴
 blocks.drillspeed = 기본 드릴 속도
-blocks.boosteffect = Boost Effect
+blocks.boosteffect = 가속 효과
 blocks.maxunits = 최대 활성유닛
 blocks.health = 체력
 blocks.inaccuracy = 오차각
 blocks.shots = 발포 횟수
 blocks.reload = 재장전
 blocks.ammo = 탄약
-bar.drillspeed = Drill Speed: {0}/s
+bar.outputspeed = 채광 속도: {0}/s
 bar.efficiency = 효율성: {0}%
-bar.powerbalance = 전력: {0}
+bar.powerbalance = 전력: {0}/s
 bar.poweramount = Power: {0}
 bar.poweroutput = 전력 출력: {0}
-bar.items = Items: {0}
+bar.items = 아이템: {0}
 bar.liquid = 액체
 bar.heat = 발열
 bar.power = 전력
 bar.progress = 건설 진행
 bar.spawned = 유닛: {0}/{1}
 bullet.damage = [stat]{0}[lightgray] 데미지
 bullet.splashdamage = [stat]{0}[lightgray] area 데미지 ~[stat] {1}[lightgray] 타일
 bullet.incendiary = [stat]방화
@@ -389,6 +396,7 @@ bullet.freezing = [stat]동결
 bullet.tarred = [stat]타르
 bullet.multiplier = [stat]{0}[lightgray]x 탄약 배율
 bullet.reload = [stat]{0}[lightgray]x 사격 속도
 unit.blocks = 블록
 unit.powersecond = 전력/초
 unit.liquidsecond = 액체/초
@@ -397,8 +405,8 @@ unit.liquidunits = 액체
 unit.powerunits = 전력
 unit.degrees = 도
 unit.seconds = 초
-unit.persecond = /sec
+unit.persecond = /초
-unit.timesspeed = x speed
+unit.timesspeed = x 배
 unit.percent = %
 unit.items = 아이템
 category.general = 일반
@@ -411,8 +419,8 @@ category.optional = 보조 아이템
 setting.landscape.name = 가로화면으로 고정
 setting.shadows.name = 그림자
 setting.animatedwater.name = 움직이는 물
-setting.animatedshields.name = Animated Shields
+setting.animatedshields.name = 움직이는 보호막
-setting.antialias.name = 안티에일리어싱[LIGHT_GRAY] (재시작 필요)[]
+setting.antialias.name = 안티 에일리어싱[LIGHT_GRAY] (재시작 필요)[]
 setting.indicators.name = 아군/적 인디게이터 표시
 setting.autotarget.name = 자동 조준
 setting.fpscap.name = 최대 FPS
@@ -435,7 +443,7 @@ setting.borderless.name = 테두리 없는 창모드
 setting.fps.name = FPS 표시
 setting.vsync.name = VSync 활성화
 setting.lasers.name = 전력 노드 레이저 표시
-setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
+setting.pixelate.name = 픽셀화 [LIGHT_GRAY](게임 성능이 감소할 수 있습니다)
 setting.minimap.name = 미니맵 보기
 setting.musicvol.name = 음악 크기
 setting.mutemusic.name = 음소거
@@ -488,21 +496,23 @@ mode.pvp.name = PvP
 mode.pvp.description = 실제 플레이어와 PvP를 합니다.
 mode.attack.name = 공격
 mode.attack.description = 일정 시간마다 적이 오는 단계가 없으며, 적의 기지를 파괴하는 것을 목표로 합니다.
-mode.custom = Custom Rules
+mode.custom = 커스텀 규칙
 rules.infiniteresources = 무한 자원
 rules.wavetimer = 웨이브 타이머
 rules.waves = 웨이브
 rules.enemyCheat = 무한 AI 자원
 rules.pvp = PvP
 rules.unitdrops = 유닛 드롭
-rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.unitbuildspeedmultiplier = 유닛 생산속도 배수
-rules.unithealthmultiplier = Unit Health Multiplier
+rules.unithealthmultiplier = 유닛 체력 배수
-rules.playerdamagemultiplier = Player Damage Multiplier
+rules.playerdamagemultiplier = 플레이어 공격력 배수
 rules.enemycorebuildradius = 적 코어 건설 금지구역:[LIGHT_GRAY] (타일)
 rules.respawntime = 리스폰 시간:[LIGHT_GRAY] (초)
 rules.wavespacing = 웨이브 간격:[LIGHT_GRAY] (초)
 rules.buildcostmultiplier = 건설 소모 배율
 rules.buildspeedmultiplier = 건설 속도 배율
 content.item.name = 아이템
 content.liquid.name = 액체
 content.unit.name = 유닛
@@ -545,7 +555,7 @@ liquid.oil.name = 석유
 liquid.cryofluid.name = 냉각유체
 mech.alpha-mech.name = 알파
 mech.alpha-mech.weapon = 중무장 소총
-mech.alpha-mech.ability = 없음
+mech.alpha-mech.ability = 회복
 mech.alpha-mech.description = 표준 기체.\n적절한 속도와 공격력을 갖추고 있습니다.
 mech.delta-mech.name = 델타
 mech.delta-mech.weapon = 전격 생산기
@@ -580,13 +590,14 @@ unit.speed = [LIGHT_GRAY]속도: {0}
 mech.weapon = [LIGHT_GRAY]무기: {0}
 mech.health = [LIGHT_GRAY]체력: {0}
 mech.itemcapacity = [LIGHT_GRAY]아이템 수용 용량: {0}
-mech.minespeed = [LIGHT_GRAY]채광 속도: {0}
+mech.minespeed = [LIGHT_GRAY]채광 속도: {0}%
 mech.minepower = [LIGHT_GRAY]채광 레벨: {0}
 mech.ability = [LIGHT_GRAY]능력: {0}
-mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
+mech.buildspeed = [LIGHT_GRAY]건설 속도: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]발열 용량: {0}
 liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
 block.grass.name = 잔디
 block.salt.name = 소금
 block.sandrocks.name = 모래 바위
@@ -686,7 +697,7 @@ block.battery-large.name = 대형 배터리
 block.combustion-generator.name = 화력 발전기
 block.turbine-generator.name = 터빈 발전기
 block.differential-generator.name = 차동 발전기
-block.impact-reactor.name = 충격 반응기
+block.impact-reactor.name = 핵융합로
 block.mechanical-drill.name = 기계 드릴
 block.pneumatic-drill.name = 강철 드릴
 block.laser-drill.name = 레이저 드릴
@@ -743,7 +754,7 @@ block.blast-drill.name = 압축 공기분사 드릴
 block.thermal-pump.name = 화력 펌프
 block.thermal-generator.name = 열발전기
 block.alloy-smelter.name = 서지 합금 제련소
-block.mender.name = Mender
+block.mender.name = 멘더
 block.mend-projector.name = 수리 프로젝터
 block.surge-wall.name = 서지 합금벽
 block.surge-wall-large.name = 큰 서지 합금벽
@@ -759,7 +770,7 @@ block.meltdown.name = 멜트다운
 block.container.name = 컨테이너
 block.launch-pad.name = 발사대
 block.launch-pad.description = 출격할 필요 없이 아이템을 수송시킵시다. 미완성.
-block.launch-pad-large.name = Large Launch Pad
+block.launch-pad-large.name = 큰 출격 패드
 team.blue.name = 블루팀
 team.red.name = 레드팀
 team.orange.name = 오렌지팀
@@ -844,7 +855,7 @@ block.silicon-smelter.description = 고순도 석탄으로 모래를 줄여 실
 block.plastanium-compressor.description = 석유와 티타늄으로 플라스타늄을 생산합니다.
 block.phase-weaver.description = 방사능 토륨과 많은 량의 모래에서 상직물을 생산합니다.
 block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리로부터 서지 합금을 생산합니다.
-block.pulverizer.description = 모래로 돌을 부숩니다. 천연 모래가 부족할 때 유용합니다.
+block.pulverizer.description = 모래로 을 부숩니다. 천연 모래가 부족할 때 유용합니다.
 block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 피라타이트로 만듭니다.
 block.blast-mixer.description = 기름을 사용하여 피라타이트를 인화성은 떨어지지만 폭발성은 높은 폭발성 화합물로 변환시킵니다.
 block.cryofluidmixer.description = 물과 티타늄을 냉각에 훨씬 더 효과적인 냉동액으로 결합시킵니다.
@@ -864,7 +875,7 @@ block.solar-panel-large.description = 일반 태양 전지판보다 훨씬 나
 block.thorium-reactor.description = 고방사능 토륨으로부터 막대한 양의 전력을 발생시킵니다. 지속적인 냉각이 필요하며 냉각제의 양이 부족하면 크게 폭발합니다. 전력 출력은 최대 용량에서 기본 전력을 발생시키는 완전성에 따라 결정됩니다.
 block.rtg-generator.description = 냉각은 필요 없지만 토륨 원자로에 비해 전력을 적게 공급하는 방사성 동위원소 열전 발생기.
 block.unloader.description = 컨테이너, 금고 또는 코어에서 인접한 블록으로 아이템을 출하합니다. 출하시킬 아이템의 종류는 언로더를 눌러 지정할 수 있습니다.
-block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY언로더[]를 사용하여 컨테이너에서 물건을 회수할 수 있습니다.
+block.container.description = 각종 소량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 컨테이너에서 물건을 회수할 수 있습니다.
 block.vault.description = 각종 대량의 자원을 저장할 수 있습니다.[LIGHT_GRAY]언로더[]를 사용하여 금고에서 물건을 회수할 수 있습니다.
 block.mechanical-drill.description = 싸구려 드릴. 적절한 타일 위에 놓였을때 매우 느린 속도로 계속 출력합니다.
 block.pneumatic-drill.description = 기압을 이용하여 보다 빠르고 단단한 물질을 채광할 수 있는 향상된 드릴.
@@ -885,6 +896,7 @@ block.wraith-factory.description = 빠른 뺑소니 요격기 유닛을 생산
 block.ghoul-factory.description = 중탄두 폭격기를 생산합니다.
 block.dagger-factory.description = 기본 지상 유닛을 생산합니다.
 block.titan-factory.description = 첨단 장갑 지상부대를 생산합니다.
 block.fortress-factory.description = 중대포 지상부대를 생산합니다.
 block.revenant-factory.description = 중량의 레이저 포대를 가진 공중부대를 생산합니다.
 block.repair-point.description = 주변에서 가장 가까운 손상된 유닛을 지속적으로 치료합니다.
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -183,7 +183,7 @@ map.delete.confirm = Вы действительно хотите удалить
 map.random = [accent]Случайная карта
 map.nospawn = Эта карта не имеет ядер, в которых игрок может появиться! Добавьте[ROYAL] синее[] ядро на эту карту в редакторе карт.
 map.nospawn.pvp = У этой карты нет вражеских ядер, в которых игрок может появиться! Добавьте[SCARLET] красные[] ядра к этой карте в редакторе.
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = У этой карты нету вражеских ядер! Добавьте [scarlet] красные[] ядра в эту карте в редакторе.
 map.invalid = Ошибка загрузки карты: повреждённый или недопустимый файл карты.
 editor.brush = Кисть
 editor.openin = Открыть в редакторе
@@ -336,16 +336,16 @@ no = Нет
 info.title = Информация
 error.title = [crimson]Произошла ошибка
 error.crashtitle = Произошла ошибка
-blocks.input = Input
+blocks.input = Вход
-blocks.output = Output
+blocks.output = Выход
-blocks.booster = Booster
+blocks.booster = Ускоритель
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Вместимость энергии
 blocks.powershot = Энергия/выстрел
 blocks.targetsair = Воздушные цели
 blocks.targetsground = Наземные цели
 blocks.itemsmoved = Скорость перемещения
-blocks.launchtime = Time Between Launches
+blocks.launchtime = Интервал запусков
 blocks.shootrange = Радиус действия
 blocks.size = Размер
 blocks.liquidcapacity = Вместимость жидкости
@@ -354,41 +354,43 @@ blocks.poweruse = Потребляет энергии
 blocks.powerdamage = Энергия/урон
 blocks.itemcapacity = Вместимость предметов
 blocks.basepowergeneration = Базовая генерация энергии
-blocks.productiontime = Production Time
+blocks.productiontime = Время производства
-blocks.repairtime = Block Full Repair Time
+blocks.craftspeed = Скорость производства
-blocks.speedincrease = Speed Increase
+blocks.repairtime = Время полной регенерации
-blocks.range = Range
+blocks.speedincrease = Увеличение скорости
 blocks.range = Радиус действия
 blocks.inputliquid = Прием жидкости
 blocks.drilltier = Добывает
 blocks.drillspeed = Базовая скорость сверления
-blocks.boosteffect = Boost Effect
+blocks.boosteffect = Ускоряющий эффект
 blocks.maxunits = Максимальное количество активных единиц
 blocks.health = Здоровье
 blocks.inaccuracy = Разброс
 blocks.shots = Выстрелы
 blocks.reload = Выстрелы/секунду
 blocks.ammo = Боеприпасы
-bar.drillspeed = Скорость сверления: {0}/с
+bar.drillspeed = Скорость свердления: {0}/s
 bar.efficiency = Эффективность: {0}%
-bar.powerbalance = Энергия: {0}
+bar.powerbalance = Энергия: {0}/с
-bar.poweramount = Power: {0}
+bar.poweramount = Энергия: {0}
 bar.poweroutput = Выходная энергия: {0}
 bar.items = Предметы: {0}
-bar.liquid = Жидкость
+bar.liquid = Жидкости
-bar.heat = Температура
+bar.heat = Нагревание
 bar.power = Энергия
-bar.progress = Строительство продолжается
+bar.progress = Прогресс Строительство
-bar.spawned = Бой. ед.: {0}/{1}
+bar.spawned = Боев. ед. : {0}/{1}
-bullet.damage = [stat]{0}[lightgray] dmg
+bullet.damage = [stat]{0}[lightgray] урона
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.splashdamage = [stat]{0}[lightgray] урона в радиусе ~[stat] {1}[lightgray] БЛОКОВ
-bullet.incendiary = [stat]incendiary
+bullet.incendiary = [stat]поджигающий
-bullet.homing = [stat]homing
+bullet.homing = [stat]самонаводящийся
-bullet.shock = [stat]shock
+bullet.shock = [stat]ЭМИ
-bullet.frag = [stat]frag
+bullet.frag = [stat]взрывоопасный
-bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.knockback = [stat]{0}[lightgray] отдачи
-bullet.freezing = [stat]freezing
+bullet.freezing = [stat]замораживающий
-bullet.tarred = [stat]tarred
+bullet.tarred = [stat]горючий
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray]x снарядов
-bullet.reload = [stat]{0}[lightgray]x reload
+bullet.reload = [stat]{0}[lightgray]x скорость перезарядки
 unit.blocks = блоки
 unit.powersecond = единиц энергии/секунду
 unit.liquidsecond = жидкостных единиц/секунду
@@ -397,8 +399,8 @@ unit.liquidunits = жидкостных единиц
 unit.powerunits = энерг. единиц
 unit.degrees = град.
 unit.seconds = сек.
-unit.persecond = /sec
+unit.persecond = /сек
-unit.timesspeed = x speed
+unit.timesspeed = x скорость
 unit.percent = %
 unit.items = единиц
 category.general = Основные
@@ -408,15 +410,16 @@ category.items = Предметы
 category.crafting = Ввод/вывод
 category.shooting = Cтрельба
 category.optional = Дополнительные улучшения
-setting.landscape.name = Lock Landscape
+setting.landscape.name = Сохранить ландшафт
-setting.shadows.name = Shadows
+setting.shadows.name = Тени
 setting.animatedwater.name = Анимированная вода
-setting.animatedshields.name = Animated Shields
+setting.animatedshields.name = Анимированные щиты
 setting.antialias.name = Сглаживание[LIGHT_GRAY] (требует перезапуска)[]
 setting.indicators.name = Показывать в сторону союзников и врагов 
 setting.autotarget.name = Авто-стрельба
 setting.fpscap.name = Макс. FPS
 setting.fpscap.none = Неограниченный
 minimap = Мини-карта
 setting.fpscap.text = {0} FPS
 setting.swapdiagonal.name = Всегда Диагональное Размещение
 setting.difficulty.training = обучение
@@ -435,7 +438,6 @@ setting.borderless.name = Окно без границ
 setting.fps.name = Показывать FPS
 setting.vsync.name = Верт. синхронизация
 setting.lasers.name = Показывать энергию лазеров
 setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
 setting.minimap.name = Показать миникарту
 setting.musicvol.name = Громкость музыки
 setting.mutemusic.name = Заглушить музыку
@@ -484,25 +486,25 @@ mode.sandbox.name = Песочница
 mode.sandbox.description = Бесконечные ресурсы и нет таймера для волн, но можно самим вызвать волну.
 mode.freebuild.name = Cвободная\nстройка
 mode.freebuild.description = Ограниченные ресурсы и нет таймера для волн.
-mode.pvp.name = Противо-\nстояние
+mode.pvp.name = PvP
 mode.pvp.description = боритесь против других игроков.
 mode.attack.name = Атака
 mode.attack.description = Нет волн, цель - уничтожить базу противника.
-mode.custom = Custom Rules
+mode.custom = Настройки правил
-rules.infiniteresources = Infinite Resources
+rules.infiniteresources = Бескон. Ресурсы (Игрок)
-rules.wavetimer = Wave Timer
+rules.wavetimer = Интервал волн
-rules.waves = Waves
+rules.waves = Волны
-rules.enemyCheat = Infinite AI Resources
+rules.enemyCheat = Бескон. Ресурсы (ИИ)
 rules.pvp = PvP
-rules.unitdrops = Unit Drops
+rules.unitdrops = Ресурсы Боев. Ед.
-rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.unitbuildspeedmultiplier = Множитель Скорости Создания Боев. Ед.
-rules.unithealthmultiplier = Unit Health Multiplier
+rules.unithealthmultiplier = Множитель Здоровья Боев. Ед.
-rules.playerdamagemultiplier = Player Damage Multiplier
+rules.playerdamagemultiplier = Множитель Урона Игрока
-rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
+rules.enemycorebuildradius = Радиус защиты враж. ядер: [LIGHT_GRAY] {0} (блоков)
-rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
+rules.respawntime = Интервал возрождения: [LIGHT_GRAY] (сек)
-rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
+rules.wavespacing = Интервал волн: [LIGHT_GRAY] (sec)
-rules.buildcostmultiplier = Build Cost Multiplier
+rules.buildcostmultiplier = Множитель затрат на строительство
-rules.buildspeedmultiplier = Build Speed Multiplier
+rules.buildspeedmultiplier = Множитель скорости строительства
 content.item.name = Предметы
 content.liquid.name = Жидкости
 content.unit.name = Боевые единицы
@@ -531,7 +533,7 @@ item.spore-pod.name = Споровой стручок
 item.spore-pod.description = Используется для превращения в нефть, взрывчатые вещества и топливо.
 item.sand.name = Песок
 item.sand.description = Обычный материал, который широко используется при плавке как в сплаве, так и в виде шлака.
-item.blast-compound.name = Взрывоопасное соединение
+item.blast-compound.name = Взрывная смесь
 item.blast-compound.description = Летучее соединение, используемое в бомбах и взрывчатых веществах. Также может гореть в качестве топлива, но не рекомендуется этого делать.
 item.pyratite.name = Пиротит
 item.pyratite.description = Очень огнеопасное вещество, используемое в зажигательном оружии.
@@ -545,7 +547,7 @@ liquid.oil.name = Нефть
 liquid.cryofluid.name = Криогенная жидкость
 mech.alpha-mech.name = Альфа
 mech.alpha-mech.weapon = Тяжёлый пулемёт
-mech.alpha-mech.ability = Нет
+mech.alpha-mech.ability = Регенерация
 mech.alpha-mech.description = Стандартный мех для настольных устройств. Имеет приличную скорость и урон.
 mech.delta-mech.name = Дельта
 mech.delta-mech.weapon = Дуговой генератор
@@ -580,10 +582,10 @@ unit.speed = [LIGHT_GRAY]Скорость: {0}
 mech.weapon = [LIGHT_GRAY]Оружие: {0}
 mech.health = [LIGHT_GRAY]Здоровье: {0}
 mech.itemcapacity = [LIGHT_GRAY]Вместимость предметов: {0}
-mech.minespeed = [LIGHT_GRAY]Скорость добычи: {0}
+mech.minespeed = [LIGHT_GRAY]Скорость добычи: {0}%
 mech.minepower = [LIGHT_GRAY]Мощность добычи: {0}
 mech.ability = [LIGHT_GRAY]Способность: {0}
-mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
+mech.buildspeed = [LIGHT_GRAY]Скорость строительства: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Теплоёмкость: {0}
 liquid.viscosity = [LIGHT_GRAY]Вязкость: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
@@ -690,7 +692,7 @@ block.impact-reactor.name = Импульсный реактор
 block.mechanical-drill.name = Механический бур
 block.pneumatic-drill.name = Пневматический бур
 block.laser-drill.name = Лазерный бур
-block.water-extractor.name = Экстрактор воды
+block.water-extractor.name = Гидроконденсатор
 block.cultivator.name = Культиватор
 block.alpha-dart-mech-pad.name = Реконструктор мехов "Альфа-Дротик"
 block.delta-mech-pad.name = Реконструктор "Дельта"
@@ -719,7 +721,7 @@ block.pyratite-mixer.name = Мешалка пиротита
 block.blast-mixer.name = Мешалка взрывоопасного соединения
 block.solar-panel.name = Солнечная панель
 block.solar-panel-large.name = Большая солнечная панель
-block.oil-extractor.name = Нефтяной экстрактор
+block.oil-extractor.name = Нефтяная вышка
 block.spirit-factory.name = Завод дронов "Призрак"
 block.phantom-factory.name = Завод дронов "Фантом"
 block.wraith-factory.name = Завод призрачных истребителей
@@ -759,7 +761,7 @@ block.meltdown.name = Катастрофа
 block.container.name = Склад
 block.launch-pad.name = Стартовая площадка
 block.launch-pad.description = Запускает партии предметов без необходимости запуска ядра. Незавершённое.
-block.launch-pad-large.name = Large Launch Pad
+block.launch-pad-large.name = Большая Стартовая площадка
 team.blue.name = Синяя
 team.red.name = Красная
 team.orange.name = Оранжевая
@@ -844,7 +846,7 @@ block.silicon-smelter.description = С помощью песка, угля и э
 block.plastanium-compressor.description = Создаёт пластиний из титана и нефти. Требует энергии. Для ускорения производства можно добавить в компрессор песок.
 block.phase-weaver.description = Производит фазовую материю из тория и песка. Требует большего количества энергии.
 block.alloy-smelter.description = Создаёт кинетический сплав из титана, кремния, меди и свинца. Требует энергию.
-block.pulverizer.description = Измельчает камень в песок. Требует энергию.
+block.pulverizer.description = Измельчает металлолом в песок. Требует энергию.
 block.pyratite-mixer.description = Создаёт пиротит из угля, свинца и песка. Требует энергии.
 block.blast-mixer.description = Создаёт взрывоопасное соединение из нефти и пиротита. Для ускорения производства можно добавить в мешалку песок.
 block.cryofluidmixer.description = Производит криогенную жидкость из воды и титана. Требует энергии.
@@ -888,7 +890,7 @@ block.titan-factory.description = Производит продвинутые з
 block.fortress-factory.description = Производит тяжёлые артиллерийские боевые единицы.
 block.revenant-factory.description = Производит тяжёлые летающие боевые единицы.
 block.repair-point.description = Может ремонтировать вас и ваши боевые единицы
-block.conduit.description = Основной блок транспортировки жидкости. Работает как конвейер, но с жидкостями. Лучше всего использовать экстракторы, насосы или т.п..
+block.conduit.description = Основной блок транспортировки жидкости. Работает как конвейер, но с жидкостями.
 block.pulse-conduit.description = Улучшенный блок транспортировки жидкости. Транспортирует жидкости быстрее и хранит больше, чем стандартные.
 block.phase-conduit.description = Улучшенный блок транспортировки жидкости. Использует энергию для передачи жидкостей на подключенный фазовый канал на несколько плиток.
 block.liquid-router.description = Принимает жидкости с одного направления и равномерно выводит их до трех других направлений. Может также хранить определенное количество жидкости. Полезно для разделения жидкостей из одного источника на несколько целей.
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -336,16 +336,16 @@ no = Ні
 info.title = Інформація
 error.title = [crimson]Виникла помилка
 error.crashtitle = Виникла помилка
-blocks.input = Input
+blocks.input = Вхід
-blocks.output = Output
+blocks.output = Вихід
-blocks.booster = Booster
+blocks.booster = Прискорювач
 block.unknown = [LIGHT_GRAY]???
 blocks.powercapacity = Місткість енергії
 blocks.powershot = Енергія/постріл
 blocks.targetsair = Повітряні мішені
 blocks.targetsground = Наземні мішені
 blocks.itemsmoved = Швидкість переміщення
-blocks.launchtime = Time Between Launches
+blocks.launchtime = Час між запусками
 blocks.shootrange = Діапазон дії
 blocks.size = Розмір
 blocks.liquidcapacity = Місткість рідини
@@ -354,30 +354,32 @@ blocks.poweruse = Енергії використовує
 blocks.powerdamage = Енергія/урон
 blocks.itemcapacity = Місткість предметів
 blocks.basepowergeneration = Базова генерація енергії
-blocks.productiontime = Production Time
+blocks.craftspeed = Швидкість виробництва
-blocks.repairtime = Block Full Repair Time
+blocks.productiontime = Час виробництва
-blocks.speedincrease = Speed Increase
+blocks.repairtime = Час повного відновлення блоку
-blocks.range = Range
+blocks.speedincrease = Збільшення швидкості
 blocks.range = Радіус дії
 blocks.inputliquid = Прийом рідини
 blocks.drilltier = Видобуває
 blocks.drillspeed = Базова швидкість свердління
-blocks.boosteffect = Boost Effect
+blocks.boosteffect = Прискорювальний ефект
 blocks.maxunits = Максимальна кількість активних одиниць
 blocks.health = Здоров'я
 blocks.inaccuracy = Розкид
 blocks.shots = Постріли
 blocks.reload = Постріли/секунду
 blocks.ammo = Боєприпаси
-bar.drillspeed = Швидкість свердління: {0}/с
+bar.drillspeed = Швидкість сверрдління: {0}/s
 bar.efficiency = Ефективність: {0}%
-bar.powerbalance = Енергія: {0}
+bar.powerbalance = Енергія: {0}/с
-bar.poweramount = Power: {0}
+bar.poweramount = Енергія: {0}
 bar.poweroutput = Вихідна енергія: {0}
 bar.items = Предмети: {0}
 bar.liquid = Рідина
-bar.heat = Температура
+bar.heat = Нагрівання
 bar.power = Енергія
-bar.progress = Будівництво триває
+bar.progress = Хід Будівництва
-bar.spawned = Бой. од.: {0}/{1}
+bar.spawned = Бойов. од. : {0}/{1}
 bullet.damage = [stat]{0}[lightgray] шкода
 bullet.splashdamage = [stat]{0}[lightgray] шкода по ділянці ~[stat] {1}[lightgray] плитк.
 bullet.incendiary = [stat]запальний
@@ -387,8 +389,8 @@ bullet.frag = [stat]осколкова граната
 bullet.knockback = [stat]{0}[lightgray] відкидання
 bullet.freezing = [stat]заморожування
 bullet.tarred = [stat]дьогтьовий
-bullet.multiplier = [stat]{0}[lightgray]x множник патронів
+bullet.multiplier = [stat]{0}[lightgray]x патронів
-bullet.reload = [stat]{0}[lightgray]x перезаряджання
+bullet.reload = [stat]{0}[lightgray]x швидкість перезаряджання
 unit.blocks = блоки
 unit.powersecond = одиниць енергії/секунду
 unit.liquidsecond = рідких одиниць/секунду
@@ -397,8 +399,8 @@ unit.liquidunits = рідинних одиниць
 unit.powerunits = енергетичних одиниць
 unit.degrees = град.
 unit.seconds = сек.
-unit.persecond = /sec
+unit.persecond = /сек
-unit.timesspeed = x speed
+unit.timesspeed = x швидкість
 unit.percent = %
 unit.items = предм.
 category.general = Загальні
@@ -408,15 +410,16 @@ category.items = Предмети
 category.crafting = Введення/виведення
 category.shooting = Стрільба
 category.optional = Додаткові поліпшення
-setting.landscape.name = Заблокований пейхаж
+setting.landscape.name = Зберегти пейхаж
 setting.shadows.name = Тіні
 setting.animatedwater.name = Анімована вода
-setting.animatedshields.name = Animated Shields
+setting.animatedshields.name = Анімовані щити
 setting.antialias.name = Згладжування[LIGHT_GRAY] (потребує перезапуску)[]
 setting.indicators.name = Показувати у сторону ворогів та союзників
 setting.autotarget.name = Авто-стрільба
 setting.fpscap.name = Макс. FPS
 setting.fpscap.none = Необмежений
 minimap = Міні-мапа
 setting.fpscap.text = {0} FPS
 setting.swapdiagonal.name = Завжди Діагональне Розміщення
 setting.difficulty.training = навчання
@@ -435,8 +438,8 @@ setting.borderless.name = Вікно без полів
 setting.fps.name = Показувати FPS
 setting.vsync.name = Вертикальна синхронізація
 setting.lasers.name = Показувати енергію лазерів
-setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance)
+setting.pixelate.name = Пікселізація [LIGHT_GRAY](може знизити продуктивність)
-setting.minimap.name = Показати мінімапу
+setting.minimap.name = Показати міні-мапу
 setting.musicvol.name = Гучність музики
 setting.mutemusic.name = Заглушити музику
 setting.sfxvol.name = Гучність звукових ефектів
@@ -494,10 +497,10 @@ rules.wavetimer = Таймер Хвиль
 rules.waves = Хвилі
 rules.enemyCheat = Нескінченні ресурси для ШІ
 rules.pvp = PvP
-rules.unitdrops = Падіння бойових одиниць
+rules.unitdrops = Ресурс  бойових одиниць
-rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.unitbuildspeedmultiplier = Множник Швидкості Створювання Бойов. Од.
-rules.unithealthmultiplier = Unit Health Multiplier
+rules.unithealthmultiplier = Множник Здоров'я Створювання Бойов. Од.
-rules.playerdamagemultiplier = Player Damage Multiplier
+rules.playerdamagemultiplier = Множник Шкоди Гравця
 rules.enemycorebuildradius = Радіус заборони будування для Ворожого Ядра:[LIGHT_GRAY] (плитки)
 rules.respawntime = Час відродження:[LIGHT_GRAY] (sec)
 rules.wavespacing = Інтервал хвиль:[LIGHT_GRAY] (sec)
@@ -531,7 +534,7 @@ item.spore-pod.name = Споровий стручок
 item.spore-pod.description = Використовується для перетворення на нафту, вибухові речовини та паливо.
 item.sand.name = Пісок
 item.sand.description = Загальний матеріал, який широко використовується при плавленні, як у процесі плавки, так і у вигляді шлака.
-item.blast-compound.name = Вибухонебезпечне з'єднання
+item.blast-compound.name = Вибухова суміш
 item.blast-compound.description = Нестійке з'єднання, що використовується в бомбах та вибухових речовинах. Хоча воно може спалюватися як паливо, та це не рекомендується.
 item.pyratite.name = Піротит
 item.pyratite.description = Вкрай легкозаймиста речовина, що використовується у запальній зброї.
@@ -545,7 +548,7 @@ liquid.oil.name = Нафта
 liquid.cryofluid.name = Кріогенна рідина
 mech.alpha-mech.name = Альфа
 mech.alpha-mech.weapon = Тяжкий кулемет
-mech.alpha-mech.ability = Нема
+mech.alpha-mech.ability = Регенерація
 mech.alpha-mech.description = Стандартний мех для настільних пристроїв. Має пристойну швидкість і урон.
 mech.delta-mech.name = Дельта
 mech.delta-mech.weapon = Генератор дуг
@@ -580,10 +583,10 @@ unit.speed = [LIGHT_GRAY]Швидкість: {0}
 mech.weapon = [LIGHT_GRAY]Зброя: {0}
 mech.health = [LIGHT_GRAY]Здоров'я: {0}
 mech.itemcapacity = [LIGHT_GRAY] Ємність елементів: {0}
-mech.minespeed = [LIGHT_GRAY]Швидкість видобутку: {0}
+mech.minespeed = [LIGHT_GRAY]Швидкість видобутку: {0}%
 mech.minepower = [LIGHT_GRAY]Потужність видобутку: {0}
 mech.ability = [LIGHT_GRAY]Здібність: {0}
-mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
+mech.buildspeed = [LIGHT_GRAY]Швидкість будування: {0}%
 liquid.heatcapacity = [LIGHT_GRAY]Теплоємність: {0}
 liquid.viscosity = [LIGHT_GRAY]В'язкість: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
@@ -690,7 +693,7 @@ block.impact-reactor.name = Імпульсний реактор
 block.mechanical-drill.name = Механічний дриль
 block.pneumatic-drill.name = Пневматичний дриль
 block.laser-drill.name = Лазерний дриль
-block.water-extractor.name = Екстрактор води
+block.water-extractor.name = Гідроконденсатор
 block.cultivator.name = Культиватор
 block.alpha-dart-mech-pad.name = Реконструктор "Альфа-Дротик"
 block.delta-mech-pad.name = Реконструктор "Дельта"
@@ -719,7 +722,7 @@ block.pyratite-mixer.name = Змішувач піротиту
 block.blast-mixer.name = Доменний змішувач
 block.solar-panel.name = Сонячна панель
 block.solar-panel-large.name = Велика сонячна панель
-block.oil-extractor.name = Екстрактор нафти
+block.oil-extractor.name = Нафтова вежа
 block.spirit-factory.name = Завод дронов "Призрак"
 block.phantom-factory.name = Завод дронов "Фантом"
 block.wraith-factory.name = Завод винищувачів "Примара" 
@@ -759,7 +762,7 @@ block.meltdown.name = Розтоплення
 block.container.name = Склад
 block.launch-pad.name = Стартовий майданчик
 block.launch-pad.description = Запускає партії елементів без необхідності запуску ядра. Незакінчено.
-block.launch-pad-large.name = Large Launch Pad
+block.launch-pad-large.name = Великий Стартовий майданчик
 team.blue.name = Синя
 team.red.name = Червона
 team.orange.name = Помаренчева
@@ -844,7 +847,7 @@ block.silicon-smelter.description = За допомогою піску, вугі
 block.plastanium-compressor.description = Створює пластинійи з титану і нафти. Вимагає енергії. Для прискорення виробництва можна додати в компресор пісок.
 block.phase-weaver.description = Виробляє фазову тканину торію і піску. Вимагає багато енергії.
 block.alloy-smelter.description = Створює кінетичний сплав з титану, кременя, міді і свинця. Вимагає енергію.
-block.pulverizer.description = Подрібнює камінь в пісок. Вимагає енергії.
+block.pulverizer.description = Подрібнює металобрухт в пісок. Вимагає енергії.
 block.pyratite-mixer.description = Створює піротит з вугілля, свинцю і піску. Вимагає енергії.
 block.blast-mixer.description = Створює вибухонебезпечне з'єднання з нафти і піротіта. Для прискорення виробництва можна додати в мішалку пісок.
 block.cryofluidmixer.description = Виробляє криогенну рідину з води і титану. Вимагає енергії. 
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -1,4 +1,4 @@
-credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[GRAY](In case you can't tell, this text is currently unfinished.\nTranslators, don't edit it yet!)
+credits.text = 由[ROYAL]Anuken[]开发 - [SKY]anukendev@gmail.com[]\n\n[GRAY](In case you can't tell, this text is currently unfinished.\nTranslators, don't edit it yet!)
 credits = 致谢
 contributors = 译者和贡献者
 discord = 加入 Mindustry 的 Discord!
@@ -12,31 +12,31 @@ link.wiki.description = 官方 Mindustry 维基
 linkfail = 打开链接失败！\nURL 已经复制到剪贴板。
 screenshot = 荧幕截图已放在 {0}
 gameover = 你的核心被摧毁了！
-gameover.pvp = accent] {0}[] 队获胜!
+gameover.pvp = [accent] {0}[] 队获胜!
 highscore = [accent]新纪录！
-stat.wave = 战胜的波数：[accent] {0}
+stat.wave = 战胜的波数：[accent]{0}
-stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
+stat.enemiesDestroyed = 消灭的敌人：[accent]{0}
-stat.built = Buildings Built:[accent] {0}
+stat.built = 建造的建筑：[accent]{0}
-stat.destroyed = Buildings Destroyed:[accent] {0}
+stat.destroyed = 摧毁的建筑：[accent]{0}
-stat.deconstructed = Buildings Deconstructed:[accent] {0}
+stat.deconstructed = 拆除的建筑：[accent]{0}
-stat.delivered = Resources Launched:
+stat.delivered = 发射的资源：
-stat.rank = Final Rank: [accent]{0}
+stat.rank = 最终排名：[accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
+placeline = 你选择了一个方块。\n你能通过[accent]长按几秒钟[]并向一个方向拖动来[accent]直线放置方块[]。\n试试看吧。
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
+removearea = 你选择了拆除模式。\n你能通过[accent]长按几秒钟[]并拖动来[accent]删除矩形内的方块[]。\n试试看吧。
-launcheditems = [accent]Launched Items
+launcheditems = [accent]发射的资源
 map.delete = 确定要删除 "[accent]{0}[]" 地图吗？
-level.highscore = 最高分： [accent]{0}
+level.highscore = 最高分：[accent]{0}
-level.select = 选择关卡
+level.select = 选择关卡（？Level Select）
 level.mode = 游戏模式：
-showagain = 不再显示
+showagain = 下次不再显示
 coreattack = < 核心正在受到攻击！ >
-nearpoint = [[ [scarlet]LEAVE DROP POINT IMMEDIATELY[] ]\nannihilation imminent
+nearpoint = [[ [scarlet]立即离开敌人出生点[] ]\n将被清理
-outofbounds = [[ OUT OF BOUNDS ]\n[]self-destruct in {0}
+outofbounds = [[ 超出边界 ]\n[]{0}秒后自毁
-database = 核心数据
+database = 核心数据库
 savegame = 保存游戏
 loadgame = 载入游戏
 joingame = 加入游戏
-addplayers = 增加/删除玩家
+addplayers = 添加/删除玩家
 customgame = 自定义游戏
 newgame = 新游戏
 none = <无>
@@ -45,33 +45,33 @@ close = 关闭
 quit = 退出
 maps = 地图
 continue = 继续
-maps.none = [LIGHT_GRAY]未发现地图！
+maps.none = [LIGHT_GRAY]没有找到地图！
 about.button = 关于
 name = 名字:
-noname = Pick a[accent] player name[] first.
+noname = 先取一个[accent] 玩家名[]。
 filename = 文件名:
 unlocked = 新方块已解锁！
-completed = [accent]Completed
+completed = [accent]完成的
 techtree = 科技树
-research.list = [LIGHT_GRAY]Research:
+research.list = [LIGHT_GRAY]研究:
-research = Research
+research = 研究
-researched = [LIGHT_GRAY]{0} researched.
+researched = [LIGHT_GRAY]{0} 己研究。
 players = {0} 玩家在线
 players.single = {0} 玩家在线
 server.closing = [accent]正在关闭服务器……
 server.kicked.kick = 你被踢出服务器了！
 server.kicked.serverClose = 服务器已关闭。
-server.kicked.clientOutdated = 客户端版本过旧！请升级！
+server.kicked.clientOutdated = 过旧的客户端！更新你的游戏！
-server.kicked.serverOutdated = 服务器版本过旧！请联系房主升级！
+server.kicked.serverOutdated = 过旧的服务器！联系房主升级！
-server.kicked.banned = 你被这个服务器拉黑了。
+server.kicked.banned = 你在这个服务器上被禁了。
 server.kicked.recentKick = 你刚刚被踢出服务器。\n请稍后重新连接！
 server.kicked.nameInUse = 服务器中已经\n有人有相同的名字了。
-server.kicked.nameEmpty = 你的名字必须至少包含一个字母或数字。
+server.kicked.nameEmpty = 你选择的名字是无效的。
-server.kicked.idInUse = 你已经在服务器中！不允许用两个账号。
+server.kicked.idInUse = 你已在这个服务器上！不允许用两个账号连接。
-server.kicked.customClient = 这个服务器不支持修改版客户端，请下载官方版本。
+server.kicked.customClient = 这个服务器不支持定制版本。下载官方版本。
-server.kicked.gameover = !
+server.kicked.gameover = 游戏结束！
-host.info = [accent]创建局域网游戏[]按钮会在[scarlet]6567[]端口运行一个服务器。[]\n任何在同一个[LIGHT_GRAY]网络或本地网络[]下的人都将在服务器列表中看到你的服务器。\n\n如果你想让别人在任何地方都能通过IP地址连接，你需要设定[accent]端口转发[]。\n\n[LIGHT_GRAY]请注意：如果某人无法连接到你的局域网游戏，请确保你在防火墙设置里允许了Mindustry连接本地网络。
+host.info = [accent]创建局域网游戏[]按钮会在[scarlet]6567[]端口运行一个服务器。[]\n任何在同一个[LIGHT_GRAY]wifi或本地网络[]下的人都应该可以在服务器列表中看到你的服务器。\n\n如果你想让别人在任何地方都能通过IP地址连接，你需要设定[accent]端口转发[]。\n\n[LIGHT_GRAY]注意：如果某人无法连接到你的局域网游戏，请确保你在防火墙设置里允许了Mindustry访问本地网络。
-join.info = 你可以在这里输入[accent]服务器的IP地址[]以连接，或寻找[accent]本地网络[]中的服务器以连接。\n目前支持局域网或广域网多人游戏。\n\n[LIGHT_GRAY]请注意：没有全球服务器列表；如果你想通过IP地址连接某个服务器，你需要向房主询问IP地址。
+join.info = 此时，可以输入[accent]服务器的IP地址[]来连接，或寻找[accent]本地网络[]中的服务器来连接。\n局域网或广域网多人游戏都被支持。\n\n[LIGHT_GRAY]注意：没有全球服务器列表；如果你想通过IP地址连接某个服务器，你需要向房主询问IP地址。
 hostserver = 创建服务器
 hostserver.mobile = 创建\n服务器
 host = 创建
@@ -82,190 +82,190 @@ server.refreshing = 正在刷新服务器
 hosts.none = [lightgray]未发现局域网游戏！
 host.invalid = [scarlet]无法连接服务器。
 trace = 跟踪玩家
-trace.playername = 玩家名字： [accent]{0}
+trace.playername = 玩家名称：[accent]{0}
-trace.ip = IP地址： [accent]{0}
+trace.ip = IP地址：[accent]{0}
-trace.id = ID︰[accent]{0}
+trace.id = 唯一的ID：[accent]{0}
-trace.android = 安卓客户端： [accent]{0}
+trace.android = 安卓客户端：[accent]{0}
-trace.modclient = 修改版客户端： [accent]{0}
+trace.modclient = 定制版客户端：[accent]{0}
 trace.totalblocksbroken = 总共破坏了 [accent]{0} 个方块。
-trace.structureblocksbroken = 总共破坏了[accent]{0}个方块。
+trace.structureblocksbroken = 总共破坏了 [accent]{0} 个建筑物方块。
-trace.lastblockbroken = 最后破坏的方块： [accent]{0}
+trace.lastblockbroken = 最后破坏的方块：[accent]{0}
 trace.totalblocksplaced = 总共放置了 [accent]{0} 个方块。
-trace.lastblockplaced = 最后放置的方块： [accent]{0}
+trace.lastblockplaced = 最后放置的方块：[accent]{0}
-invalidid = 无效的客户端ID！请提交错误报告。
+invalidid = 无效的客户端ID！提交一个错误报告。
 server.bans = 黑名单
-server.bans.none = 没有被拉黑的玩家！
+server.bans.none = 没有找到被拉黑的玩家！
 server.admins = 管理员
-server.admins.none = 没有管理员！
+server.admins.none = 没有找到管理员！
 server.add = 添加服务器
-server.delete = 确定要删除这个服务器吗？
+server.delete = 你确定要删除这个服务器吗？
-server.hostname = 主机︰{0}
+server.hostname = 主机：{0}
 server.edit = 编辑服务器
-server.outdated = [crimson]服务器过旧！[]
+server.outdated = [crimson]过旧的服务器！[]
-server.outdated.client = [crimson]客户端过旧！[]
+server.outdated.client = [crimson]过旧的客户端！[]
-server.version = [lightgray]版本： {0}
+server.version = [lightgray]版本：{0} {1}
-server.custombuild = [yellow]修改版
+server.custombuild = [yellow]定制版
-confirmban = 确认拉黑这个玩家吗？
+confirmban = 你确认你想拉黑这名玩家吗？
-confirmkick = 您确定要踢出这个玩家吗？
+confirmkick = 你确定你想要踢走这名玩家吗？
-confirmunban = 确认要取消拉黑这个玩家吗？
+confirmunban = 你确定你想要取消拉黑这名玩家吗？
-confirmadmin = 确认要添加这个玩家为管理员吗？
+confirmadmin = 你确定你想要使这名玩家成为一个管理员吗？
-confirmunadmin = 确认要取消这个玩家的管理员身份吗？
+confirmunadmin = 你确定你想要删除这名玩家的管理员地位吗？
 joingame.title = 加入游戏
-joingame.ip = IP：
+joingame.ip = 地址：
 disconnect = 已断开
-disconnect.data = 载入世界失败！
+disconnect.data = 读取世界数据失败！
-connecting = [accent]连接中……
+connecting = [accent]正在连接...
-connecting.data = [accent]加载世界中……
+connecting.data = [accent]正在加载世界数据...
-server.port = 端口︰
+server.port = 端口：
-server.addressinuse = 地址已经使用！
+server.addressinuse = 地址已经在使用中！
-server.invalidport = 无效的端口！
+server.invalidport = 无效的端口号！
 server.error = [crimson]创建服务器错误：[accent]{0}
-save.old = 这个存档属于旧版本游戏，无法继续使用了。\n\n[LIGHT_GRAY]存档向下兼容将在 4.0 版本中实现。
+save.old = 这个存档属于旧版本游戏，不再被使用。\n\n[LIGHT_GRAY]存档向下兼容将在完整的 4.0 版本中被实现。
 save.new = 新存档
-save.overwrite = 确认要覆盖这个存档吗？
+save.overwrite = 你确定你要覆盖这个存档位吗？
 overwrite = 覆盖
-save.none = 没有存档！
+save.none = 没有存档被找到！
-saveload = [accent]保存中……
+saveload = [accent]正在保存...
 savefail = 保存失败！
-save.delete.confirm = 确认要删除这个存档吗？
+save.delete.confirm = 你确定你要删除这个存档吗？
 save.delete = 删除
 save.export = 导出存档
-save.import.invalid = [accent]存档无效！
+save.import.invalid = [accent]这个存档是无效的！
 save.import.fail = [crimson]导入存档失败：[accent]{0}
 save.export.fail = [crimson]导出存档失败：[accent]{0}
 save.import = 导入存档
-save.newslot = 保存游戏：
+save.newslot = 保存的名称：
 save.rename = 重命名
-save.rename.text = 新名字：
+save.rename.text = 新名称：
 selectslot = 选择一个存档。
-slot = [accent]存档 {0}
+slot = [accent]存档位 {0}
-save.corrupted = [accent]存档损坏或无效！\n如果你刚刚升级了游戏，那么这可能是因为存档格式改变了，而[scarlet]不是[] bug 。
+save.corrupted = [accent]存档损坏或无效！\n如果你刚刚升级了游戏，那么这可能是因为存档格式改变了，而[scarlet]不是[]bug 。
 empty = <空>
 on = 开
 off = 关
 save.autosave = 自动保存：{0}
 save.map = 地图：{0}
-save.wave = 第 {0} 波
+save.wave = 波次 {0}
-save.difficulty = 难度： {0}
+save.difficulty = 难度：{0}
-save.date = 最后保存日期：{0}
+save.date = 最后保存过：{0}
 save.playtime = 游戏时间：{0}
-warning = Warning.
+warning = 警告。
 confirm = 确认
 delete = 删除
 ok = 好的
 open = 打开
 cancel = 取消
 openlink = 打开链接
-copylink = 删除链接
+copylink = 复制链接
 back = 返回
-quit.confirm = 确认要退出？
+quit.confirm = 你确定你想要退出？
 changelog.title = 更新日志
 changelog.loading = 正在获取更新日志...
-changelog.error.android = [accent]请注意更新日志有时在安卓 4.4 以下不工作。\n这是因为安卓系统的一个 bug 。
+changelog.error.android = [accent]注意更新日志有时在安卓 4.4 以下不工作。\n这是安卓系统内部的一个bug。
-changelog.error.ios = [accent]iOS还不支持更新日志。
+changelog.error.ios = [accent]更新日志当前在iOS中不被支持。
 changelog.error = [scarlet]获取更新日志失败！\n请检查你的网络。
-changelog.current = [yellow][[Current version]
+changelog.current = [yellow][[当前版本]
-changelog.latest = [accent][[Latest version]
+changelog.latest = [accent][[最新版本]
-loading = [accent]加载中……
+loading = [accent]正在加载...
-saving = [accent]保存中……
+saving = [accent]正在保存...
-wave = [accent]第 {0} 波
+wave = [accent]波次 {0}
-wave.waiting = 下一波将在 {0} 秒后到来
+wave.waiting = [LIGHT_GRAY]下一波将在{0}秒后到来
 waiting = 等待中……
 waiting.players = 等待玩家中……
-wave.enemies = 剩下 [LIGHT_GRAY]{0} 敌人
+waiting = [LIGHT_GRAY]正在等待...
-wave.enemy = 剩下 [LIGHT_GRAY]{0} 敌人
+wave.enemies = [LIGHT_GRAY]剩余 {0} 个敌人
 wave.enemy = [LIGHT_GRAY]剩余 {0} 个敌人
 loadimage = 加载图片
 saveimage = 保存图片
 unknown = 未知
 custom = 自定义
 builtin = 内建的
-map.delete.confirm = 确认要删除地图吗？这个操作无法撤销！
+map.delete.confirm = 你确定你想要删除这张地图吗？这个操作无法取消！
 map.random = [accent]随机地图
 map.nospawn = 这个地图没有核心！请在编辑器中添加一个[ROYAL]蓝色[]的核心。
 map.nospawn.pvp = 这个地图没有敌人的核心！请在编辑器中添加一个[ROYAL]红色[]的核心。
-map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
+map.nospawn.attack = 这个地图没有敌人的核心！请在编辑中向地图添加一个[SCARLET]红色[]的核心。
 map.invalid = 地图载入错误：地图文件可能已经损坏。
 editor.brush = 笔刷
 editor.openin = 在编辑器中打开
-editor.oregen = 生成矿石
+editor.oregen = 矿石的生成
-editor.oregen.info = 生成矿石：
+editor.oregen.info = 矿石的生成：
-editor.mapinfo = 地图详情
+editor.mapinfo = 地图信息
 editor.author = 作者：
 editor.description = 描述：
-editor.waves = Waves:
+editor.waves = 波数：
-waves.title = Waves
+waves.title = 波数
-waves.remove = Remove
+waves.remove = 去除
 waves.never = <never>
-waves.every = every
+waves.every = 每
-waves.waves = wave(s)
+waves.waves = 波
-waves.perspawn = per spawn
+waves.perspawn = 每次生成
-waves.to = to
+waves.to = 至
-waves.boss = Boss
+waves.boss = 首领（Boos）
-waves.preview = Preview
+waves.preview = 预览
-waves.edit = Edit...
+waves.edit = 编辑...
-waves.copy = Copy to Clipboard
+waves.copy = 复制到剪贴板
-waves.load = Load from Clipboard
+waves.load = 从剪贴板读取
-waves.invalid = Invalid waves in clipboard.
+waves.invalid = 剪贴板中无效的波次信息。
-waves.copied = Waves copied.
+waves.copied = 波次信息已复制。
-editor.default = [LIGHT_GRAY]<Default>
+editor.default = [LIGHT_GRAY]<默认>
-edit = Edit...
+edit = 编辑...
-editor.name = 名字：
+editor.name = 名称：
-editor.teams = 团队
+editor.teams = 队伍
 editor.elevation = 高度
-editor.errorload = Error loading file:\n[accent]{0}
+editor.errorload = 读取文件时出现错误：\n[accent]{0}
-editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorsave = 保存文件时出现错误：\n[accent]{0}
-editor.errorname = Map has no name defined.
+editor.errorname = 地图没有被定义的名称。
-editor.update = Update
+editor.update = 更新（Update）
-editor.randomize = Randomize
+editor.randomize = 随机化
-editor.apply = Apply
+editor.apply = 应用
 editor.generate = 生成
-editor.resize = 调整
+editor.resize = 调整大小
 editor.loadmap = 载入地图
 editor.savemap = 保存地图
 editor.saved = 已保存！
-editor.save.noname = 你的地图还没有名字！在“地图信息”菜单里设置一个名字。
+editor.save.noname = 你的地图没有名字！在“地图信息”菜单里设置一个。
-editor.save.overwrite = 你的地图覆盖了一个内建的地图！在“地图信息”菜单里重新设置一个新的名字。
+editor.save.overwrite = 你的地图覆盖了一个内建的地图！在“地图信息”菜单里重新设置一个不同的名称。
-editor.import.exists = [scarlet]无法导入:[] 已经有一个叫 '{0}' 的内建地图存在。
+editor.import.exists = [scarlet]无法导入:[]名为‘{0}’的内建地图已存在！
-editor.import = 导入……
+editor.import = 导入...
 editor.importmap = 导入地图
 editor.importmap.description = 导入一个已经存在的地图
 editor.importfile = 导入文件
 editor.importfile.description = 导入一个外置的地图文件
 editor.importimage = 导入地形图像
-editor.importimage.description = 导入外置地图图像文件
+editor.importimage.description = 导入一个外置的地图图像文件
-editor.export = 导出……
+editor.export = 导出...
 editor.exportfile = 导出文件
 editor.exportfile.description = 导出一个地图文件
 editor.exportimage = 导出一个地形文件
 editor.exportimage.description = 导出一个地图图像文件
 editor.loadimage = 导入地形
 editor.saveimage = 导出地形
-editor.unsaved = [scarlet]你有未保存的更改！[]\n确定要退出？
+editor.unsaved = [scarlet]你有未保存的更改！[]\n你确定你想要要退出？
-editor.resizemap = 调整地图
+editor.resizemap = 调整地图大小
-editor.mapname = 地图名字：
+editor.mapname = 地图名称：
 editor.overwrite = [accent]警告！\n这将会覆盖一个已经存在的地图。
-editor.overwrite.confirm = [scarlet]警告！[] 存在同名地图，确定要覆盖？
+editor.overwrite.confirm = [scarlet]警告！[]存在同名地图。你确定你想要覆盖？
 editor.selectmap = 选择一个地图加载：
-filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
+filters.empty = [LIGHT_GRAY]没有过滤器（filters）！用下方的按钮添加一个。
-filter.distort = Distort
+filter.distort = 扭曲？（Distort）
-filter.noise = Noise
+filter.noise = 噪音（Noise）
-filter.ore = Ore
+filter.ore = 矿石（Ore）
-filter.rivernoise = River Noise
+filter.rivernoise = 河流噪音（River Noise）
-filter.scatter = Scatter
+filter.scatter = 散播（Scatter）
-filter.terrain = Terrain
+filter.terrain = 地形（Terrain）
-filter.option.scale = Scale
+filter.option.scale = 规模？（Scale）
-filter.option.chance = Chance
+filter.option.chance = 机会（Chance）
-filter.option.mag = Magnitude
+filter.option.mag = 大小？（Magnitude）
-filter.option.threshold = Threshold
+filter.option.threshold = 门槛？（Threshold）
-filter.option.circle-scale = Circle Scale
+filter.option.circle-scale = 圈规模？（Circle Scale）
-filter.option.octaves = Octaves
+filter.option.octaves = 八度？（Octaves）
-filter.option.falloff = Falloff
+filter.option.falloff = 减少？（Falloff）
-filter.option.block = Block
+filter.option.block = 方块
-filter.option.floor = Floor
+filter.option.floor = 地面
-filter.option.wall = Wall
+filter.option.wall = 墙
-filter.option.ore = Ore
+filter.option.ore = 矿石
-filter.option.floor2 = Secondary Floor
+filter.option.floor2 = 第二地面？（Secondary Floor）
-filter.option.threshold2 = Secondary Threshold
+filter.option.threshold2 = 第二门槛？（Secondary Threshold）
 width = 宽度：
 height = 高度：
 menu = 菜单
@@ -281,7 +281,7 @@ tutorial = 教程
 editor = 编辑器
 mapeditor = 地图编辑器
 donate = 捐赠
-abandon = Abandon
+abandon = 放弃
 abandon.text = 这个区域和它的所有资源会被敌人没收.
 locked = 已被锁定
 complete = [LIGHT_GRAY]完成:
@@ -301,7 +301,7 @@ zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met.
 zone.config.complete = Wave {0} reached:\nLoadout config unlocked.
 zone.resources = 已被发现的资源:
 add = Add...
-boss.health = Boss Health
+boss.health = Boss 生命值
 connectfail = [crimson]服务器连接失败： [accent]{0}
 error.unreachable = 服务器无法访问。
 error.invalidaddress = 地址无效。
@@ -345,7 +345,7 @@ blocks.powershot = 能量/发射
 blocks.targetsair = 攻击空中单位
 blocks.targetsground = 攻击地面单位
 blocks.itemsmoved = 移动速度
-blocks.launchtime = Time Between Launches
+blocks.launchtime = 发射间隔时间
 blocks.shootrange = 范围
 blocks.size = 尺寸
 blocks.liquidcapacity = 液体容量
@@ -354,15 +354,27 @@ blocks.poweruse = 能量使用
 blocks.powerdamage = 功率/损伤
 blocks.itemcapacity = 物品容量
 blocks.basepowergeneration = 基础能源输出
-blocks.productiontime = Production Time
+blocks.powertransferspeed = 能量传输
-blocks.repairtime = Block Full Repair Time
+blocks.craftspeed = 生产速度
-blocks.speedincrease = Speed Increase
+blocks.productiontime = 生产时间
-blocks.range = Range
+blocks.repairtime = 方块完全修复时间
 blocks.speedincrease = 提速
 blocks.range = 范围
 blocks.inputliquid = 液体输入
 blocks.inputliquidaux = 辅助液体
 blocks.inputitem = 物品输入
 blocks.inputitems = 物品输入
 blocks.outputitem = 物品输出
 blocks.drilltier = 可钻探矿物
 blocks.drillspeed = 基础钻探速度
-blocks.boosteffect = Boost Effect
+blocks.boosteffect = 加成影响
 blocks.maxunits = 最大单位数量
 blocks.health = 生命值
 blocks.heat = 热量
 blocks.power = 电力
 blocks.progress = 制造进度
 blocks.spawned = 单位数量: {0}/{1}
 blocks.power.satisfaction = 电力输入
 blocks.inaccuracy = 误差
 blocks.shots = 发射数
 blocks.reload = 重新装弹
@@ -378,17 +390,17 @@ bar.heat = Heat
 bar.power = 电力
 bar.progress = 制造进度
 bar.spawned = 单位数量: {0}/{1}
-bullet.damage = [stat]{0}[lightgray] dmg
+bullet.damage = [stat]{0}[lightgray] 伤害
-bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
+bullet.splashdamage = [stat]{0}[lightgray] 范围伤害 ~[stat] {1}[lightgray] 格
-bullet.incendiary = [stat]incendiary
+bullet.incendiary = [stat] 燃烧
-bullet.homing = [stat]homing
+bullet.homing = [stat] 追踪
-bullet.shock = [stat]shock
+bullet.shock = [stat] 击晕
-bullet.frag = [stat]frag
+bullet.frag = [stat] 分裂
-bullet.knockback = [stat]{0}[lightgray] knockback
+bullet.knockback = [stat]{0}[lightgray] 击退
-bullet.freezing = [stat]freezing
+bullet.freezing = [stat] 冰冻
-bullet.tarred = [stat]tarred
+bullet.tarred = [stat] 减速
-bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier
+bullet.multiplier = [stat]{0}[lightgray]x 子弹数量
-bullet.reload = [stat]{0}[lightgray]x reload
+bullet.reload = [stat]{0}[lightgray]x 装弹
 unit.blocks = 方块
 unit.powersecond = 能量单位/秒
 unit.liquidsecond = 液体单位/秒
@@ -408,11 +420,10 @@ category.items = 物品
 category.crafting = 制造
 category.shooting = 发射
 category.optional = 可选的增强物品
-setting.landscape.name = 锁定地形
+setting.landscape.name = 锁定横屏
 setting.shadows.name = 影子
 setting.animatedwater.name = 流动的水
-setting.animatedshields.name = Animated Shields
+setting.antialias.name = 抗锯齿[LIGHT_GRAY] (需要重新启动)[]
 setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动发射
 setting.fpscap.name = 最高 FPS
@@ -431,7 +442,7 @@ setting.sensitivity.name = 控制器灵敏度
 setting.saveinterval.name = 自动保存间隔
 setting.seconds = {0} 秒
 setting.fullscreen.name = 全屏
-setting.borderless.name = Borderless Window
+setting.borderless.name = 无边界
 setting.fps.name = 显示 FPS
 setting.vsync.name = 帧同步
 setting.lasers.name = 显示能量射线
@@ -479,7 +490,7 @@ keybind.drop_unit.name = 掉落单位
 keybind.zoom_minimap.name = 小地图缩放
 mode.help.title = 模式说明
 mode.survival.name = 生存
-mode.survival.description = 正常的游戏模式,有限的资源和自动入射波。
+mode.survival.description = 正常的游戏模式,有限的资源和自动波次。
 mode.sandbox.name = 沙盒
 mode.sandbox.description = 无限的资源，不会自动生成敌人。
 mode.freebuild.name = 自由建造
@@ -487,22 +498,19 @@ mode.freebuild.description = 有限的资源，不会自动生成敌人。
 mode.pvp.name = PvP
 mode.pvp.description = 和本地玩家对战.
 mode.attack.name = 攻击
-mode.attack.description = 没有波数,但是有吹毁敌人基地的任务.
+mode.attack.description = 没有波数,但是有摧毁敌人基地的任务.
-mode.custom = Custom Rules
+mode.custom = 自定义模式
-rules.infiniteresources = Infinite Resources
+rules.infiniteresources = 无限资源
-rules.wavetimer = Wave Timer
+rules.wavetimer = 波次计时器
-rules.waves = Waves
+rules.waves = 波次
-rules.enemyCheat = Infinite AI Resources
+rules.enemyCheat = AI无限资源
 rules.pvp = PvP
-rules.unitdrops = Unit Drops
+rules.unitdrops = 敌人出生点
-rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier
+rules.enemycorebuildradius = 敌对核心非建设区半径：[LIGHT_GRAY](格)
-rules.unithealthmultiplier = Unit Health Multiplier
+rules.respawntime = 重生时间：[LIGHT_GRAY](秒)
-rules.playerdamagemultiplier = Player Damage Multiplier
+rules.wavespacing = 波次间隔时间：[LIGHT_GRAY](秒)
-rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles)
+rules.buildcostmultiplier = 建设花费倍数
-rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec)
+rules.buildspeedmultiplier = 建设时间倍数
 rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec)
 rules.buildcostmultiplier = Build Cost Multiplier
 rules.buildspeedmultiplier = Build Speed Multiplier
 content.item.name = 物品
 content.liquid.name = 液体
 content.unit.name = 部队
@@ -559,7 +567,7 @@ mech.omega-mech.name = 欧米茄
 mech.omega-mech.weapon = 导弹群
 mech.omega-mech.ability = 配置装甲
 mech.omega-mech.description = 一种装甲厚重的机甲，用于在前线攻击。它的护甲可以阻挡高达 90% 的伤害。
-mech.dart-ship.name = 沉思者
+mech.dart-ship.name = 飞镖
 mech.dart-ship.weapon = 机枪
 mech.dart-ship.description = 标准飞船。快速轻便，但攻击能力低，采矿速度快。
 mech.javelin-ship.name = 标枪
@@ -583,7 +591,7 @@ mech.itemcapacity = [LIGHT_GRAY]物品容量：{0}
 mech.minespeed = [LIGHT_GRAY]采矿速度：{0}
 mech.minepower = [LIGHT_GRAY]采矿力量：{0}
 mech.ability = [LIGHT_GRAY]能力：{0}
-mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}%
+mech.buildspeed = [LIGHT_GRAY]建造速度：{0}%
 liquid.heatcapacity = [LIGHT_GRAY]热容量：{0}
 liquid.viscosity = [LIGHT_GRAY]粘度：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
@@ -608,7 +616,7 @@ block.kiln.name = 熔炉
 block.kiln.description = 将铅和沙子熔炼成钢化玻璃，需要少量电力。
 block.graphite-press.name = 石墨压缩机
 block.multi-press.name = 大型石墨压缩机
-block.constructing = {0}\n[LIGHT_GRAY](Constructing)
+block.constructing = {0}\n[LIGHT_GRAY](建造中)
 block.spawn.name = 敌人出生点
 block.core-shard.name = 小型核心
 block.core-foundation.name = 中型核心
@@ -692,7 +700,7 @@ block.pneumatic-drill.name = 气动钻头
 block.laser-drill.name = 激光钻头
 block.water-extractor.name = 抽水机
 block.cultivator.name = 耕种机
-block.alpha-dart-mech-pad.name = 阿尔法-沉思者 机甲平台
+block.alpha-dart-mech-pad.name = 阿尔法-飞镖 机甲平台
 block.delta-mech-pad.name = 德尔塔 机甲平台
 block.javelin-ship-pad.name = 标枪 机甲平台
 block.trident-ship-pad.name = 三叉戟 机甲平台
@@ -759,7 +767,7 @@ block.meltdown.name = 熔毁
 block.container.name = 容器
 block.launch-pad.name = 发射台
 block.launch-pad.description = 不通过核心发射物体。尚未完成。
-block.launch-pad-large.name = Large Launch Pad
+block.launch-pad-large.name = 大型发射台
 team.blue.name = 蓝
 team.red.name = 红
 team.orange.name = 橙
@@ -782,7 +790,7 @@ unit.wraith.description = 一种快速，打了就跑的截击机。
 unit.fortress.name = 堡垒
 unit.fortress.description = 一种重炮地面部队。
 unit.revenant.name = 亡魂
-unit.eruptor.name = 爆发者
+unit.eruptor.name = 暴君
 unit.chaos-array.name = 混沌者
 unit.eradicator.name = 根除者
 unit.lich.name = 尸鬼
@@ -823,7 +831,7 @@ block.overdrive-projector.description = 提高附近建筑物的速度，如钻
 block.force-projector.description = 自身周围创建一个六边形力场，保护建筑物和内部单位免受子弹的伤害。
 block.shock-mine.description = 伤害踩到它的敌人。敌人几乎看不到它。
 block.duo.description = 小而便宜的炮塔。
-block.scatter.description = 中型防空炮塔，向空中单位发射铅或废料。.
+block.scatter.description = 中型防空炮塔，向空中单位发射铅或废料。
 block.arc.description = 小型炮塔，发射电弧。
 block.hail.description = 小型炮兵炮台。
 block.lancer.description = 中型炮塔，发射带电的电子束。
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -470,6 +470,8 @@ public class Blocks implements ContentList{
            int bottomRegion = reg("-bottom"), weaveRegion = reg("-weave");
            drawIcons = () -> new TextureRegion[]{Core.atlas.find(name + "-bottom"), Core.atlas.find(name)};
            drawer = tile -> {
                GenericCrafterEntity entity = tile.entity();
@@ -517,18 +519,19 @@ public class Blocks implements ContentList{
        cryofluidMixer = new GenericCrafter("cryofluidmixer"){{
            requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.thorium, 90));
-            outputLiquid = new LiquidStack(Liquids.cryofluid, 0.3f);
+            outputLiquid = new LiquidStack(Liquids.cryofluid, 0.6f);
            craftTime = 5f;
            size = 2;
            hasPower = true;
            hasItems = true;
            hasLiquids = true;
            rotate = false;
            solid = true;
            outputsLiquid = true;
            consumes.power(1f);
            consumes.item(Items.titanium);
-            consumes.liquid(Liquids.water, 0.3f);
+            consumes.liquid(Liquids.water, 0.6f);
            int liquidRegion = reg("-liquid"), topRegion = reg("-top"), bottomRegion = reg("-bottom");
@@ -629,6 +632,7 @@ public class Blocks implements ContentList{
            health = 320;
            hasLiquids = true;
            hasPower = true;
            craftEffect = Fx.none;
            consumes.item(Items.sporePod, 1);
            consumes.power(0.60f);
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -163,7 +163,7 @@ public class Renderer implements ApplicationListener{
        graphics.clear(clearColor);
-        if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight()){
+        if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && (shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight())){
            shieldBuffer.resize(graphics.getWidth(), graphics.getHeight());
        }
--- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
@@ -213,8 +213,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
        TileEntity core = unit.getClosestCore();
-        //if there is no core to build with, stop building!
+        //if there is no core to build with or no build entity, stop building!
-        if(core == null){
+        if(core == null || !(tile.entity instanceof BuildEntity)){
            return;
        }
--- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java
@@ -280,7 +280,9 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
        if(health <= 0){
            onDeath();
            return; //no need to update anymore
        }
        Block previous = block;
        block.update(tile);
        if(block == previous && cons != null){
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -199,7 +199,6 @@ public class Conveyor extends Block{
    @Override
    public void update(Tile tile){
        ConveyorEntity entity = tile.entity();
        entity.minitem = 1f;
        Tile next = tile.getNearby(tile.getRotation());
--- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java
@@ -30,7 +30,7 @@ public class GenericCrafter extends Block{
    protected LiquidStack outputLiquid;
    protected float craftTime = 80;
-    protected Effect craftEffect = Fx.purify;
+    protected Effect craftEffect = Fx.none;
    protected Effect updateEffect = Fx.none;
    protected float updateEffectChance = 0.04f;
Author	SHA1	Message	Date
Anuken	812dea385c	more bugfixes	2019-04-04 22:05:12 -04:00
키에르	c582bdea46	Update bundle_ko.properties (#439 ) * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * Update bundle_ko.properties * match orignal bundle * Update bundle_ko.properties * Update bundle_ko.properties	2019-04-04 19:59:09 -06:00
laohuaji233	e6c6a9381b	Update bundle_zh_CN.properties (#440 ) * Update bundle_zh_CN.properties More translations and fixed some wrong words * Update bundle_zh_CN.properties	2019-04-04 19:58:05 -06:00
VXF	4b4c0755c6	Update bundle_zh_CN.properties (#441 )	2019-04-04 19:53:34 -06:00
Prosta4okua	aeb0539c91	Russian bundle (#443 ) * Go build communism * Update bundle_ru.properties Last commit: minimap * Update bundle_ru.properties * Update bundle_ru.properties * Update bundle_ru.properties * Update bundle_ru.properties	2019-04-04 19:53:02 -06:00
Prosta4okua	9feafa45f5	Ukrainian bundle (#444 ) * No. Routernism is better. Last commit: bugfixes * Update bundle_uk_UA.properties Last commit: minimap * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties	2019-04-04 19:52:09 -06:00
Math2128	927df391f3	Update bundle_fr.properties (#447 ) * Update bundle_fr.properties Haven't done much. If I have more time, I will work on it. If anyone else wants to contribute, make sure not to do the same as me ! :p * Update bundle_fr.properties * Update bundle_fr.properties * Update bundle_fr.properties Add a bit more. If anyone knows where to find all the filters in the game, please tell me. It'll help me get the word in context * Update bundle_fr.properties * Update bundle_fr.properties * Update bundle_fr.properties * Update bundle_fr.properties * Update bundle_fr.properties	2019-04-04 19:50:59 -06:00
Anuken	cbef6adeb1	Crafter bugfixes	2019-04-04 21:49:45 -04:00
Anuken	2dee221861	Crash fix	2019-04-04 20:39:04 -04:00