Various bugfixes

* Update bundle_ko.properties

* Update bundle_ko.properties

.gitignore

@@ -1,5 +1,6 @@
 ##Packr, build stuff
 
+logs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
@@ -25,6 +26,8 @@
 /core/assets/version.properties
 /core/assets/locales
 /ios/src/io/anuke/mindustry/gen/
+/core/src/io/anuke/mindustry/gen/
+ios/robovm.properties
 *.gif
 
 version.properties

.travis.yml

@@ -1,26 +1,20 @@
-language: android
 
 jdk:
 - openjdk8
-
-android:
-  components:
-    - android-28
-
-    # Additional components
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-    - addon-google_apis-google-28
-    - build-tools-28.0.3
-
 script:
-    - ./gradlew test
-    - ./gradlew desktop:dist
-    - ./gradlew server:dist
-
-after_success:
-    - chmod +x upload-build.sh
-    - chmod +x cleanup_builds.sh
-    - ./upload-build.sh
+- "./gradlew test"
+- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
+- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
 
+deploy:
+  provider: releases
+  skip_cleanup: true
+  draft: false
+  api_key:
+    secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
+  file:
+  - "desktop/build/libs/desktop-release.jar"
+  - "server/build/libs/server-release.jar"
+  on:
+    repo: Anuken/Mindustry
+    tags: true

README.md

@@ -11,27 +11,29 @@ _[Discord](https://discord.gg/r8BkXNd)_
 
 ### Building
 
-Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/Mindustry/wiki).
+Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://jenkins.hellomouse.net/job/mindustry/).
 
 If you'd rather compile on your own, follow these instructions.
 First, make sure you have Java 8 and JDK 8 installed. Open a terminal in the root directory, and run the following commands:
 
+#### Windows
 
-**_Windows_**
+_Running:_ `gradlew desktop:run`  
+_Building:_ `gradlew desktop:dist`
 
-_Running:_ `gradlew.bat desktop:run`  
-_Building:_ `gradlew.bat desktop:dist`
-
-
-**_Linux_**
+#### Linux
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`
 
+#### For Server Builds...
+
+Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server' i.e. `gradlew server:dist`.
+
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
-After building, 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` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
 
 ### Downloads
 

android/AndroidManifest.xml

@@ -20,7 +20,7 @@
         <activity
             android:name="io.anuke.mindustry.AndroidLauncher"
             android:label="@string/app_name"
-            android:screenOrientation="user"
+            android:screenOrientation="sensor"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
 
             <intent-filter>

android/build.gradle

@@ -1,3 +1,16 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
+    }
+    
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+    }
+}
 
 apply plugin: "com.android.application"
 
@@ -14,9 +27,9 @@ repositories {
 dependencies {
     implementation project(":core")
     implementation project(":kryonet")
-    implementation 'com.android.support:support-v4:25.3.1'
+    implementation 'com.android.support:support-v4:28.0.0'
     implementation 'org.sufficientlysecure:donations:2.5'
-    implementation 'com.google.android.gms:play-services-auth:11.8.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
     implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
@@ -24,6 +37,12 @@ dependencies {
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+    implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
     implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
 }
 
@@ -74,7 +93,7 @@ android {
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode code
         versionName versionNameResult
     }

android/res/layout/gdxdialogs_inputtext.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_root"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="10dp" >
-
-    <EditText
-        android:id="@+id/gdxDialogsEditTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:maxLines="1"
-         >
- 
-        <requestFocus />
- 
-    </EditText>
- 
-</LinearLayout>

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -19,17 +19,14 @@ import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
 import com.google.android.gms.common.GooglePlayServicesRepairableException;
 import com.google.android.gms.security.ProviderInstaller;
-import io.anuke.kryonet.DefaultThreadImpl;
 import io.anuke.kryonet.KryoClient;
 import io.anuke.kryonet.KryoServer;
 import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
 import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
 import io.anuke.ucore.function.Consumer;
-import io.anuke.ucore.scene.ui.TextField;
 import io.anuke.ucore.scene.ui.layout.Unit;
 import io.anuke.ucore.util.Bundles;
 import io.anuke.ucore.util.Strings;
@@ -38,12 +35,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -58,43 +50,16 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
         Platform.instance = new Platform(){
-            DateFormat format = SimpleDateFormat.getDateTimeInstance();
-
-            @Override
-            public String format(Date date){
-                return format.format(date);
-            }
-
-            @Override
-            public String format(int number){
-                return NumberFormat.getIntegerInstance().format(number);
-            }
-
-            @Override
-            public void addDialog(TextField field, int length){
-                TextFieldDialogListener.add(field, 0, length);
-            }
-
-            @Override
-            public String getLocaleName(Locale locale){
-                return locale.getDisplayName(locale);
-            }
 
             @Override
             public void openDonations(){
                 showDonations();
             }
 
-            @Override
-            public ThreadProvider getThreadProvider(){
-                return new DefaultThreadImpl();
-            }
-
             @Override
             public String getUUID(){
                 try{
-                    String s = Secure.getString(getContext().getContentResolver(),
-                    Secure.ANDROID_ID);
+                    String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
                     int len = s.length();
                     byte[] data = new byte[len / 2];
                     for(int i = 0; i < len; i += 2){
@@ -147,6 +112,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
                 return true;
             }
         };
+
         try{
             ProviderInstaller.installIfNeeded(this);
         }catch(GooglePlayServicesRepairableException e){

android/src/io/anuke/mindustry/AndroidTextFieldDialog.java

@@ -1,119 +0,0 @@
-package io.anuke.mindustry;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.text.InputFilter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.EditText;
-import com.badlogic.gdx.Gdx;
-
-public class AndroidTextFieldDialog{
-    private Activity activity;
-    private EditText userInput;
-    private AlertDialog.Builder builder;
-    private TextPromptListener listener;
-    private boolean isBuild;
-
-    public AndroidTextFieldDialog(){
-        this.activity = (Activity) Gdx.app;
-        load();
-    }
-
-    public AndroidTextFieldDialog show(){
-
-        activity.runOnUiThread(() -> {
-            AlertDialog dialog = builder.create();
-
-            dialog.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-            dialog.show();
-
-        });
-
-        return this;
-    }
-
-    private AndroidTextFieldDialog load(){
-
-        activity.runOnUiThread(() -> {
-
-            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(activity);
-            LayoutInflater li = LayoutInflater.from(activity);
-
-            View promptsView = li.inflate(getResourceId("gdxdialogs_inputtext", "layout"), null);
-
-            alertDialogBuilder.setView(promptsView);
-
-            userInput = promptsView.findViewById(getResourceId("gdxDialogsEditTextInput", "id"));
-
-            alertDialogBuilder.setCancelable(false);
-            builder = alertDialogBuilder;
-
-            isBuild = true;
-        });
-
-        // Wait till TextPrompt is built.
-        while(!isBuild){
-            try{
-                Thread.sleep(10);
-            }catch(InterruptedException ignored){
-            }
-        }
-
-        return this;
-    }
-
-    public int getResourceId(String pVariableName, String pVariableType){
-        try{
-            return activity.getResources().getIdentifier(pVariableName, pVariableType, activity.getPackageName());
-        }catch(Exception e){
-            Gdx.app.error("Android Dialogs", "Cannot find resouce with name: " + pVariableName
-                    + " Did you copy the layouts to /res/layouts and /res/layouts_v14 ?");
-            e.printStackTrace();
-            return -1;
-        }
-    }
-
-    public AndroidTextFieldDialog setText(CharSequence value){
-        userInput.append(value);
-        return this;
-    }
-
-    public AndroidTextFieldDialog setCancelButtonLabel(CharSequence label){
-        builder.setNegativeButton(label, (dialog, id) -> dialog.cancel());
-        return this;
-    }
-
-    public AndroidTextFieldDialog setConfirmButtonLabel(CharSequence label){
-        builder.setPositiveButton(label, (dialog, id) -> {
-            if(listener != null && !userInput.getText().toString().isEmpty()){
-                listener.confirm(userInput.getText().toString());
-            }
-
-        });
-        return this;
-    }
-
-    public AndroidTextFieldDialog setTextPromptListener(TextPromptListener listener){
-        this.listener = listener;
-        return this;
-    }
-
-    public AndroidTextFieldDialog setInputType(int type){
-        userInput.setInputType(type);
-        return this;
-    }
-
-    public AndroidTextFieldDialog setMaxLength(int length){
-        userInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(length)});
-        return this;
-    }
-
-    public interface TextPromptListener{
-        void confirm(String text);
-    }
-
-}

android/src/io/anuke/mindustry/DonationsActivity.java

@@ -68,7 +68,6 @@ public class DonationsActivity extends FragmentActivity{
         Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
         if(fragment != null){
             fragment.onActivityResult(requestCode, resultCode, data);
-            //TODO donation event, set settings?
         }
     }
 }

android/src/io/anuke/mindustry/TextFieldDialogListener.java

@@ -1,67 +0,0 @@
-package io.anuke.mindustry;
-
-
-import android.text.InputType;
-import com.badlogic.gdx.Application.ApplicationType;
-import com.badlogic.gdx.Gdx;
-import io.anuke.ucore.scene.event.ChangeListener;
-import io.anuke.ucore.scene.event.ClickListener;
-import io.anuke.ucore.scene.event.InputEvent;
-import io.anuke.ucore.scene.event.InputListener;
-import io.anuke.ucore.scene.ui.TextField;
-
-public class TextFieldDialogListener extends ClickListener{
-    private TextField field;
-    private int type;
-    private int max;
-
-    //type - 0 is text, 1 is numbers, 2 is decimals
-    public TextFieldDialogListener(TextField field, int type, int max){
-        this.field = field;
-        this.type = type;
-        this.max = max;
-    }
-
-    public static void add(TextField field, int type, int max){
-        field.addListener(new TextFieldDialogListener(field, type, max));
-        field.addListener(new InputListener(){
-            public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
-                Gdx.input.setOnscreenKeyboardVisible(false);
-                return false;
-            }
-        });
-    }
-
-    public static void add(TextField field){
-        add(field, 0, 16);
-    }
-
-    public void clicked(final InputEvent event, float x, float y){
-
-        if(Gdx.app.getType() == ApplicationType.Desktop) return;
-
-        AndroidTextFieldDialog dialog = new AndroidTextFieldDialog();
-
-        dialog.setTextPromptListener(text -> {
-            field.clearText();
-            field.appendText(text);
-            field.fire(new ChangeListener.ChangeEvent());
-            Gdx.graphics.requestRendering();
-        });
-
-        if(type == 0){
-            dialog.setInputType(InputType.TYPE_CLASS_TEXT);
-        }else if(type == 1){
-            dialog.setInputType(InputType.TYPE_CLASS_NUMBER);
-        }else if(type == 2){
-            dialog.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL);
-        }
-
-        dialog.setConfirmButtonLabel("OK").setText(field.getText());
-        dialog.setCancelButtonLabel("Cancel");
-        dialog.setMaxLength(max);
-        dialog.show();
-        event.cancel();
-
-    }
-}

annotations/build.gradle

@@ -1,4 +1,6 @@
 apply plugin: "java"
 
 sourceCompatibility = 1.8
-sourceSets.main.java.srcDirs = [ "src/" ]
+sourceSets.main.java.srcDirs = [ "src/main/java/" ]
+sourceSets.main.resources.srcDirs = [ "src/main/resources/" ]
+

annotations/src/main/java/io/anuke/annotations/ClassEntry.java

@@ -1,5 +1,7 @@
 package io.anuke.annotations;
 
+import io.anuke.annotations.MethodEntry;
+
 import java.util.ArrayList;
 
 /** Represents a class witha list method entries to include in it. */

annotations/src/main/java/io/anuke/annotations/RemoteReadGenerator.java

@@ -2,6 +2,8 @@ package io.anuke.annotations;
 
 import com.squareup.javapoet.*;
 import io.anuke.annotations.IOFinder.ClassSerializer;
+import io.anuke.annotations.MethodEntry;
+import io.anuke.annotations.Utils;
 
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;

annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java

@@ -52,7 +52,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.get(Class.forName("io.anuke.ucore.io.TypeSerializer")), type));
+                ClassName.bestGuess("io.anuke.ucore.io.TypeSerializer"), type));
 
                 MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
                 .returns(void.class)

annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -0,0 +1,2 @@
+io.anuke.annotations.RemoteMethodAnnotationProcessor
+io.anuke.annotations.SerializeAnnotationProcessor

build.gradle

@@ -8,8 +8,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
     }
 }
@@ -21,17 +19,17 @@ allprojects {
     version = 'release'
 
     ext {
-        versionNumber = '4.0'
+        versionNumber = '4'
         versionModifier = 'alpha'
         versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.8'
+        gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
-        uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f'
+        uCoreVersion = '09e13f973a0769d971316d1d4f4a1eef3570926f'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
-            return "$versionNumber-$versionType-$buildVersion"
+            return "$versionNumber-$versionModifier-$buildVersion"
         }
 
         getBuildVersion = {
@@ -97,28 +95,11 @@ project(":desktop") {
         compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
     }
 }
 
-project(":html") {
-    apply plugin: "gwt"
-    apply plugin: "war"
-
-    dependencies {
-        compile project(":core")
-        compileOnly project(":annotations")
-
-        compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
-        compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
-
-        compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources"
-        compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"
-    }
-}
-
 project(":ios") {
     apply plugin: "java"
     apply plugin: "robovm"
@@ -129,16 +110,34 @@ project(":ios") {
                 include "**/*.java"
             }
 
-            into "ios/src/io/anuke/mindustry/gen"
+            into "core/src/io/anuke/mindustry/gen"
         }
 
         doFirst{
             delete{
-                delete "ios/src/io/anuke/mindustry/gen/"
+                delete "core/src/io/anuke/mindustry/gen/"
             }
         }
     }
 
+    task incrementConfig{
+        def vfile = file('robovm.properties')
+
+        def props = new Properties()
+        if(vfile.exists()){
+            props.load(new FileInputStream(vfile))
+        }
+
+        props['app.id'] = 'io.anuke.mindustry'
+        props['app.version'] = '4.0'
+        props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
+        props['app.executable'] = 'IOSLauncher'
+        props['app.name'] = 'Mindustry'
+        props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
+        props.store(vfile.newWriter(), null)
+    }
+
+    build.dependsOn(incrementConfig)
     build.dependsOn(copyGen)
 
     dependencies {
@@ -149,6 +148,8 @@ project(":ios") {
         compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
         compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
+        compileOnly project(":annotations")
     }
 }
 
@@ -160,7 +161,6 @@ project(":core") {
     }
 
     dependencies {
-        compileOnly project(":annotations")
         build.finalizedBy(finish)
 
         def comp = System.properties["release"] == null || System.properties["release"] == "false"
@@ -178,11 +178,11 @@ project(":core") {
 
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
-    }
+        compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
 
-    compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor,io.anuke.annotations.SerializeAnnotationProcessor"
-    ]
+        compileOnly project(":annotations")
+        annotationProcessor project(":annotations")
+    }
 }
 
 project(":server") {
@@ -195,7 +195,6 @@ project(":server") {
     }
     
     dependencies {
-        compileOnly project(":annotations")
 
         compile project(":core")
         compile project(":kryonet")

core/assets/bundles/bundle.properties

@@ -1,16 +1,15 @@
-text.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!)
+text.credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
 text.credits = Credits
+text.contributors = Translators and Contributors
 text.discord = Join the mindustry discord!
-text.link.discord.description=the official Mindustry discord chatroom
+text.link.discord.description = The official Mindustry discord chatroom
 text.link.github.description = Game source code
 text.link.dev-builds.description = Unstable development builds
 text.link.trello.description = Official trello board for planned features
 text.link.itch.io.description = itch.io page with PC downloads and web version
 text.link.google-play.description = Google Play store listing
-text.link.wiki.description=official Mindustry wiki
-text.linkfail=Failed to open link!\nThe URL has been copied to your cliboard.
-text.editor.web=The web version does not support the editor!\nDownload the game to use it.
-text.web.unsupported=The web version does not support this feature! Download the game to use it.
+text.link.wiki.description = Official Mindustry wiki
+text.linkfail = Failed to open link!\nThe URL has been copied to your clipboard.
 text.gameover = Game Over
 text.gameover.pvp = The[accent] {0}[] team is victorious!
 text.sector.gameover = This sector has been lost. Re-deploy?
@@ -19,30 +18,14 @@ text.highscore=[accent]New highscore!
 text.wave.lasted = You lasted until wave [accent]{0}[].
 text.level.highscore = High Score: [accent]{0}
 text.level.delete.title = Confirm Delete
-text.map.delete=Are you sure you want to delete the map "[orange]{0}[]"?
+text.map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
 text.level.select = Level Select
 text.level.mode = Gamemode:
 text.construction.desktop = To deselect a block or stop building, [accent]use space[].
 text.construction.title = Block Construction Guide
-text.construction=\
-You've just selected [accent]block construction mode[].\n\n\
-To begin placing, simply tap a valid location near your ship.\n\
-Once you have selected some blocks, press the checkbox to confirm, and your ship will begin constructing them.\n\
-\n\
-- [accent]Remove blocks[] from your selection by tapping them.\n\
-- [accent]Shift the selection[] by holding and dragging any block in the selection.\n\
-- [accent]Place blocks in a line[] by tapping and holding an empty spot, then dragging in a direction.\n\
-- [accent]Cancel construction or selection[] by pressing the X at the bottom left.
-
+text.construction = You've just selected [accent]block construction mode[].\n\nTo begin placing, simply tap a valid location near your ship.\nOnce you have selected some blocks, press the checkbox to confirm, and your ship will begin constructing them.\n\n- [accent]Remove blocks[] from your selection by tapping them.\n- [accent]Shift the selection[] by holding and dragging any block in the selection.\n- [accent]Place blocks in a line[] by tapping and holding an empty spot, then dragging in a direction.\n- [accent]Cancel construction or selection[] by pressing the X at the bottom left.
 text.deconstruction.title = Block Deconstruction Guide
-text.deconstruction=\
-You've just selected [accent]block deconstruction mode[].\n\n\
-To begin breaking, simply tap a block near your ship.\n\
-Once you have selected some blocks, press the checkbox to confirm, and your ship will begin de-constructing them.\n\
-\n\
-- [accent]Remove blocks[] from your selection by tapping them.\n\
-- [accent]Remove blocks in an area[] by tapping and holding an empty spot, then dragging in a direction.\n\
-- [accent]Cancel deconstruction or selection[] by pressing the X at the bottom left.
+text.deconstruction = You've just selected [accent]block deconstruction mode[].\n\nTo begin breaking, simply tap a block near your ship.\nOnce you have selected some blocks, press the checkbox to confirm, and your ship will begin de-constructing them.\n\n- [accent]Remove blocks[] from your selection by tapping them.\n- [accent]Remove blocks in an area[] by tapping and holding an empty spot, then dragging in a direction.\n- [accent]Cancel deconstruction or selection[] by pressing the X at the bottom left.
 text.showagain = Don't show again next session
 text.coreattack = < Core is under attack! >
 text.unlocks = Unlocks
@@ -60,9 +43,9 @@ text.sector.abandon.confirm=Are you sure you want to abandon all progress at thi
 text.sector.resume = Resume
 text.sector.locked = [scarlet][[Incomplete]
 text.sector.unexplored = [accent][[Unexplored]
-
 text.missions = Missions:[LIGHT_GRAY] {0}
 text.mission = Mission:[LIGHT_GRAY] {0}
+text.mission.main = Main Mission:[LIGHT_GRAY] {0}
 text.mission.info = Mission Info
 text.mission.complete = Mission complete!
 text.mission.complete.body = Sector {0},{1} has been conquered.
@@ -70,7 +53,7 @@ text.mission.wave=Survive[accent] {0}/{1} []waves\nWave in {2}
 text.mission.wave.enemies = Survive[accent] {0}/{1} []waves\n{2} Enemies
 text.mission.wave.enemy = Survive[accent] {0}/{1} []waves\n{2} Enemy
 text.mission.wave.menu = Survive[accent] {0}[] waves
-text.mission.battle=Destroy the enemy core
+text.mission.battle = Destroy enemy core
 text.mission.resource.menu = Obtain {0} x{1}
 text.mission.resource = Obtain {0}:\n[accent]{1}/{2}[]
 text.mission.block = Create {0}
@@ -80,7 +63,6 @@ text.mission.linknode=Link Power Node
 text.mission.display = [accent]Mission:\n[LIGHT_GRAY]{0}
 text.mission.mech = Switch to mech[accent] {0}[]
 text.mission.create = Create[accent] {0}[]
-
 text.none = <none>
 text.close = Close
 text.quit = Quit
@@ -90,11 +72,12 @@ text.nextmission=Next Mission
 text.maps.none = [LIGHT_GRAY]No maps found!
 text.about.button = About
 text.name = Name:
+text.noname = Pick a[accent] player name[] first.
+text.filename = File Name:
 text.unlocked = New Block Unlocked!
 text.unlocked.plural = New Blocks Unlocked!
 text.players = {0} players online
 text.players.single = {0} player online
-text.server.mismatch=Packet error: possible client/server version mismatch.\nMake sure you and the host have the\nlatest version of Mindustry!
 text.server.closing = [accent]Closing server...
 text.server.kicked.kick = You have been kicked from the server!
 text.server.kicked.serverClose = Server closed.
@@ -154,11 +137,10 @@ text.disconnect=Disconnected.
 text.disconnect.data = Failed to load world data!
 text.connecting = [accent]Connecting...
 text.connecting.data = [accent]Loading world data...
-text.connectfail=[crimson]Failed to connect to server: [orange]{0}
 text.server.port = Port:
 text.server.addressinuse = Address already in use!
 text.server.invalidport = Invalid port number!
-text.server.error=[crimson]Error hosting server: [orange]{0}
+text.server.error = [crimson]Error hosting server: [accent]{0}
 text.save.old = This save is for an older version of the game, and can no longer be used.\n\n[LIGHT_GRAY]Save backwards compatibility will be implemented in the full 4.0 release.
 text.save.new = New Save
 text.save.overwrite = Are you sure you want to overwrite\nthis save slot?
@@ -169,17 +151,17 @@ text.savefail=Failed to save game!
 text.save.delete.confirm = Are you sure you want to delete this save?
 text.save.delete = Delete
 text.save.export = Export Save
-text.save.import.invalid=[orange]This save is invalid!
-text.save.import.fail=[crimson]Failed to import save: [orange]{0}
-text.save.export.fail=[crimson]Failed to export save: [orange]{0}
+text.save.import.invalid = [accent]This save is invalid!
+text.save.import.fail = [crimson]Failed to import save: [accent]{0}
+text.save.export.fail = [crimson]Failed to export save: [accent]{0}
 text.save.import = Import Save
 text.save.newslot = Save name:
 text.save.rename = Rename
 text.save.rename.text = New name:
 text.selectslot = Select a save.
 text.slot = [accent]Slot {0}
-text.save.corrupted=[orange]Save file corrupted or invalid!\nIf you have just updated your game, this is probably a change in the save format and [scarlet]not[] a bug.
-text.sector.corrupted=[orange]A save file for this sector was found, but loading failed.\nA new one has been created.
+text.save.corrupted = [accent]Save file corrupted or invalid!\nIf you have just updated your game, this is probably a change in the save format and [scarlet]not[] a bug.
+text.sector.corrupted = [accent]A save file for this sector was found, but loading failed.\nA new one has been created.
 text.empty = <empty>
 text.on = On
 text.off = Off
@@ -200,14 +182,14 @@ text.back=Back
 text.quit.confirm = Are you sure you want to quit?
 text.changelog.title = Changelog
 text.changelog.loading = Getting changelog...
-text.changelog.error.android=[orange]Note that the changelog sometimes does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
-text.changelog.error.ios=[orange]The changelog is currently not supported in iOS.
+text.changelog.error.android = [accent]Note that the changelog sometimes does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
+text.changelog.error.ios = [accent]The changelog is currently not supported in iOS.
 text.changelog.error = [scarlet]Error getting changelog!\nCheck your internet connection.
 text.changelog.current = [yellow][[Current version]
-text.changelog.latest=[orange][[Latest version]
+text.changelog.latest = [accent][[Latest version]
 text.loading = [accent]Loading...
 text.saving = [accent]Saving...
-text.wave=[orange]Wave {0}
+text.wave = [accent]Wave {0}
 text.wave.waiting = [LIGHT_GRAY]Wave in {0}
 text.waiting = [LIGHT_GRAY]Waiting...
 text.waiting.players = Waiting for players...
@@ -234,9 +216,8 @@ text.editor.description=Description:
 text.editor.name = Name:
 text.editor.teams = Teams
 text.editor.elevation = Elevation
-text.editor.badsize=[orange]Invalid image dimensions![]\nValid map dimensions: {0}
-text.editor.errorimageload=Error loading file:\n[orange]{0}
-text.editor.errorimagesave=Error saving file:\n[orange]{0}
+text.editor.errorimageload = Error loading file:\n[accent]{0}
+text.editor.errorimagesave = Error saving file:\n[accent]{0}
 text.editor.generate = Generate
 text.editor.resize = Resize
 text.editor.loadmap = Load Map
@@ -280,6 +261,16 @@ text.tutorial=Tutorial
 text.editor = Editor
 text.mapeditor = Map Editor
 text.donate = Donate
+
+text.connectfail = [crimson]Failed to connect to server:\n\n[accent]{0}
+text.error.unreachable = Server unreachable.\nIs the address spelled correctly?
+text.error.invalidaddress = Invalid address.
+text.error.timedout = Timed out!\nMake sure the host has port forwarding set up, and that the address is correct!
+text.error.mismatch = Packet error:\npossible client/server version mismatch.\nMake sure you and the host have the latest version of Mindustry!
+text.error.alreadyconnected = Already connected.
+text.error.mapnotfound = Map file not found!
+text.error.any = Unknown network error.
+
 text.settings.language = Language
 text.settings.reset = Reset to Defaults
 text.settings.rebind = Rebind
@@ -293,12 +284,13 @@ text.settings.clearall.confirm=[scarlet]WARNING![]\nThis will clear all data, in
 text.settings.clearsectors = Clear Sectors
 text.settings.clearunlocks = Clear Unlocks
 text.settings.clearall = Clear All
-text.paused=Paused
+text.paused = [accent]< Paused >
 text.yes = Yes
 text.no = No
 text.info.title = Info
 text.error.title = [crimson]An error has occured
 text.error.crashtitle = An error has occured
+text.blocks.unknown=[LIGHT_GRAY]???
 text.blocks.blockinfo = Block Info
 text.blocks.powercapacity = Power Capacity
 text.blocks.powershot = Power/Shot
@@ -314,7 +306,7 @@ text.blocks.powerdamage=Power/Damage
 text.blocks.inputitemcapacity = Input Item Capacity
 text.blocks.outputitemcapacity = Output Item Capacity
 text.blocks.itemcapacity = Item Capacity
-text.blocks.maxpowergeneration=Max Power Generation
+text.blocks.basepowergeneration = Base Power Generation
 text.blocks.powertransferspeed = Power Transfer
 text.blocks.craftspeed = Production Speed
 text.blocks.inputliquid = Input Liquid
@@ -325,12 +317,14 @@ text.blocks.outputitem=Output Item
 text.blocks.drilltier = Drillables
 text.blocks.drillspeed = Base Drill Speed
 text.blocks.liquidoutput = Liquid Output
+text.blocks.liquidoutputspeed = Liquid Output Speed
 text.blocks.liquiduse = Liquid Use
 text.blocks.coolant = Coolant
 text.blocks.coolantuse = Coolant Use
 text.blocks.inputliquidfuel = Fuel Liquid
 text.blocks.liquidfueluse = Liquid Fuel Use
-text.blocks.explosive=Highly explosive!
+text.blocks.boostitem = Boost Item
+text.blocks.boostliquid = Boost Liquid
 text.blocks.health = Health
 text.blocks.inaccuracy = Inaccuracy
 text.blocks.shots = Shots
@@ -339,7 +333,6 @@ text.blocks.inputfuel=Fuel
 text.blocks.fuelburntime = Fuel Burn Time
 text.blocks.inputcapacity = Input capacity
 text.blocks.outputcapacity = Output capacity
-
 text.unit.blocks = blocks
 text.unit.powersecond = power units/second
 text.unit.liquidsecond = liquid units/second
@@ -349,15 +342,14 @@ text.unit.liquidunits=liquid units
 text.unit.powerunits = power units
 text.unit.degrees = degrees
 text.unit.seconds = seconds
-text.unit.none=
 text.unit.items = items
-
 text.category.general = General
 text.category.power = Power
 text.category.liquids = Liquids
 text.category.items = Items
 text.category.crafting = Crafting
 text.category.shooting = Shooting
+text.category.optional = Optional Enhancements
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
 setting.fpscap.none = None
@@ -367,35 +359,29 @@ setting.difficulty.easy=easy
 setting.difficulty.normal = normal
 setting.difficulty.hard = hard
 setting.difficulty.insane = insane
-setting.difficulty.purge=purge
 setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
-setting.indicators.name=Enemy Indicators
 setting.effects.name = Display Effects
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Autosave Interval
 setting.seconds = {0} Seconds
 setting.fullscreen.name = Fullscreen
-setting.multithread.name=Multithreading
 setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.lasers.name = Show Power Lasers
-setting.healthbars.name=Show Entity Health bars
 setting.minimap.name = Show Minimap
 setting.musicvol.name = Music Volume
 setting.mutemusic.name = Mute Music
 setting.sfxvol.name = SFX Volume
 setting.mutesound.name = Mute Sound
+setting.crashreport.name = Send Anonymous Crash Reports
 text.keybind.title = Rebind Keys
-
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
-
 command.attack = Attack
 command.retreat = Retreat
 command.patrol = Patrol
-
 keybind.press = Press a key...
 keybind.press.axis = Press an axis or key...
 keybind.move_x.name = Move x
@@ -419,24 +405,20 @@ 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
-
 mode.text.help.title = Description of modes
 mode.waves.name = waves
 mode.waves.description = the normal mode. limited resources and automatic incoming waves.
 mode.sandbox.name = sandbox
 mode.sandbox.description = infinite resources and no timer for waves.
-mode.custom.warning=Note that blocks unlocked in custom games are not carried over to sectors.\n\n[LIGHT_GRAY]In sandbox, only blocks unlocked with sector play can be used.
 mode.freebuild.name = freebuild
 mode.freebuild.description = limited resources and no timer for waves.
 mode.pvp.name = PvP
 mode.pvp.description = fight against other players locally.
-
 content.item.name = Items
 content.liquid.name = Liquids
 content.unit.name = Units
 content.recipe.name = Blocks
 content.mech.name = Mechs
-
 item.stone.name = Stone
 item.stone.description = A common raw material. Used for separating and refining into other materials, or melting into lava.
 item.copper.name = Copper
@@ -452,11 +434,13 @@ item.titanium.description=A rare super-light metal used extensively in liquid tr
 item.thorium.name = Thorium
 item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
 item.silicon.name = Silicon
-item.silcion.description=An extremely useful semiconductor, with applications in solar panels and many complex electronics.
+item.silicon.description = An extremely useful semiconductor, with applications in solar panels and many complex electronics.
 item.plastanium.name = Plastanium
 item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
-item.phase-matter.name=Phase Matter
+item.phase-fabric.name = Phase Fabric
+item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
 item.surge-alloy.name = Surge Alloy
+item.surge-alloy.description = An advanced alloy with unique electrical properties.
 item.biomatter.name = Biomatter
 item.biomatter.description = A clump of organic mush; used for conversion into oil or as a basic fuel.
 item.sand.name = Sand
@@ -465,12 +449,10 @@ item.blast-compound.name=Blast Compound
 item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.name = Pyratite
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.
-
 liquid.water.name = Water
 liquid.lava.name = Lava
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
-
 mech.alpha-mech.name = Alpha
 mech.alpha-mech.weapon = Heavy Repeater
 mech.alpha-mech.ability = Drone Swarm
@@ -500,45 +482,39 @@ mech.trident-ship.weapon=Bomb Bay
 mech.glaive-ship.name = Glaive
 mech.glaive-ship.description = A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed.
 mech.glaive-ship.weapon = Flame Repeater
-
-text.item.explosiveness=[LIGHT_GRAY]Explosiveness: {0}
-text.item.flammability=[LIGHT_GRAY]Flammability: {0}
-text.item.radioactivity=[LIGHT_GRAY]Radioactivity: {0}
-text.item.fluxiness=[LIGHT_GRAY]Flux Power: {0}
-text.item.hardness=[LIGHT_GRAY]Hardness: {0}
-
+text.item.explosiveness = [LIGHT_GRAY]Explosiveness: {0}%
+text.item.flammability = [LIGHT_GRAY]Flammability: {0}%
+text.item.radioactivity = [LIGHT_GRAY]Radioactivity: {0}%
+text.item.fluxiness = [LIGHT_GRAY]Flux Power: {0}%
 text.unit.health = [LIGHT_GRAY]Health: {0}
 text.unit.speed = [LIGHT_GRAY]Speed: {0}
-
 text.mech.weapon = [LIGHT_GRAY]Weapon: {0}
 text.mech.armor = [LIGHT_GRAY]Armor: {0}
 text.mech.itemcapacity = [LIGHT_GRAY]Item Capacity: {0}
 text.mech.minespeed = [LIGHT_GRAY]Mining Speed: {0}
 text.mech.minepower = [LIGHT_GRAY]Mining Power: {0}
 text.mech.ability = [LIGHT_GRAY]Ability: {0}
-
-
 text.liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 text.liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 text.liquid.temperature = [LIGHT_GRAY]Temperature: {0}
-
+block.constructing = {0} [LIGHT_GRAY](Constructing)
 block.spawn.name = Enemy Spawn
 block.core.name = Core
 block.metalfloor.name = Metal Floor
 block.deepwater.name = deepwater
 block.water.name = water
 block.lava.name = lava
-block.oil.name=oil
-block.blackstone.name=blackstone
-block.stone.name=stone
-block.dirt.name=dirt
-block.sand.name=sand
-block.ice.name=ice
-block.snow.name=snow
-block.grass.name=grass
-block.shrub.name=shrub
-block.rock.name=rock
-block.blackrock.name=blackrock
+block.tar.name = Tar
+block.blackstone.name = Black Stone
+block.stone.name = Stone
+block.dirt.name = Dirt
+block.sand.name = Sand
+block.ice.name = Ice
+block.snow.name = Snow
+block.grass.name = Grass
+block.shrub.name = Shrub
+block.rock.name = Rock
+block.blackrock.name = Black Rock
 block.icerock.name = icerock
 block.copper-wall.name = Copper Wall
 block.copper-wall-large.name = Large Copper Wall
@@ -558,15 +534,11 @@ block.conveyor.name=Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
 block.junction.name = Junction
 block.router.name = Router
-block.router.description=Splits items into all 4 directions.
 block.distributor.name = Distributor
-block.distributor.description=A splitter that can split items into 8 directions.
 block.sorter.name = Sorter
 block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
 block.overflow-gate.name = Overflow Gate
 block.overflow-gate.description = A combination splitter and router that only outputs to the left and right if the front path is blocked.
-block.bridgeconveyor.name=Bridge Conveyor
-block.bridgeconveyor.description=A conveyor that can go over other blocks, for up to two total blocks.
 block.smelter.name = Smelter
 block.arc-smelter.name = Arc Smelter
 block.silicon-smelter.name = Silicon Smelter
@@ -605,7 +577,6 @@ block.liquidsource.name=Liquid Source
 block.powervoid.name = Power Void
 block.powerinfinite.name = Power Infinite
 block.unloader.name = Unloader
-block.sortedunloader.name=Sorted Unloader
 block.vault.name = Vault
 block.wave.name = Wave
 block.swarmer.name = Swarmer
@@ -656,32 +627,30 @@ block.rtg-generator.name=RTG Generator
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.container.name = Container
-
+block.core.description = The most important building in the game.
 team.blue.name = blue
 team.red.name = red
 team.orange.name = orange
 team.none.name = gray
 team.green.name = green
 team.purple.name = purple
-
 unit.alpha-drone.name = Alpha Drone
 unit.spirit.name = Spirit Drone
-unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
+unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores and repairs blocks.
 unit.phantom.name = Phantom Drone
-unit.phantom.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
+unit.phantom.description = An advanced drone unit. Automatically mines ores and repairs blocks. Significantly more effective than a spirit drone.
 unit.dagger.name = Dagger
 unit.dagger.description = A basic ground unit. Useful in swarms.
 unit.titan.name = Titan
 unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets.
 unit.ghoul.name = Ghoul Bomber
-unit.ghoul.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo.
+unit.ghoul.description = A heavy carpet bomber.
 unit.wraith.name = Wraith Fighter
 unit.wraith.description = A fast, hit-and-run interceptor unit.
 unit.fortress.name = Fortress
 unit.fortress.description = A heavy artillery ground unit.
 unit.revenant.name = Revenant
 unit.revenant.description = A heavy laser platform.
-
 tutorial.begin = Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
 tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
 tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
@@ -703,3 +672,113 @@ tutorial.daggerfactory=Construct a[accent] dagger mech factory.[]\n\nThis will b
 tutorial.router = Factories need resources to function.\nCreate a router to split conveyor resources.
 tutorial.dagger = Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
 tutorial.battle = The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
+block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.
+block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
+block.dense-alloy-wall.description = A standard defensive block.\nAdequate protection from enemies.
+block.dense-alloy-wall-large.description = A standard defensive block.\nAdequate protection from enemies.\nSpans multiple tiles.
+block.thorium-wall.description = A strong defensive block.\nGood protection from enemies.
+block.thorium-wall-large.description = A strong defensive block.\nGood protection from enemies.\nSpans multiple tiles.
+block.phase-wall.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.
+block.phase-wall-large.description = Not as strong as a thorium wall but will deflect bullets unless they are too powerful.\nSpans multiple tiles.
+block.surge-wall.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.
+block.surge-wall-large.description = The strongest defensive block.\nHas a small chance of triggering lightning towards the attacker.\nSpans multiple tiles.
+block.door.description = A small door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.
+block.door-large.description = A large door that can be opened and closed by tapping on it.\nIf opened, enemies can shoot and move through.\nSpans multiple tiles.
+block.mend-projector.description = Periodically heals blocks in its vicinity.
+block.overdrive-projector.description = Increases the speed of nearby buildings like drills and conveyors.
+block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage through bullets.
+block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
+block.duo.description = A small, cheap turret.
+block.arc.description = A small turret which shoots electricity in a random arc towards the enemy.
+block.hail.description = A small artillery turret.
+block.lancer.description = A medium-sized turret which shoots charged electricity beams.
+block.wave.description = A medium-sized rapid-fire turret which shoots liquid bubbles.
+block.salvo.description = A medium-sized turret which fires shots in salvos.
+block.swarmer.description = A medium-sized turret which shoots burst missiles.
+block.ripple.description = A large artillery turret which fires several shots simultaneously.
+block.cyclone.description = A large rapid fire turret.
+block.fuse.description = A large turret which shoots powerful short-range beams.
+block.spectre.description = A large turret which shoots two powerful bullets at once.
+block.meltdown.description = A large turret which shoots powerful long-range beams.
+block.conveyor.description = Basic item transport block. Moved items forward and automatically deposits them into turrets or crafters. Rotatable.
+block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
+block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
+block.mass-driver.description = Ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range.
+block.smelter.description = Burns coal for smelting copper and lead into dense alloy.
+block.arc-smelter.description = Smelts copper and lead into dense alloy by using an external power source.
+block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.
+block.plastanium-compressor.description = Produces plastanium from oil and titanium.
+block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
+block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper.
+block.pulverizer.description = Crushes stone into sand. Useful when there is a lack of natural sand.
+block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
+block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound.
+block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling.
+block.solidifer.description = Cools lava to stone at a fast pace.
+block.melter.description = Heats up stone to very high temperatures to obtain lava.
+block.incinerator.description = Gets rid of any excess item or liquid.
+block.biomattercompressor.description = Compresses biomatter in order to retrieve oil.
+block.separator.description = Exposes stone to water pressure in order to obtain various minerals contained in the stone.
+block.centrifuge.description = More efficient than the separator, but also more expensive to build and requires power.
+block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
+block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes.
+block.battery.description = Stores power whenever there is an abundance and provides power whenever there is a shortage, as long as there is capacity left.
+block.battery-large.description = Stores much more power than a regular battery.
+block.combustion-generator.description = Generates power by burning oil or flammable materials.
+block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
+block.thermal-generator.description = Generates a large amount of power from lava.
+block.solar-panel.description = Provides a small amount of power from the sun.
+block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
+block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at half capacity.
+block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
+block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
+block.container.description = Stores a small amount of items of each type. Adjacent containers, vaults and cores will be treated as a single storage unit. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the container.
+block.vault.description = Stores a large amount of items of each type. Adjacent containers, vaults and cores will be treated as a single storage unit. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the vault.
+block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely.
+block.pneumatic-drill.description = An improved drill which is faster and able to process harder materials by making use of air pressure.
+block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
+block.blast-drill.description = The ultimate drill. Requires large amounts of power.
+block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
+block.cultivator.description = Cultivates the soil with water in order to obtain biomatter.
+block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
+block.dart-ship-pad.description = Leave your current vessel and change into a basic fighter aircraft.\nUse the pad by double tapping while standing on it.
+block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it.
+block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it.
+block.glaive-ship-pad.description = Leave your current vessel and change into a large, well-armored gunship.\nUse the pad by double tapping while standing on it.
+block.tau-mech-pad.description = Leave your current vessel and change into a support mech which can heal friendly buildings and units.\nUse the pad by double tapping while standing on it.
+block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it.
+block.omega-mech-pad.description = Leave your current vessel and change into a bulky and well-armored mech, made for front-line assaults.\nUse the pad by double tapping while standing on it.
+block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
+block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.
+block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
+block.ghoul-factory.description = Produces heavy carpet bombers.
+block.dagger-factory.description = Produces basic ground units.
+block.titan-factory.description = Produces advanced, armored ground units.
+block.fortress-factory.description = Produces heavy artillery ground units.
+block.revenant-factory.description = Produces heavy laser air units.
+block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.command-center.description = Allows changing friendly AI behavior. Currently, attack, retreat and patrol commands are supported.
+block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
+block.pulse-conduit.description = Advanced liquid transport block. Transports liquids faster and stores more than standard conduits.
+block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
+block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets.
+block.liquid-tank.description = Stores a large amount of liquids. Use it for creating buffers when there is a non-constant demand of materials or as a safeguard for cooling vital blocks.
+block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations.
+block.bridge-conduit.description = Advanced liquid transport block. Allows transporting liquids over up to 3 tiles of any terrain or building.
+block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
+block.rotary-pump.description = An advanced pump which doubles up speed by using power.
+block.thermal-pump.description = The ultimate pump. Three times as fast as a mechanical pump and the only pump which is able to retrieve lava.
+block.router.description = Accepts items from one direction and outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.
+block.distributor.description = An advanced router which splits items to up to 7 other directions equally.
+block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
+block.alpha-mech-pad.description = When given enough power, rebuilds your ship into the[accent] Alpha[] mech.
+block.itemsource.description = Infinitely outputs items. Sandbox only.
+block.liquidsource.description = Infinitely outputs liquids. Sandbox only.
+block.itemvoid.description = Destroys any items which go into it without using power. Sandbox only.
+block.powerinfinite.description = Infinitely outputs power. Sandbox only.
+block.powervoid.description = Voids all power inputted into it. Sandbox only.
+liquid.water.description = Commonly used for cooling machines and waste processing.
+liquid.lava.description = Can be transformed into[LIGHT_GRAY] stone[], used for generating power or used as ammo for certain turrets.
+liquid.oil.description = Can be burnt, exploded or used as a coolant.
+liquid.cryofluid.description = The most efficient liquid for cooling things down.

core/assets/bundles/bundle_es.properties

@@ -7,45 +7,61 @@ text.link.dev-builds.description=Versiones de desarrollo inestable
 text.link.trello.description = Tablero de Trello oficial para las características planificadas
 text.link.itch.io.description = itch.io es la página donde podes descargar las versiones para PC y web
 text.link.google-play.description = Ficha en la Google Play Store
-text.link.wiki.description=wiki oficial de Mindustry
+text.link.wiki.description = Wiki oficial de Mindustry
 text.linkfail = ¡Error al abrir el enlace!\nLa URL ha sido copiada a su portapapeles.
-text.editor.web=¡La versión web no es compatible con el editor!\nDescargue el juego para usarlo.
-text.web.unsupported=¡La versión web no soporta esta característica! Descarga el juego para poder usarla.
 text.gameover = Tu núcleo ha sido destruido.
-text.sector.gameover=Este sector ha sido perdido. ¿Re-instaurar?
+text.gameover.pvp = ¡El equipo[accent] {0}[] ha ganado!
+text.sector.gameover = Este sector ha sido perdido. ¿Re-desplegar?
 text.sector.retry = Reintentar
 text.highscore = [accent]¡Nueva mejor puntuación!
 text.wave.lasted = Duraste hasta la ronda [accent]{0}[].
-text.level.highscore=Puntuación màs alta: [accent]{0}
+text.level.highscore = Puntuación más alta: [accent]{0}
 text.level.delete.title = Confirmar Eliminación
-text.map.delete=¿Estás seguro que quieres borrar el mapa "[orange]{0}[]"?
+text.map.delete = ¿Estás seguro que quieres borrar el mapa "[accent]{0}[]"?
 text.level.select = Selección de nivel
 text.level.mode = Modo de juego:
+text.construction.desktop = Los controles de la versión de escritorio han cambiado.\nPara deseleccionar un bloque o dejar de construir, [accent]usa la space tab[].
 text.construction.title = Guía de Construcción de Bloques
 text.construction = Acaba de seleccionar el [accent]modo de construcción de bloques[].\n\nPara empezar a colocar, simplemente presione en una localización valida cerca de su nave.\nCuando haya terminado de seleccionar algunos bloques, presiona la casilla para confirmar, y su nave empezara a construirlos.\n\n- [accent]Remueve bloques[] de tu selección presionando en ellos.\n- [accent]Cambia tu selección de lugar[] manteniendo y arrastrando cualquier bloque en la selección.\n- [accent]Coloca bloques en línea[] presionando y manteniendo en un espacio vacío, y arrastrando hacia cualquier dirección.\n- [accent]Cancela la construcción o selección[] presionando la X abajo a la izquierda.
 text.deconstruction.title = Guía de Deconstrucción de Bloques
-text.deconstruction=Acaba de seleccionar el [accent]modo de deconstrucción de bloques[].\n\nPara empezar a destruir, simplemente presione en un bloque cercano a su nave.\nCuando haya terminado de seleccionar algunos bloques, presiona la casilla para confirmar, y su nave empezara a de-construirlos.\n\n- [accent]Remueve bloques[] de tu selección presionando en ellos.\n- [accent]Remueve bloques en un area[] presionando y manteniendo en un espacio vacío, y arrastrando hacia cualquier dirección.\n- [accent]Cancela la deconstrucción o selección[] presionando la X abajo a la izquierda.
-text.showagain=No mostrar devuelta en la próxima sesión
+text.deconstruction = Acaba de seleccionar el [accent]modo de deconstrucción de blocks[].\n\nPara empezar a destruir, simplemente presione en un bloque cercano a su nave.\nCuando haya terminado de seleccionar algunos bloques, presiona la casilla para confirmar, y su nave empezara a de-construirlos.\n\n- [accent]Remueve bloques[] de tu selección presionando en ellos.\n- [accent]Remueve bloques en un area[] presionando y manteniendo en un espacio vacío, y arrastrando hacia cualquier dirección.\n- [accent]Cancela la deconstrucción o selección[] presionando la X abajo a la izquierda.
+text.showagain = No mostrar otra vez en la próxima sesión
 text.coreattack = < ¡El núcleo está bajo ataque! >
 text.unlocks = Desbloqueos
 text.savegame = Guardar Partida
 text.loadgame = Cargar Partida
 text.joingame = Unirse a la Partida
-text.addplayers=Agregar/Remover Jugadores
+text.addplayers = Agregar/Quitar Jugadores
 text.customgame = Partida personalizada
 text.sectors = Sectores
 text.sector = Sector: [LIGHT_GRAY]{0}
 text.sector.time = Tiempo: [LIGHT_GRAY]{0}
 text.sector.deploy = Desplegar
-text.sector.resume=Resumir
+text.sector.abandon = Abandonar
+text.sector.abandon.confirm = ¿Realmente quieres abandonar todo el progreso hecho en este sector?\n¡Esto no se puede deshacer!
+text.sector.resume = Continuar
 text.sector.locked = [scarlet][[Incompleto]
-text.sector.unexplored=[accent][[Inexplorado]
+text.sector.unexplored = [accent][[No explorado]
+text.missions = Misiones:[LIGHT_GRAY] {0}
 text.mission = Misión:[LIGHT_GRAY] {0}
+text.mission.main = Misión Principal:[LIGHT_GRAY] {0}
+text.mission.info = Información de la Misión
 text.mission.complete = ¡Misión completada!
-text.mission.complete.body=Sector {0},{1} ha sido conquistado.
-text.mission.wave=Sobrevive [accent]{0}[] hordas.
+text.mission.complete.body = El Sector {0},{1} ha sido conquistado.
+text.mission.wave = Sobrevive [accent]{0}/{1}[] hordas\nHordas en {2}
+text.mission.wave.enemies = Sobrevive[accent] {0}/{1} []hordas\n{2} Enemigas
+text.mission.wave.enemy = Sobrevive[accent] {0}/{1} []hordas\n{2} Enemigas
+text.mission.wave.menu = Sobrevive[accent] {0} []hordas
 text.mission.battle = Destruye la base enemiga.
+text.mission.resource.menu = Obtener {0} x{1}
 text.mission.resource = Obtén {0} x{1}
+text.mission.block = Crear {0}
+text.mission.unit = Crear {0}
+text.mission.command = Envía Comando {0} a las unidades
+text.mission.linknode = Conecta nodo de energía
+text.mission.display = [accent]Misión:\n[LIGHT_GRAY]{0}
+text.mission.mech = Cambiar a mecanoide[accent] {0}[]
+text.mission.create = Crear[accent] {0}[]
 text.none = <no hay>
 text.close = Cerrar
 text.quit = Salir
@@ -55,32 +71,33 @@ text.nextmission=Próxima Misión
 text.maps.none = [LIGHT_GRAY]¡No se han encontrado mapas!
 text.about.button = Acerca de
 text.name = Nombre:
+text.filename = Nombre del archivo:
 text.unlocked = ¡Nuevo Bloque Desbloqueado!
 text.unlocked.plural = ¡Nuevos Bloques Desbloqueados!
 text.players = {0} jugadores online
 text.players.single = {0} jugador online
-text.server.mismatch=Error de paquete: posiblemente versión incompatible de cliente/servidor.\n¡Asegurate de que tu y el anfitrión tengan\nla última versión de Mindustry!
 text.server.closing = [accent]Cerrando servidor...
-text.server.kicked.kick=¡Has sido kickeado del servidor!
+text.server.kicked.kick = ¡Has sido expulsado del servidor!
 text.server.kicked.serverClose = El servidor ha cerrado.
 text.server.kicked.sectorComplete = Sector completado.
-text.server.kicked.sectorComplete.text=Tu misión ha sido completada.\nEl servidor ahora continuara con el próximo sector.
+text.server.kicked.sectorComplete.text = Tu misión ha sido completada.\nEl servidor ahora continuará con el próximo sector.
 text.server.kicked.clientOutdated = ¡Cliente desactualizado! ¡Actualiza tu juego!
 text.server.kicked.serverOutdated = ¡Servidor desactualizado! ¡Pídele al anfitrión que lo actualice!
 text.server.kicked.banned = Has sido baneado del servidor.
-text.server.kicked.recentKick=Has sido kickeado recientemente.\nEspera para poder conectarte devuelta.
-text.server.kicked.nameInUse=Ya hay alguien con ese nombre\nen el servidor.
+text.server.kicked.recentKick = Has sido expulsado recientemente.\nEspera para poder conectarte de nuevo.
+text.server.kicked.nameInUse = Ya hay alguien con ese\nnombre en el servidor.
 text.server.kicked.nameEmpty = Tu nombre debe por lo menos contener un carácter o número.
 text.server.kicked.idInUse = ¡Ya estás en el servidor! Conectarse con dos cuentas no está permitido.
 text.server.kicked.customClient = Este servidor no soporta versiones personalizadas. Descarga una versión oficial.
-text.host.info=El botón [accent]hostear[] hostea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [LIGHT_GRAY]wifi o red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar por IP, la [accent]asignación de puertos[] es requerida.\n\n[LIGHT_GRAY]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall.
-text.join.info=Acá, tu puedes escribir la [accent]IP de un servidor[] para conectarte, o para descubrir servidores de [accent]red local[] para conectarte.\nLAN y WAN es soportado para jugar en multijugador.\n\n[LIGHT_GRAY]Nota: No hay lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP.
+text.host.info = El botón [accent]host[] hostea un servidor en el puerto [scarlet]6567[]. \nCualquier persona en la misma [LIGHT_GRAY]wifi o red local[] debería poder ver tu servidor en la lista de servidores.\n\nSi quieres que cualquier persona se pueda conectar de cualquier lugar por IP, la [accent]asignación de puertos[] es requerida.\n\n[LIGHT_GRAY]Nota: Si alguien experimenta problemas conectándose a tu partida LAN, asegúrate de permitir a Mindustry acceso a tu red local mediante la configuración de tu firewall.
+text.join.info = Aquí, puedes escribir la [accent]IP de un server[] para conectarte, o descubrir servidores de [accent]red local[] para conectarte.\nLAN y WAN es soportado para jugar en multijugador.\n\n[LIGHT_GRAY]Nota: No hay una lista automática global de servidores; si quieres conectarte por IP, tendrás que preguntarle al anfitrión por la IP.
 text.hostserver = Hostear Servidor
+text.hostserver.mobile = Hostear\nJuego
 text.host = Hostear
 text.hosting = [accent]Abriendo servidor...
 text.hosts.refresh = Actualizar
 text.hosts.discovering = Descubrir partidas LAN
-text.server.refreshing=Actualizando servidor
+text.server.refreshing = Actualizando servidor...
 text.hosts.none = [lightgray]¡No se han encontrado partidas LAN!
 text.host.invalid = [scarlet]No se ha podido conectar al anfitrión
 text.trace = Rastrear Jugador
@@ -89,68 +106,68 @@ text.trace.ip=IP: [accent]{0}
 text.trace.id = ID Única: [accent]{0}
 text.trace.android = Cliente de Android: [accent]{0}
 text.trace.modclient = Cliente Personalizado: [accent]{0}
-text.trace.totalblocksbroken=Total de bloques removidos: [accent]{0}
-text.trace.structureblocksbroken=Bloques de estructura removidos: [accent]{0}
-text.trace.lastblockbroken=Último bloque removido: [accent]{0}
+text.trace.totalblocksbroken = Total de bloques quitados: [accent]{0}
+text.trace.structureblocksbroken = Bloques de estructura quitados: [accent]{0}
+text.trace.lastblockbroken = Último bloque quitado: [accent]{0}
 text.trace.totalblocksplaced = Total de bloques colocados: [accent]{0}
 text.trace.lastblockplaced = Último bloque colocado: [accent]{0}
-text.invalidid=¡ID de cliente invalida! Envía un informe del error.
-text.server.bans=Bans
+text.invalidid = ¡ID de cliente inválida! Envía un informe del error.
+text.server.bans = Baneos
 text.server.bans.none = ¡Ningún usuario ha sido baneado!
-text.server.admins=Admins
-text.server.admins.none=¡Ningún admin ha sido encontrado!
+text.server.admins = Administradores
+text.server.admins.none = ¡Ningún administrador ha sido encontrado!
 text.server.add = Agregar Servidor
-text.server.delete=¿Estás seguro que quieres borrar este servidor?
+text.server.delete = ¿Estás seguro de querer borrar este servidor?
 text.server.hostname = Anfitrión: {0}
 text.server.edit = Editar Servidor
 text.server.outdated = [crimson]¡Servidor desactualizado![]
 text.server.outdated.client = [crimson]¡Cliente desactualizado![]
 text.server.version = [lightgray]Versión: {0}
 text.server.custombuild = [yellow]Versión personalizada
-text.confirmban=¿Estás seguro que quieres banear este jugador?
-text.confirmunban=¿Estás seguro que quieres desbanear este jugador?
-text.confirmadmin=¿Estás seguro que quieres hacer admin a este jugador?
-text.confirmunadmin=¿Estás seguro que quieres remover como admin a este jugador?
+text.confirmban = ¿Estás seguro de querer banear este jugador?
+text.confirmkick = ¿Estás seguro de querer expulsar este jugador?
+text.confirmunban = ¿Estás seguro de querer desbanear este jugador?
+text.confirmadmin = ¿Estás seguro de querer hacer administrador a este jugador?
+text.confirmunadmin = ¿Estás seguro de querer quitar los permisos de administrador a este jugador?
 text.joingame.title = Unirse a la partida
 text.joingame.ip = IP:
 text.disconnect = Desconectado.
 text.disconnect.data = ¡Se ha fallado la carga de datos del mundo!
 text.connecting = [accent]Conectando...
 text.connecting.data = [accent]Cargando datos del mundo...
-text.connectfail=[crimson]Ha fallado la conexión con el servidor: [orange]{0}
 text.server.port = Puerto:
-text.server.addressinuse=¡La dirección está en uso!
+text.server.addressinuse = ¡La dirección ya está en uso!
 text.server.invalidport = ¡El número de puerto es invalido!
-text.server.error=[crimson]Error hosteando el servidor: [orange]{0}
-text.save.old=Este punto de guardado es para una versión más antigua de este juego, y ya no puede ser usada.\n\n[LIGHT_GRAY]Guardados con retrocompatibilidad serán completamente implementados en la versión 4.0.
+text.server.error = [crimson]Error hosteando el servidor: error [accent]{0}
+text.save.old = Este punto de guardado es de una versión más antigua de este juego, y ya no puede ser usada.\n\n[LIGHT_GRAY]La retrocmpatibilidad de los puntos de guardado estará completamente implementada en la versión 4.0.
 text.save.new = Nuevo Punto de Guardado
-text.save.overwrite=¿Estás seguro que quieres sobrescribir\neste punto de guardado?
+text.save.overwrite = ¿Estás seguro de querer sobrescribir\neste punto de guardado?
 text.overwrite = Sobrescribir
 text.save.none = ¡No se ha encontrado ningún punto de guardado!
 text.saveload = [accent]Guardando...
 text.savefail = ¡No se ha podido guardar la partida!
-text.save.delete.confirm=¿Estás seguro que quieres borrar este punto de guardado?
+text.save.delete.confirm = ¿Estás seguro de querer borrar este punto de guardado?
 text.save.delete = Borrar
 text.save.export = Exportar Punto de Guardado
-text.save.import.invalid=[orange]¡Este punto de guardado es invalido!
-text.save.import.fail=[crimson]Se ha fallado la importación del punto de guardado: [orange]{0}
-text.save.export.fail=[crimson]Se ha fallado la exportación del punto de guardado: [orange]{0}
+text.save.import.invalid = [accent]¡Este punto de guardado es inválido!
+text.save.import.fail = [crimson]La importación del punto de guardado ha fallado: error [accent]{0}
+text.save.export.fail = [crimson]La exportación del punto de guardado ha fallado: error [accent]{0}
 text.save.import = Importar Punto de Guardado
 text.save.newslot = Nombre del Punto de Guardado:
 text.save.rename = Renombrar
 text.save.rename.text = Nuevo nombre:
 text.selectslot = Selecciona un Punto de Guardado.
 text.slot = [accent]Casilla {0}
-text.save.corrupted=[orange]El punto de guardado está corrupto o es invalido!\nSi acabas de actualizar el juego, esto debe ser probablemente un cambio en el formato de guardado y [scarlet]no[] un error.
-text.sector.corrupted=[orange]El punto de guardado de este sector fue encontrado, pero su carga ha fallado.\nUn nuevo punto ha sido creado.
+text.save.corrupted = [accent]¡El punto de guardado está corrupto o es inválido!\nSi acabas de actualizar el juego, esto debe ser probablemente un cambio en el formato de guardado y[scarlet] no[] un error.
+text.sector.corrupted = [accent]El punto de guardado de este sector fue encontrado, pero su carga ha fallado.\nUn nuevo punto ha sido creado.
 text.empty = <vacío>
 text.on = Encendido
 text.off = Apagado
-text.save.autosave=Auto-guardado: {0}
+text.save.autosave = Autoguardado: {0}
 text.save.map = Mapa: {0}
 text.save.wave = Horda {0}
 text.save.difficulty = Dificultad: {0}
-text.save.date=Ultima vez guardado: {0}
+text.save.date = Última vez guardado: {0}
 text.save.playtime = Tiempo de juego: {0}
 text.confirm = Confirmar
 text.delete = Borrar
@@ -160,28 +177,32 @@ text.cancel=Cancelar
 text.openlink = Abrir Enlace
 text.copylink = Copiar Enlace
 text.back = Atras
-text.quit.confirm=¿Estás seguro que quieres salir de la partida?
+text.quit.confirm = ¿Estás seguro de querer salir de la partida?
 text.changelog.title = Registro de Parches
 text.changelog.loading = Consiguiendo el registro de parches...
-text.changelog.error.android=[orange]¡Nota que el registro de parches a veces no funciona en Android 4.4 o inferior!\nEsto es por un error de Android interno.
-text.changelog.error.ios=[orange]El registro de parches no es actualmente soportado por iOS.
-text.changelog.error=[scarlet]¡Error consiguiendo el registro de parches!\nChequeá tu conexión a Internet.
+text.changelog.error.android = [accent]¡Nota: el registro de parches a veces no funciona en Android 4.4 o inferior!\nEsto es por un error interno de Android.
+text.changelog.error.ios = [accent]El registro de parches no está actualmente soportado para iOS.
+text.changelog.error = [scarlet]¡Error consiguiendo el registro de parches!Comprueba tu conexión a Internet.
 text.changelog.current = [yellow][[Versión actual]
-text.changelog.latest=[orange][[Última version]
+text.changelog.latest = [accent][[Última version]
 text.loading = [accent]Cargando...
 text.saving = [accent]Guardando...
-text.wave=[orange]Horda {0}
+text.wave = [accent]Horda {0}
 text.wave.waiting = Horda en {0}
 text.waiting = Esperando...
+text.waiting.players = Esperando jugadores...
+text.wave.enemies = [LIGHT_GRAY]{0} Enemigos Restantes
+text.wave.enemy = [LIGHT_GRAY]{0} Enemigo Restante
 text.loadimage = Cargar Imagen
 text.saveimage = Guardar Imagen
 text.unknown = Desconocido
 text.custom = Personalizado
 text.builtin = Incorporado
-text.map.delete.confirm=¿Estás seguro que quieres borrar este mapa? ¡Recuerda que está acción no puede ser descartada!
+text.map.delete.confirm = ¿Estás seguro de querer borrar este mapa? ¡Recuerda que está acción no puede sdeshacerse!
 text.map.random = [accent]Mapa Aleatorio
-text.map.nospawn=¡Este mapa no tiene ningún núcleo en el cual pueda meter al jugador! Agrega un núcleo [ROYAL]azul[] al mapa con el editor.
-text.map.invalid=Error cargando el mapa: corrupto o archivo invalido.
+text.map.nospawn = ¡Este mapa no tiene ningún núcleo en el cual pueda aparecer el jugador! Agrega un núcleo[ROYAL] blue[] al mapa con el editor.
+text.map.nospawn.pvp = ¡Este mapa no tiene ningún núcleo enemigo para que aparezca el jugador! Añade un núcleo[SCARLET] red[] a este mapa en el editor.
+text.map.invalid = Error cargando el mapa: archivo corrupto o inválido.
 text.editor.brush = Pincel
 text.editor.slope = \\
 text.editor.openin = Abrir en el Editor
@@ -193,16 +214,15 @@ text.editor.description=Descripción:
 text.editor.name = Nombre:
 text.editor.teams = Equipos
 text.editor.elevation = Elevación
-text.editor.badsize=[orange]¡La dimensión de la imagen es invalida![]\nDimensiones validas para el mapa: {0}
-text.editor.errorimageload=Error cargando el archivo:\n[orange]{0}
-text.editor.errorimagesave=Error guardando el archivo:\n[orange]{0}
+text.editor.errorimageload = Error cargando el archivo:\n[accent] {0}
+text.editor.errorimagesave = Error guardando el archivo:\n[accent] {0}
 text.editor.generate = Generar
 text.editor.resize = Cambiar Tamaño
 text.editor.loadmap = Cargar Mapa
 text.editor.savemap = Guardar Mapa
 text.editor.saved = ¡Guardado!
-text.editor.save.noname=¡Tu mapa no tiene un nombre! Pon uno en el menu 'Info del Mapa'.
-text.editor.save.overwrite=¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menu 'Info del Mapa'.
+text.editor.save.noname = ¡Tu mapa no tiene un nombre! Pon uno en el menú 'Info del Mapa'.
+text.editor.save.overwrite = ¡Tu mapa sobrescribe uno ya incorporado! Elige un nombre diferente en el menú 'Info del Mapa'.
 text.editor.import.exists = [scarlet]¡No se ha podido importar:[] un mapa incorporado con el nombre '{0}' ya existe!
 text.editor.import = Importar...
 text.editor.importmap = Importar Mapa
@@ -218,14 +238,14 @@ text.editor.exportimage=Exportar Imagen del Terreno
 text.editor.exportimage.description = Exportar archivo de imagen del mapa
 text.editor.loadimage = Importar Terreno
 text.editor.saveimage = Exportar Terreno
-text.editor.unsaved=[scarlet]¡Tienes cambios sin guardar![]\n¿Estás seguro que quieres salir?
+text.editor.unsaved = [scarlet]¡Tienes cambios sin guardar![]\n¿Estás seguro de querer salir?
 text.editor.resizemap = Cambiar Tamaño del Mapa
 text.editor.mapname = Nombre del Mapa:
 text.editor.overwrite = [accent]¡Advertencia!\nEsto sobrescribe un mapa ya existente.
-text.editor.overwrite.confirm=[scarlet]¡Advertencia![] Un mapa con ese nombre ya existe. ¿Estás seguro que quieres sobrescribirlo?
+text.editor.overwrite.confirm = [scarlet]¡Advertencia![] Un mapa con ese nombre ya existe. ¿Estás seguro de querer sobrescribirlo?
 text.editor.selectmap = Selecciona un mapa para cargar:
 text.width = Ancho:
-text.height=Altura:
+text.height = Alto:
 text.menu = Menu
 text.play = Jugar
 text.load = Cargar
@@ -233,25 +253,40 @@ text.save=Guardar
 text.fps = FPS: {0}
 text.tps = TPS: {0}
 text.ping = Ping: {0}ms
-text.language.restart=Por favor reinicie el juego para que los cambios del lenguaje surgan efecto.
-text.settings.language=Languaje
+text.language.restart = Por favor reinicie el juego para que los cambios del lenguaje surjan efecto.
 text.settings = Ajustes
 text.tutorial = Tutorial
 text.editor = Editor
 text.mapeditor = Editor de Mapa
 text.donate = Donar
+text.connectfail = [crimson]Ha fallado la conexión con el servidor: [accent]{0}
+text.error.unreachable = Servidor inaccesible.
+text.error.invalidaddress = Dirección inválida.
+text.error.timedout = ¡Se acabó el tiempo!\n¡Asegúrate que el host ha hecho el port forwarding, y que la dirección es correcta!
+text.error.mismatch = Error de paquete:\nposible versión no válida del servidor/cliente.\nAsegúrate de que tú y el host tenéis la última versión de Mindustry.
+text.error.alreadyconnected = Ya estás conectado.
+text.error.mapnotfound = ¡Archivo de mapa no encontrado!
+text.error.any = Error de red desconocido.
+text.settings.language = Lenguaje
 text.settings.reset = Reiniciar por los de defecto
 text.settings.rebind = Reasignar
 text.settings.controls = Controles
 text.settings.game = Juego
 text.settings.sound = Sonido
 text.settings.graphics = Gráficos
+text.settings.cleardata = Limpiar Datos del Juego...
+text.settings.clear.confirm = ¿Estas seguro de querer limpiar estos datos?\n¡Esta acción no puede deshacerse!
+text.settings.clearall.confirm = [scarlet]ADVERTENCIA![]\nEsto va a eliminar todos tus datos, incluyendo guardados, mapas, desbloqueos y keybinds.\nUna vez presiones 'ok', el juego va a borrrar todos tus datos y saldrá del juego automáticamente.
+text.settings.clearsectors = Limpiar Sectores
+text.settings.clearunlocks = Limpiar Desbloqueos
+text.settings.clearall = Limpiar Todo
 text.paused = Pausado
-text.yes=Si
+text.yes = Sí
 text.no = No
-text.info.title=[accent]Info
-text.error.title=[crimson]Un error ha ocurrido
-text.error.crashtitle=Un error ha ocurrido
+text.info.title = [accent]Información
+text.error.title = [crimson]Un error ha ocurrido.
+text.error.crashtitle = Un error ha ocurrido.
+text.blocks.unknown = [LIGHT_GRAY]???
 text.blocks.blockinfo = Información del Bloque
 text.blocks.powercapacity = Capacidad de Energía
 text.blocks.powershot = Energía/Disparo
@@ -263,10 +298,11 @@ text.blocks.liquidcapacity=Capacidad de Líquidos
 text.blocks.maxitemssecond = Máximo de Objetos
 text.blocks.powerrange = Rango de Energía
 text.blocks.poweruse = Consumo de Energía
+text.blocks.powerdamage = Energía/Daño
 text.blocks.inputitemcapacity = Capacidad de Entrada de los Objetos
 text.blocks.outputitemcapacity = Capacidad de Salida de los Objetos
 text.blocks.itemcapacity = Capacidad de Objetos
-text.blocks.maxpowergeneration=Generación Maxima de Energía
+text.blocks.basepowergeneration = Generación de energía base
 text.blocks.powertransferspeed = Transferencia de Energía
 text.blocks.craftspeed = Velocidad de Producción
 text.blocks.inputliquid = Líquidos de Entrada
@@ -274,21 +310,23 @@ text.blocks.inputliquidaux=Líquido Auxiliar
 text.blocks.inputitem = Objeto de Entrada
 text.blocks.inputitems = Objetos de Entrada
 text.blocks.outputitem = Objeto de Salida
-text.blocks.drilltier=Taladrable
+text.blocks.drilltier = Taladrables
 text.blocks.drillspeed = Velocidad de Base del Taladro
 text.blocks.liquidoutput = Líquido de Salida
+text.blocks.liquidoutputspeed = Velocidad de Salida del Líquido
 text.blocks.liquiduse = Uso del Líquido
 text.blocks.coolant = Refrigerante
 text.blocks.coolantuse = Uso del Refrigerante
 text.blocks.inputliquidfuel = Combustible Líquido
 text.blocks.liquidfueluse = Uso del Combustible Líquido
-text.blocks.explosive=¡Altamente Explosivo!
+text.blocks.boostitem = Boost Item
+text.blocks.boostliquid = Boost Liquid
 text.blocks.health = Vida
 text.blocks.inaccuracy = Imprecisión
 text.blocks.shots = Disparos
 text.blocks.reload = Recarga
 text.blocks.inputfuel = Combustible
-text.blocks.fuelburntime=Tiempo de Quema del Combustible
+text.blocks.fuelburntime = Tiempo de Quemado del Combustible
 text.blocks.inputcapacity = Capacidad de entrada
 text.blocks.outputcapacity = Capacidad de salida
 text.unit.blocks = bloques
@@ -300,7 +338,6 @@ text.unit.liquidunits=unidades de líquido
 text.unit.powerunits = unidades de energía
 text.unit.degrees = grados
 text.unit.seconds = segundos
-text.unit.none=
 text.unit.items = objetos
 text.category.general = General
 text.category.power = Energía
@@ -308,38 +345,47 @@ text.category.liquids=Líquidos
 text.category.items = Objetos
 text.category.crafting = Fabricación
 text.category.shooting = Disparo
-setting.fpscap.name=Max FPS
+text.category.optional = Optional Enhancements
+setting.autotarget.name = Auto apuntado
+setting.fpscap.name = Máx FPS
 setting.fpscap.none = Nada
 setting.fpscap.text = {0} FPS
+setting.difficulty.training = entrenamiento
 setting.difficulty.easy = fácil
 setting.difficulty.normal = normal
 setting.difficulty.hard = difícil
 setting.difficulty.insane = locura
-setting.difficulty.purge=purgar
 setting.difficulty.name = Dificultad:
 setting.screenshake.name = Movimiento de la Pantalla
-setting.indicators.name=Indicador de Enemigos
 setting.effects.name = Mostrar Efectos
 setting.sensitivity.name = Sensibilidad del Control
 setting.saveinterval.name = Intervalo del Auto-guardado
 setting.seconds = {0} Segundos
 setting.fullscreen.name = Pantalla Completa
-setting.multithread.name=Multihilo
 setting.fps.name = Mostrar FPS
 setting.vsync.name = VSync
-setting.lasers.name=Mostrar Energía de los Lasers
-setting.healthbars.name=Mostrar la barra de Vida de las Entidades
+setting.lasers.name = Mostrar Energía de los Láseres
 setting.minimap.name = Mostrar Minimapa
-setting.musicvol.name=Volumen de la Musica
-setting.mutemusic.name=Mutear Musica
-setting.sfxvol.name=Volumen de los SFX
-setting.mutesound.name=Mutear Sonido
+setting.musicvol.name = Volumen de la Música
+setting.mutemusic.name = Silenciar Musica
+setting.sfxvol.name = Volumen de los efectos de sonido
+setting.mutesound.name = Silenciar Sonido
+setting.crashreport.name = Send Anonymous Crash Reports
 text.keybind.title = Reasignar Teclas
+category.general.name = General
+category.view.name = Visión
+category.multiplayer.name = Multijugador
+command.attack = Atacar
+command.retreat = Retirarse
+command.patrol = Patrullar
+keybind.press = Presiona una tecla...
+keybind.press.axis = Pulsa un eje o botón...
 keybind.move_x.name = Mover x
 keybind.move_y.name = Mover y
 keybind.select.name = Seleccionar
-keybind.break.name=Remover
-keybind.shoot.name=Dispar
+keybind.break.name = Romper
+keybind.deselect.name = Deseleccionar
+keybind.shoot.name = Disparar
 keybind.zoom_hold.name = Mantener Zoom
 keybind.zoom.name = Zoom
 keybind.menu.name = Menu
@@ -349,32 +395,48 @@ keybind.chat.name=Chat
 keybind.player_list.name = Lista de jugadores
 keybind.console.name = consola
 keybind.rotate.name = Rotar
+keybind.toggle_menus.name = Alternar menús
+keybind.chat_history_prev.name = Historial de chat anterior
+keybind.chat_history_next.name = Historial de chat siguiente
+keybind.chat_scroll.name = Chat scroll
+keybind.drop_unit.name = drop unit
+keybind.zoom_minimap.name = Zoom minimapa
 mode.text.help.title = Descripción de modos
 mode.waves.name = hordas
-mode.waves.description=el modo normal. con recursos limitados y entrada de hordas automática.
+mode.waves.description = El modo normal. con recursos limitados y entrada de hordas automática.
 mode.sandbox.name = sandbox
-mode.sandbox.description=recursos ilimitados y no hay temporizador para las hordas.
+mode.sandbox.description = Recursos ilimitados y sin temporizador para las hordas.
 mode.freebuild.name = construcción libre
 mode.freebuild.description = recursos limitados y no hay temporizador para las hordas.
+mode.pvp.name = PvP
+mode.pvp.description = Pelea contra otros jugadores localmente.
 content.item.name = Objetos
 content.liquid.name = Líquidos
+content.unit.name = Units
 content.recipe.name = Bloques
+content.mech.name = Mecanoides
 item.stone.name = Piedra
 item.stone.description = Un material muy común. Usado para separar y para refinarse a otros objetos, y también derretir en lava.
+item.copper.name = Cobre
+item.copper.description = Un útil material estructural. Usado extensivamente en todo tipo de bloques.
 item.lead.name = Plomo
 item.lead.description = Un material básico. Usado extensivamente en electrónicos y bloques de transferencia de líquidos.
 item.coal.name = Carbón
 item.coal.description = Un combustible común y preparado para ser quemado.
+item.dense-alloy.name = Aleación Densa
+item.dense-alloy.description = Una dura aleación fabricada con plomo y cobre. Usado en bloques de transporte avanzados y taladros de alto nivel.
 item.titanium.name = Titanio
 item.titanium.description = Un metal raro super ligero usado extensivamente en transportación de liquidos, taladros y aeronaves.
 item.thorium.name = Torio
 item.thorium.description = Un metal radiactivo, muy denso usado en soporte de estructuras y combustible nuclear.
 item.silicon.name = Silicona
-item.silcion.description=Un semiconductor muy útil, se usa para paneles solares y muchos electrónicos complejos.
+item.silicon.description = Un semiconductor muy útil, se usa para paneles solares y muchos electrónicos complejos.
 item.plastanium.name = Plastanio
 item.plastanium.description = Un material dúctil, ligero usado en aeronaves y proyectiles de fragmentación.
-item.phase-matter.name=Materia de Fase
+item.phase-fabric.name = Phase Fabric
+item.phase-fabric.description = Una sustancia casi sin peso usada en electrónica avanzada y en tecnología autoreparadora.
 item.surge-alloy.name = Surge Alloy
+item.surge-alloy.description = Una aleación avanzada con propiedades eléctricas únicas.
 item.biomatter.name = Biomateria
 item.biomatter.description = Una bola de restos orgánicos; usado para convertirlo a petróleo o combustible básico.
 item.sand.name = Arena
@@ -382,38 +444,82 @@ item.sand.description=Un material común que es usado extensivamente en la fundi
 item.blast-compound.name = Compuesto Explosivo
 item.blast-compound.description = Un compuesto volatil usado en bombas y explosivos. Aunque se puede quemar como combustible, esto no es recomendable.
 item.pyratite.name = Pirotita
-item.pyratite.description=Una substancia extremadamente inflamable usada en armas incendiarias.
+item.pyratite.description = Una sustancia extremadamente inflamable usada en armas incendiarias.
 liquid.water.name = Agua
 liquid.lava.name = Lava
 liquid.oil.name = Petróleo
 liquid.cryofluid.name = Criogénico
+mech.alpha-mech.name = Alpha
+mech.alpha-mech.weapon = Repetidor Pesado
+mech.alpha-mech.ability = Enjambre de Drones
+mech.alpha-mech.description = El mecanoide estándar. Tiene velocidad y daño decentes, puede crear hasta 3 drones para poder ofensivo incremenado.
+mech.delta-mech.name = Delta
+mech.delta-mech.weapon = Generador de arco
+mech.delta-mech.ability = Descarga
+mech.delta-mech.description = Un mecanoide rápido y ligeramente armado para ataques de ataque y retirada. Hace poco daño a estructuras, pero puede eliminar rápidamente a grandes grupos de unidades con sus armas de arco eléctrico.
+mech.tau-mech.name = Tau
+mech.tau-mech.weapon = Láser de reestructuración
+mech.tau-mech.ability = Repair Burst
+mech.tau-mech.description = El mecanoide de soporte. Repara bloques aliados disparándolos. Puede extinguir el fuego y reparar aliados en un rango con su habilidad de reparación.
+mech.omega-mech.name = Omega
+mech.omega-mech.weapon = Enjambre de misiles
+mech.omega-mech.ability = Armored Configuration
+mech.omega-mech.description = Un mecanoide grande y bien armado, hecho para asaltos en primera línea. Su habilidad de armadura puede bloquear hasta el 90% del daño que recibe.
+mech.dart-ship.name = Dardo
+mech.dart-ship.weapon = Repetidor
+mech.dart-ship.description = La nave normal. Bastante ligera y rápida, pero tiene poca capacidad ofensiva y baja velocidad minado.
+mech.javelin-ship.name = Jabalina
+mech.javelin-ship.description = Una nave de ataque y retirada. Aunque inicialmente lento, puede acelerar a altas velocidades y volar sobre puestos enemigos, causando gran daño con su habilidad de rayos y misiles.
+mech.javelin-ship.weapon = Ráfaga de misiles
+mech.javelin-ship.ability = Discharge Booster
+mech.trident-ship.name = Tridente
+mech.trident-ship.description = Un bombardero pesado. Razonablemente bien equipado.
+mech.trident-ship.weapon = Bomb Bay
+mech.glaive-ship.name = Glaive
+mech.glaive-ship.description = Una nave pistolera grande y bien armada. Equipada con un repetidor incendiario. Buena aceleración y velocidad máxima.
+mech.glaive-ship.weapon = Flame Repeater
 text.item.explosiveness = [LIGHT_GRAY]Explosividad: {0}
 text.item.flammability = [LIGHT_GRAY]Inflamabilidad: {0}
 text.item.radioactivity = [LIGHT_GRAY]Radioactividad: {0}
 text.item.fluxiness = [LIGHT_GRAY]Poder como Fundente: {0}
-text.item.hardness=[LIGHT_GRAY]Dureza: {0}
 text.unit.health = [LIGHT_GRAY]Vida: {0}
 text.unit.speed = [LIGHT_GRAY]Velocidad: {0}
+text.mech.weapon = [LIGHT_GRAY]Arma: {0}
+text.mech.armor = [LIGHT_GRAY]Armadura: {0}
+text.mech.itemcapacity = [LIGHT_GRAY]Capacidad de objetos: {0}
+text.mech.minespeed = [LIGHT_GRAY]Velocidad de minado: {0}
+text.mech.minepower = [LIGHT_GRAY]Potencia de minado: {0}
+text.mech.ability = [LIGHT_GRAY]Hablidad: {0}
 text.liquid.heatcapacity = [LIGHT_GRAY]Capacidad Térmica: {0}
 text.liquid.viscosity = [LIGHT_GRAY]Viscosidad: {0}
 text.liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
-block.deepwater.name=aguas profundas
-block.water.name=agua
-block.lava.name=lava
-block.oil.name=petróleo
-block.blackstone.name=piedra negra
-block.stone.name=piedra
-block.dirt.name=tierra
-block.sand.name=arena
-block.ice.name=hielo
-block.snow.name=nieve
-block.grass.name=pasto
-block.shrub.name=arbusto
-block.rock.name=roca
-block.blackrock.name=roca negra
-block.icerock.name=roca de hielo
+block.constructing = {0}\n[LIGHT_GRAY](Constructing)
+block.spawn.name = Punto de generación
+block.core.name = Núcleo
+block.metalfloor.name = Suelo de Metal
+block.deepwater.name = Aguas profundas
+block.water.name = Agua
+block.lava.name = Lava
+block.tar.name = Tar
+block.blackstone.name = Piedra negra
+block.stone.name = Piedra
+block.dirt.name = Tierra
+block.sand.name = Arena
+block.ice.name = Hielo
+block.snow.name = Nieve
+block.grass.name = Pasto
+block.shrub.name = Arbusto
+block.rock.name = Roca
+block.blackrock.name = Roca negra
+block.icerock.name = Roca de hielo
+block.copper-wall.name = Muro de cobre
+block.copper-wall-large.name = Muro de cobre grande
+block.dense-alloy-wall.name = Muro de aleación densa
+block.dense-alloy-wall-large.name = Muro de aleación densa grande
+block.phase-wall.name = Phase Wall
+block.phase-wall-large.name = Large Phase Wall
 block.thorium-wall.name = Pared de Torio
-block.thorium-wall-large.name=Pared de Torio Larga
+block.thorium-wall-large.name = Pared de Torio grande
 block.door.name = Puerta
 block.door-large.name = Puerta Larga
 block.duo.name = Dúo
@@ -424,15 +530,11 @@ block.conveyor.name=Cinta Transportadora
 block.titanium-conveyor.name = Cinta Transportadora de Titanio
 block.junction.name = Cruce
 block.router.name = Enrutador
-block.router.description=Separa los objetos en las 4 direcciones. Puede guardar objetos en un buffer.
 block.distributor.name = Distribuidor
-block.distributor.description=Un separador que puede separar en 8 direcciones.
 block.sorter.name = Clasificador
 block.sorter.description = Clasifica objetos. Si un objeto es igual a uno seleccionado, va a pasar. O si no, el objeto saldrá en la izquierda y la derecha.
 block.overflow-gate.name = Compuerta de Desborde
 block.overflow-gate.description = Un enrutador que solo saca por la izquierda y la derecha si la cinta del frente está llena.
-block.bridgeconveyor.name=Puente Transportador
-block.bridgeconveyor.description=Una cinta transportadora que puede estar arriba de otros bloques, para un máximo de dos bloques.
 block.smelter.name = Horno de Fundición
 block.arc-smelter.name = Horno de Arco Eléctrico
 block.silicon-smelter.name = Horno para Silicona
@@ -445,23 +547,32 @@ block.biomattercompressor.name=Compresor de Biomateria
 block.separator.name = Separador
 block.centrifuge.name = Centrifugadora
 block.power-node.name = Nodo de Energía
-block.power-node-large.name=Nodo de Energía Largo
+block.power-node-large.name = Nodo de Energía Grande
 block.battery.name = Batería
-block.battery-large.name=Batería Larga
+block.battery-large.name = Batería Grande
 block.combustion-generator.name = Generador de Combustión
 block.turbine-generator.name = Turbina
+block.mechanical-drill.name = Taladro mecánico
+block.pneumatic-drill.name = Taladro neumático
 block.laser-drill.name = Taladro Laser
 block.water-extractor.name = Extractor de Agua
 block.cultivator.name = Cultivador
+block.alpha-mech-pad.name = Pad de mecanoide Alpha
+block.dart-ship-pad.name = Pad de nave de dardos
+block.delta-mech-pad.name = Pad de mecanoide Delta
+block.javelin-ship-pad.name = Pad de nave Jabalina
+block.trident-ship-pad.name = Pad de nave Tridente
+block.glaive-ship-pad.name = Glaive Ship Pad
+block.omega-mech-pad.name = Pad de mecanoide Omega
+block.tau-mech-pad.name = Pad de mecanoide Tau
 block.conduit.name = Conducto
 block.mechanical-pump.name = Bomba Mecánica
-block.itemsource.name=Objeto Fuente
-block.itemvoid.name=Objeto Vacío
-block.liquidsource.name=Líquido Fuente
-block.powervoid.name=Energía Vacía
+block.itemsource.name = Fuente de objetos
+block.itemvoid.name = Vacío de objetos 
+block.liquidsource.name = Fuente de líquidos
+block.powervoid.name = Vacío de energía
 block.powerinfinite.name = Energía Infinita
 block.unloader.name = Descargador
-block.sortedunloader.name=Descargador Clasificado
 block.vault.name = Bóveda
 block.wave.name = Horda
 block.swarmer.name = Enjambredor
@@ -474,184 +585,196 @@ block.pyratite-mixer.name=Mezclador de Pirotita
 block.blast-mixer.name = Mezclador de Explosivos
 block.solidifer.name = Solidificador
 block.solar-panel.name = Panel Solar
-block.solar-panel-large.name=Panel Solar Largo
+block.solar-panel-large.name = Panel Solar Grande
 block.oil-extractor.name = Extractor de Petróleo
+block.spirit-factory.name = Fábrica de Drones Espíritu
+block.phantom-factory.name = Fábrica de Drones Fantasmales
+block.wraith-factory.name = Wraith Fighter Factory
+block.ghoul-factory.name = Ghoul Bomber Factory
+block.dagger-factory.name = Fábrica de Dagas
+block.titan-factory.name = Fábrica de Titanes
+block.fortress-factory.name = Fortress Mech Factory
+block.revenant-factory.name = Revenant Fighter Factory
 block.repair-point.name = Punto de Reparación
 block.pulse-conduit.name = Conducto de Pulso
 block.phase-conduit.name = Conducto de Fase
 block.liquid-router.name = Enrutador de Líquidos
-block.liquid-tank.name=Tanque de Líquido
+block.liquid-tank.name = Tanque de Líquidos
 block.liquid-junction.name = Cruce de Líquidos
 block.bridge-conduit.name = Conducto Puente
 block.rotary-pump.name = Bomba Rotatoria
+block.thorium-reactor.name = Reactor de Torio
 block.command-center.name = Centro de Comando
 block.mass-driver.name = Teletransportador de Masa
 block.blast-drill.name = Taladro Gigante
 block.thermal-pump.name = Bomba Térmica
 block.thermal-generator.name = Generador Térmico
-unit.drone.description=La unidad dron del comienzo. Aparece en el núcleo por defecto. Automáticamente mina minerales, recolecta objetos y repara bloques.
-unit.fabricator.description=Una unidad dron avanzada. Automáticamente mina minerales, recolecta objetos y repara bloques. Mucho más efectivo que el dron.
+block.alloy-smelter.name = Alloy Smtler
+block.mend-projector.name = Proyector de reparación
+block.surge-wall.name = Surge Wall
+block.surge-wall-large.name = Large Surge Wall
+block.cyclone.name = Ciclón
+block.fuse.name = Fuse
+block.shock-mine.name = Shock Mine
+block.overdrive-projector.name = Overdrive Projector
+block.force-projector.name = Force Projector
+block.arc.name = Arc
+block.rtg-generator.name = Generador RTG
+block.spectre.name = Espectro
+block.meltdown.name = Meltdown
+block.container.name = Contenedor
+block.core.description = The most important building in the game.
+team.blue.name = Azul
+team.red.name = Rojo
+team.orange.name = Naranja
+team.none.name = Gris
+team.green.name = Verde
+team.purple.name = Púrpura
+unit.alpha-drone.name = Dron Alpha
+unit.spirit.name = Dron Espíritu
+unit.spirit.description = El dron del comienzo. Aparece en el núcleo por defecto. Mina automáticamente minerales, recoge objetos y repara bloques.
+unit.phantom.name = Dron Fantasmal
+unit.phantom.description = Un dron avanzado. Mina automáticamente minerales, recoge objetos y repra bloques. Bastante más efectivo que un dron normal.
 unit.dagger.name = Daga
 unit.dagger.description = Una unidad de terreno. Útil con enjambres.
 unit.titan.name = Titán
 unit.titan.description = Una unidad blindada de terreno, avanzada. Ataca blancos de aire y de terreno.
-unit.monsoon.description=Un bombardero pesado de alfombra. Usa pirotita o compuestos explosivos.
-unit.interceptor.description=Una unidad de ataque que pega y corre, muy veloz.
-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
-content.mech.name=Mechs
-item.copper.name=Copper
-item.copper.description=A useful structure material. Used extensively in all types of blocks.
-item.dense-alloy.name=Dense Alloy
-item.dense-alloy.description=A tough alloy made with lead and copper. Used in advanced transportation blocks and high-tier drills.
-mech.alpha-mech.name=Alpha
-mech.alpha-mech.weapon=Heavy Repeater
-mech.alpha-mech.ability=Drone Swarm
-mech.alpha-mech.description=The standard mech. Has decent speed and damage output; can create up to 3 drones for increased offensive capability.
-mech.delta-mech.name=Delta
-mech.delta-mech.weapon=Arc Generator
-mech.delta-mech.ability=Discharge
-mech.delta-mech.description=A fast, lightly-armored mech made for hit-and-run attacks. Does little damage against structures, but can kill large groups of enemy units very quickly with its arc lightning weapons.
-mech.tau-mech.name=Tau
-mech.tau-mech.weapon=Restruct Laser
-mech.tau-mech.ability=Repair Burst
-mech.tau-mech.description=The support mech. Heals allied blocks by shooting at them. Can extinguish fires and heal allies in a radius with its repair ability.
-mech.omega-mech.name=Omega
-mech.omega-mech.weapon=Swarm Missiles
-mech.omega-mech.ability=Armored Configuration
-mech.omega-mech.description=A bulky and well-armored mech, made for front-line assaults. Its armor ability can block up to 90% of incoming damage.
-mech.dart-ship.name=Dart
-mech.dart-ship.weapon=Repeater
-mech.dart-ship.description=The standard ship. Reasonably fast and light, but has little offensive capability and low mining speed.
-mech.javelin-ship.name=Javelin
-mech.javelin-ship.description=A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning ability and missiles.
-mech.javelin-ship.weapon=Burst Missiles
-mech.javelin-ship.ability=Discharge Booster
-mech.trident-ship.name=Trident
-mech.trident-ship.description=A heavy bomber. Reasonably well armored.
-mech.trident-ship.weapon=Bomb Bay
-mech.glaive-ship.name=Glaive
-mech.glaive-ship.description=A large, well-armored gunship. Equipped with an incendiary repeater. Good acceleration and maximum speed.
-mech.glaive-ship.weapon=Flame Repeater
-text.mech.weapon=[LIGHT_GRAY]Weapon: {0}
-text.mech.armor=[LIGHT_GRAY]Armor: {0}
-text.mech.itemcapacity=[LIGHT_GRAY]Item Capacity: {0}
-text.mech.minespeed=[LIGHT_GRAY]Mining Speed: {0}
-text.mech.minepower=[LIGHT_GRAY]Mining Power: {0}
-text.mech.ability=[LIGHT_GRAY]Ability: {0}
-block.core.name=Core
-block.metalfloor.name=Metal Floor
-block.copper-wall.name=Copper Wall
-block.copper-wall-large.name=Large Copper Wall
-block.phase-wall.name=Phase Wall
-block.phase-wall-large.name=Large Phase Wall
-block.mechanical-drill.name=Mechanical Drill
-block.pneumatic-drill.name=Pneumatic Drill
-block.thorium-reactor.name=Thorium Reactor
-block.alloy-smelter.name=Alloy Smtler
-block.mend-projector.name=Mend Projector
-unit.alpha-drone.name=Alpha Drone
-text.construction.desktop=Desktop controls have been changed.\nTo deselect a block or stop building, [accent]use space[].
-keybind.press=Press a key...
-keybind.press.axis=Press an axis or key...
-keybind.deselect.name=Deselect
-block.surge-wall.name=Surge Wall
-block.surge-wall-large.name=Large Surge Wall
-block.cyclone.name=Cyclone
-block.fuse.name=Fuse
-text.confirmkick=Are you sure you want to kick this player?
-text.settings.cleardata=Clear Game Data...
-text.settings.clear.confirm=Are you sure you want to clear this data?\nWhat is done cannot be undone!
-text.settings.clearall.confirm=[scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit.
-text.settings.clearsectors=Clear Sectors
-text.settings.clearunlocks=Clear Unlocks
-text.settings.clearall=Clear All
-block.shock-mine.name=Shock Mine
-block.overdrive-projector.name=Overdrive Projector
-text.blocks.powerdamage=Power/Damage
-mode.custom.warning=Note that blocks cannot be used in custom games until they are unlocked in sectors.\n\n[LIGHT_GRAY]If you have not unlocked any blocks, none will appear.
-content.unit.name=Units
-block.force-projector.name=Force Projector
-block.arc.name=Arc
-block.rtg-generator.name=RTG Generator
-block.spectre.name=Spectre
-block.meltdown.name=Meltdown
-text.mission.info=Mission Info
-text.mission.wave.enemies=Survive[accent] {0}/{1} []waves\n{2} Enemies
-text.mission.wave.enemy=Survive[accent] {0}/{1} []waves\n{2} Enemy
-text.mission.wave.menu=Survive[accent] {0} []waves
-text.mission.resource.menu=Obtain {0} x{1}
-text.mission.block=Create {0}
-text.mission.unit=Create {0} Unit
-text.mission.linknode=Link Power Node
-text.mission.display=[accent]Mission:\n[LIGHT_GRAY]{0}
-text.hostserver.mobile=Host\nGame
-setting.difficulty.training=training
-block.dense-alloy-wall.name=Dense Alloy Wall
-block.dense-alloy-wall-large.name=Large Dense Alloy Wall
-block.dart-ship-pad.name=Dart Ship Pad
-block.delta-mech-pad.name=Delta Mech Pad
-block.javelin-ship-pad.name=Javelin Ship Pad
-block.trident-ship-pad.name=Trident Ship Pad
-block.glaive-ship-pad.name=Glaive Ship Pad
-block.omega-mech-pad.name=Omega Mech Pad
-block.tau-mech-pad.name=Tau Mech Pad
-block.spirit-factory.name=Spirit Drone Factory
-block.phantom-factory.name=Phantom Drone Factory
-block.wraith-factory.name=Wraith Fighter Factory
-block.ghoul-factory.name=Ghoul Bomber Factory
-block.dagger-factory.name=Dagger Mech Factory
-block.titan-factory.name=Titan Mech Factory
-block.revenant-factory.name=Revenant Fighter Factory
-unit.spirit.name=Spirit Drone
-unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
-unit.phantom.name=Phantom Drone
-unit.phantom.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
 unit.ghoul.name = Ghoul Bomber
-unit.ghoul.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo.
+unit.ghoul.description = Una unidad bombardera pesada. Usa compuesto explosivo o pirotita como munición.
 unit.wraith.name = Wraith Fighter
-unit.wraith.description=A fast, hit-and-run interceptor unit.
+unit.wraith.description = Una unidad interceptora rápida.
 unit.fortress.name = Fortress
-unit.fortress.description=A heavy artillery ground unit.
+unit.fortress.description = Una unidad terrestre pesada de artillería.
 unit.revenant.name = Revenant
-unit.revenant.description=A heavy laser platform.
-tutorial.begin=Your mission here is to eradicate the[LIGHT_GRAY] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
-tutorial.drill=Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
-tutorial.conveyor=[accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper=More copper is required.\n\nEither mine it manually, or place more drills.
-tutorial.turret=Defensive structures must be built to repel the[LIGHT_GRAY] enemy[].\nBuild a duo turret near your base.
-tutorial.drillturret=Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
-tutorial.waves=The[LIGHT_GRAY] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
-tutorial.lead=More ores are available. Explore and mine[accent] lead[].\n\nDrag from your unit to the core to transfer resources.
-tutorial.smelter=Copper and lead are weak metals.\nSuperior[accent] Dense Alloy[] can be created in a smelter.\n\nBuild one.
-tutorial.densealloy=The smelter will now produce alloy.\nGet some.\nImprove the production if necessary.
-tutorial.siliconsmelter=The core will now create a[accent] spirit drone[] for mining and repairing blocks.\n\nFactories for other units can be created with [accent] silicon.\nMake a silicon smelter.
-tutorial.silicondrill=Silicon requires[accent] coal[] and[accent] sand[].\nStart by making drills.
-tutorial.generator=This technology requires power.\nCreate a[accent] combustion generator[] for it.
-tutorial.generatordrill=Combustion generators need fuel.\nFuel it with coal from a drill.
-tutorial.node=Power requires transport.\nCreate a[accent] power node[] next to your combustion generator to transfer its power.
-tutorial.nodelink=Power can be transferred through contacting power blocks and generators, or by linked power nodes.\n\nLink power by tapping the node and selecting the generator and silicon smelter.
-tutorial.silicon=Silicon is being produced. Get some.\n\nImproving the production system is advised.
-tutorial.daggerfactory=Construct a[accent] dagger mech factory.[]\n\nThis will be used to create attack mechs.
-tutorial.router=Factories need resources to function.\nCreate a router to split conveyor resources.
-tutorial.dagger=Link power nodes to the factory.\nOnce requirements are met, a mech will be created.\n\nCreate more drills, generators and conveyors as necessary.
-tutorial.battle=The[LIGHT_GRAY] enemy[] has revealed their core.\nDestroy it with your unit and dagger mechs.
-text.missions=Missions:[LIGHT_GRAY] {0}
-text.mission.command=Send Command {0} To Units
-text.mission.mech=Switch to mech[accent] {0}[]
-text.mission.create=Create[accent] {0}[]
-text.wave.enemies=[LIGHT_GRAY]{0} Enemies Remaining
-text.wave.enemy=[LIGHT_GRAY]{0} Enemy Remaining
-setting.autotarget.name=Auto-Target
-command.attack=Attack
-command.retreat=Retreat
-command.patrol=Patrol
-block.spawn.name=Enemy Spawn
-block.fortress-factory.name=Fortress Mech Factory
+unit.revenant.description = Una plataforma láser pesada.
+tutorial.begin = Tu objetivo aquí es erradicar el[LIGHT_GRAY] enemy[].\n\nComienza[accent]minando copper[]. Toca una veta de cobre cerca de tu núcleo para hacer esto.
+tutorial.drill = Minar manualmente es ineficiente.\nLos [accent]taladros pueden minar automáticamente.\nColoca uno en una veta de cobre.
+tutorial.conveyor = Los [accent]Conveyors[] se usan para transportar objetos al núcleo.\nConstruye una línea de transportadores del taladro al núcleo.
+tutorial.morecopper = Se requiere más cobre.\n\nMínalo manualmente o coloca más taladros.
+tutorial.turret = Se tiene que construir estructuras defensivas para repeler el [LIGHT_GRAY]enemy[].\nConstruye una torreta dúo cerca de tu base.
+tutorial.drillturret = Los dúos requieren[accent] copper ammo[]para disparar.\nColoca un taladro junto a la torre para darle cobre.
+tutorial.waves = El[LIGHT_GRAY] enemy[] se acerca.\n\nDefiende tu núcleo 2 hordas. Construye más torretas.
+tutorial.lead = Hay más minerales disponibles. Explora y mna[accent] lead[].\n\n Desliza de tu unidad al núcleo para transferir recursos.
+tutorial.smelter = El cobre y el plomo son metales débiles. Una[accent] Dense Alloy[] superior puede ser creada en una fundición.\n\nConstruye una.
+tutorial.densealloy = La fundición ahora producirá la aleación.\nObtén algunas.\nMejora la producción si es necesario.
+tutorial.siliconsmelter = El núcleo creará ahora un[accent] spirit drone[] para minar y reparar bloques.\n\nHay fábricas que crean otras unidades con[accent] silicona.\nCrea una fundición de silicona.
+tutorial.silicondrill = La silicona requiere[accent] coal[] y[accent]sand[].\nEmpieza haciendo taladros.
+tutorial.generator = Esta tecnología requiere energía.\nCrea un[accent] combustion generator[] para generarla.
+tutorial.generatordrill = Los generadores de combustión requieren combustible.\nProporciónalo carbón de un taladro.
+tutorial.node = La energía requiere ser transportada.\nCrea un[accent] power node[] junto al generador de combustión para transferir su energía.
+tutorial.nodelink = La energía puede ser transferida mediante colocando bloques de energía y generadores juntos, o por nodos conectados.\n\nConecta energía tocando el nodo y seleccionando el generador y la fundición de silicona.
+tutorial.silicon = La silicona está siendo producida. Obtén algo de silicona.\n\nEs recomendado mejorar la producción.
+tutorial.daggerfactory = Construye una[accent] dagger mech factory[].\n\nEsto se usará para crear unidades terrestres de ataque.
+tutorial.router = Las fábricas necesitan recursos para funcionar.\nCrea un enrutador para separar recursos del transportador.
+tutorial.dagger = Conecta nodos de energía a la fábrica.\nUna vez las necesidades se cumplan, una unidad será creada.\n\nCrea taladros, generadores y transportadores según necesites.
+tutorial.battle = El[LIGHT_GRAY] enemy[] ha revelado su núcleo.\nDestrúyelo con tu nave y tus unidades de combate.
+block.copper-wall.description = Un bloque defensivo barato.\nÚtil para defneder e núcleo y las torres en las primeras hordas.
+block.copper-wall-large.description = Un bloque defensivo barato.\nÚtil para defneder e núcleo y las torres en las primeras hordas.\nOcupa múltiples casillas.
+block.dense-alloy-wall.description = Un bloque de defensa estándar.\nProtección adecuada contra enemigos.
+block.dense-alloy-wall-large.description = Un bloque de defensa estándar.\nProtección adecuada contra enemigos.\nOcupa múltiples casillas.
+block.thorium-wall.description = Un bloque defensivo fuerte.\nBuena protección contra enemigos.
+block.thorium-wall-large.description = Un bloque defensivo fuerte.\nBuena protección contra enemigos.\nOcupa múltiples casillas.
+block.phase-wall.description = No es tan fuerte como un muro de torio pero rebota balas al enemigo si no son demasiado fuertes.
+block.phase-wall-large.description = No es tan fuerte como un muro de torio pero rebota balas al enemigo si no son demasiado fuertes.\nOcupa múltiples casillas.
+block.surge-wall.description = El bloque defensivo más fuerte.\nTiene una pequeña probabilidad de disparar rayos al atacante.
+block.surge-wall-large.description = El bloque defensivo más fuerte.\nTiene una pequeña probabilidad de disparar rayos al atacante.\nOcupa múltiplies casillas.
+block.door.description = Una puerta pequeña que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.\nOcupa múltiples casillas.
+block.door-large.description = Una puerta grande que puede ser abierta y cerrada tocándola.\nSi está abirta, los enemigos pueden moverse y disparar a través de ella.\nOcupa múltiples casillas.
+block.mend-projector.description = Regenera edificios cercanos periódcamente.
+block.overdrive-projector.description = Aumenta la velocidad de edificios cercanos como taladros y transportadores.
+block.force-projector.description = Crea un área de fuerza hexagonal alrededor de él, protegiendo edificios y unidades dentro de él del daño de las balas.
+block.shock-mine.description = Daña enemigos que pisan a mina. Casi invisible al enemigo.
+block.duo.description = Una torre pequeña y barata.
+block.arc.description = Una torre pequeña que disapra electricidad en un arco aleatorio al enemigo.
+block.hail.description = Una torre de artillería pequeña.
+block.lancer.description = Una torre de tamaño mediano que dispara rayos cargados eléctricamente.
+block.wave.description = Una torre de tamaño mediano que dispara burbujas de líquido.
+block.salvo.description = Una torre de tramaño mediano que dispara balas en salvos.
+block.swarmer.description = Una torre de tamaño mediano que dispara misiles en grupo.
+block.ripple.description = Una torre de artillería grande que dispara varios disparos simultáneamente.
+block.cyclone.description = Una torre de disparo rápido grande.
+block.fuse.description = Una torre grande que dispara rayos poderosos de corto alcance.
+block.spectre.description = Una torre grande que dispara dos balas poderosas de una vez.
+block.meltdown.description = Una torre grande que dispara rayos poderosos de largo alcance.
+block.conveyor.description = Bloque de transporte básico. Mueve objetos hacia adelante y los deposita automáticamente en torres o fábricas. Rotable.
+block.titanium-conveyor.description = Bloque de transporte avanzado. Mueve objetos más rápido que los transportadores estándar.
+block.phase-conveyor.description = Bloque de transporte avanzado. Usa energía para transportar objetos a otro transportador de fase conectado por varias casillas.
+block.junction.description = Actúa como puente para dos transportadores que se cruzan. Útil en situaciones con dos diferentes transportadores transportando diferentes materiales a diferentes lugares.
+block.mass-driver.description = El mejor bloque de transorte. Recoge varios objetos y los dispara a otro conductor de masa en un largo rango.
+block.smelter.description = Quema carbón para fundir cobre y plomo, produciendo así aleación densa.
+block.arc-smelter.description = Funde cobre y plomo en aleación densa usando una fuented de energía externa.
+block.silicon-smelter.description = Reduces sand with highly pure coke in order to produce silicon.
+block.plastanium-compressor.description = Produce plastanio con aceite y titanio.
+block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand.
+block.alloy-smelter.description = Produce "surge alloy" con titanio, plomo, silicona y cobre.
+block.pulverizer.description = Despedaza la piedra en arena. Útil cuando no hay arena natural.
+block.pyratite-mixer.description = Mezcla carbón, plomo y arena en pirotita altamente inflamable.
+block.blast-mixer.description = Usa aceite para transformar pirotita en un objeto menos inflamable pero más explosivo: compuesto explosivo.
+block.cryofluidmixer.description = Combina agua y titanio en líquido criogénico que es mucho más eficiente para enfriar.
+block.solidifer.description = Enfría la lava a piedra a una gran velocidad.
+block.melter.description = Calienta piedra a temperaturas muy altas para obtener lava.
+block.incinerator.description = Se deshace de cualquier líquido u objeto excesivo.
+block.biomattercompressor.description = Comprime biomateria para extraer aceite.
+block.separator.description = Expone piedra a la presión del agua para obtener diversos minerales contenidos en la piedra.
+block.centrifuge.description = Más eficiente que un separador, pero es más caro de construir y requiere energía.
+block.power-node.description = Transmite energía a nodos conectados, conecta hasta cuatro fuentes de energía, edificios que usan energía o nodos. El nodo obtendrá o transmitirá energía de cualquier bloque adyacente.
+block.power-node-large.description = Tiene un radio más amplio que el nodo de energía y conecta hasta seis fuentes de energía, edificios que usan energía o nodos.
+block.battery.description = Guarda energía cuando hay abundancia y proporciona energía cuando hay escasez de energía mientras la batería tenga energía.
+block.battery-large.description = Almacena mucha más energía que una batería normal.
+block.combustion-generator.description = Genera energía quemando aceite o matteriales inflamables.
+block.turbine-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
+block.thermal-generator.description = Genera una gran cantidad de energía con la lava.
+block.solar-panel.description = Proporciona una pequeña cantidad de energía procedente del sol.
+block.solar-panel-large.description = Genera un mucho mejor suministro de energía que un panel solar estándar, pero también es mucho más caro de construir.
+block.thorium-reactor.description = Genera grandes cantidades de energía del torio altamente radioactivo. Necesita enfriamiento constante. Explotará violentamente si no se le aporta suficiente enfriamiento.
+block.rtg-generator.description = Un generador radioisótropo termoeléctrico que no necesita enfriamiento pero proporciona menos energía que un reactor de torio.
+block.unloader.description = Descarga objetos de un contenedor, almacén o el núcleo a un transportador o directamente a un bloque adyacente. El tipo de objeto descargado puede ser cambiado tocando el descagador.
+block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [LIGHT_GRAY] unloader[] puede usarse para obtener objetos del contenedor.
+block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [LIGHT_GRAY] unloader[] puede usarse para obtener objetos del almacén.
+block.mechanical-drill.description = Un taladro barato. Cuando es colocado en casillas apropiadas, extrae objetos lentamente de forma indefinida.
+block.pneumatic-drill.description = Un taladro mejorado que es más rápido y puede obtener minerales más duros usando la presión.
+block.laser-drill.description = Permite obtener minerales incluso más rápido con la tecnología láser, pero requiere energía. Además, se puede obtener torio radioactivo con este taladro.
+block.blast-drill.description = El mejor taladro. Requiere grandes cantidades de energía.
+block.water-extractor.description = Extrae agua de la tierra. Úsalo cuando no haya lagos cercanos.
+block.cultivator.description = Cultiva la tierra para obtener biomateria.
+block.oil-extractor.description = Usa grandes cantidades de energía para extraer aceite de la arena. Úsalo cuando no hay fuentes directas de aceite cerca.
+block.dart-ship-pad.description = Deja tu nave actual y transfórmate en una unidad aérea básica.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.trident-ship-pad.description = Deja tu nave actual y transfórmate en una unidad aérea bombardera pesada.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.javelin-ship-pad.description = Deja tu nave actual y transfórmate en una unidad aérea fuerte y rápida interceptora con arma eléctrica.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.glaive-ship-pad.description = Deja tu nave actual y transfórmate en una unidad aérea grande y bien armada nave pistolera.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.tau-mech-pad.description = Deja tu nave actual y transfórmate en un mecanoide de soporte que puede reparar construcciones y tropas aliadas.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it.
+block.omega-mech-pad.description = Deja tu nave actual y transfórmate en un mecanoide pesado y bien armado, hecho para asaltos en primera línea.\nUsa el pad tocándolo dos veces mientras estás en él.
+block.spirit-factory.description = Produce drones ligeros que obtienen minerales y reparan bloques.
+block.phantom-factory.description = Produce drones avanzados que son significativamente más eficientes que un dron espíritu.
+block.wraith-factory.description = Produce unidades aéreas rápidas e interceptoras.
+block.ghoul-factory.description = Produce unidadess bombarderas pesadas.
+block.dagger-factory.description = Produce unidades terrestres básicas.
+block.titan-factory.description = Produce unidades terrestres avanzadas.
+block.fortress-factory.description = Produce unidades terrestres de artillería pesada.
+block.revenant-factory.description = Produce unidades terrestres láser pesadas.
+block.repair-point.description = Repara la unidad dañada más cercana a su alrededor.
+block.command-center.description = Permite cambiar el comportamiento de la IA aliada. Actualmente, atacar, retirarse y patrullar son los comandos soportados.
+block.conduit.description = Bloque de transporte de líquidos básico. Funciona como un transportador, pero con líquidos. Usado con bombas, extractores u otros conductos.
+block.pulse-conduit.description = Bloque de transporte de líquidos avanzado. Transporta líquidos más rápidamente y almacena más que los conductos estándar.
+block.phase-conduit.description = Bloque de transporte de líquidos avanzado. Usa energía para transportar líquidos a otro conducto de fase conectado por varias casillas.
+block.liquid-router.description = Acepta líquidos de una dirección y los deja en hasta 3 direcciones equitativamente. También puede amacenar cierta capacidad de líquido. Útil para dividir los líquidos de una fuente a varios objetivos.
+block.liquid-tank.description = Almacena una gran cantidad de líquidos. Úsalo para crear almacenes cuando no hay una demanda constante de materiales o para asegurarse de enfriar bloques vitales.
+block.liquid-junction.description = Actúa como un puente para dos condusctos que se cruzan. Útil en situaciones en las que hay dos conductos con líquidos diferentes a diferentes lugares.
+block.bridge-conduit.description = Bloque avanzado de transporte de líquidos. Permite transportar líquidos por encima hasta 3 casillas de cualquier terreno o construcción.
+block.mechanical-pump.description = Una bomba barata con extracción lenta, pero sin uso de energía.
+block.rotary-pump.description = Una bomba avanzada que duplica la velocidad usando energía.
+block.thermal-pump.description = La mejor bomba. Tres veces más rápido que la bomba mecánica, y la única bomba que puede extraer lava.
+block.router.description = Acepta objetos de una dirección y deja objetos equitativamente en hasta 3 direcciones diferentes. Útil para dividir los materiales de una fuente de recursos a múltiples objetivos.
+block.distributor.description = Un enrutador avanzado que distribuye objetos equitativamente en hasta otras 7 direcciones.
+block.bridge-conveyor.description = Bloque avanado de transporte. Puede transportar objetos por encima hasta 3 casillas de cualquier terreno o construcción.
+block.alpha-mech-pad.description = Cuando se le da suficiente energía, reconstruye tu nave en el mecanoide[accent] Alpha[].
+block.itemsource.description = Da objetos infinitos. Solo en sandbox.
+block.liquidsource.description = Da líquido infinito. Solo en sandbox.
+block.itemvoid.description = Destruye cuanquier objeto que va a él sin necesitar energía. Solo en sandbox.
+block.powerinfinite.description = Da energía infinita. Solo en sandbox.
+block.powervoid.description = Elimina toda la energía que se le da. Solo en sandbox.
+liquid.water.description = Usado comúnmente para enfriar máquinas y para procesar residuos.
+liquid.lava.description = Puede usarse para ser transformado en[LIGHT_GRAY] stone[], para generar energía o para munición de ciertas torres.
+liquid.oil.description = Puede ser quemado, explotado o como un enfriador.
+liquid.cryofluid.description = El líquido más eficiente pra enfriar las cosas.

core/assets/bundles/bundle_fr.properties

@@ -1,44 +1,50 @@
 text.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!)
 text.credits = Crédits
 text.discord = Rejoignez le discord de Mindustry
+text.link.discord.description = Le discord officiel de mindustry
 text.link.github.description = Code source du jeu
 text.link.dev-builds.description = Versions instables du jeu
 text.link.trello.description = Trello officiel pour les futurs ajouts .
 text.link.itch.io.description = page itch.io avec le lien du téléchargement pour PC et la version web .
 text.link.google-play.description = listing par le store google play
 text.link.wiki.description = wiki officiel de mindustry .
-text.linkfail=Failed to open link!\nThe URL has been copied to your cliboard.
-text.editor.web=The web version does not support the editor!\nDownload the game to use it.
-text.web.unsupported=La version web ne supporte pas cette fonction ! Téléchargez le jeu pour l'utiliser.
-text.gameover=Votre base a été détruite
+text.linkfail = Erreur lors de l'ouverture du lien !\nL'URL a été copié avec succès.
+text.gameover = Partie terminée.
+text.gameover.pvp = L'équipe [accent] {0}[] a gagnée !
 text.sector.gameover = Ce secteur a été perdu. Réessayer?
+text.sector.retry = Réessayer
 text.highscore = [YELLOW]Nouveau meilleur score!
+text.wave.lasted = Vous avez survécu jusqu'à la vague [accent]{0}[].
 text.level.highscore = Meilleur score: [accent]{0}
 text.level.delete.title = Confirmer
+text.map.delete = Êtes-vous sûr de supprimer cette carte"[accent]{0}[]"?
 text.level.select = Sélection de niveau
 text.level.mode = Mode de jeu :
-text.savegame=Sauvegarder la partie
-text.loadgame=Charger la partie 
-text.joingame=Rejoindre une partie 
 text.construction.desktop = Pour désélectionner un bloc ou arrêter de construire, appuyer sur [accent]espace[].
 text.construction.title = Guide de construction des blocs
 text.construction = Vous venez de sélectionner le mode [accent]construction de blocs[].\n\nPour commencez à placer des blocs, appuyez simplement sur un emplacement valide proche de votre vaisseau.\nUne fois que vous avez sélectionné quelques emplacements, Appuyez sur le bouton valider pour confirmer, et votre vaisseau commencera à construire.\n\n- [accent]Enlevez des blocs[] de votre sélection en appuyant dessus.\n- [accent]Déplacez la sélection[] en restant appuyé puis en déplaçant n'importe quel bloc de la sélection.\n- [accent]Placez les blocs en ligne[] En restant appuyé sur un espace vide, puis en étirant dans une direction.\n- [accent]Annulez la construction ou la sélection[] en appuyant sur le X en bas à droite.
+text.deconstruction.title = Block Deconstruction Guide
 text.deconstruction = Vous venez de sélectionner le mode [accent]destruction de blocs[].\n\nPour commencez à détruire des blocs, appuyez simplement sur un bloc proche de votre vaisseau.\nUne fois que vous avez sélectionné quelques blocs, Appuyez sur le bouton valider pour confirmer, et votre vaisseau commencera à détruire.\n\n- [accent]Enlevez des blocs[] de votre sélection en appuyant dessus.\n- [accent]Déplacez la sélection[] en restant appuyé puis en déplaçant n'importe quel bloc de la sélection.\n- [accent]Placez les blocs en ligne[] En restant appuyé sur un espace vide, puis en étirant dans une direction.\n- [accent]Annulez la construction ou la sélection[] en appuyant sur le X en bas à droite.
 text.showagain = Ne pas montrer la prochaine fois
 text.coreattack = [scarlet]<La base est sous les feux ennemis>
 text.unlocks = Débloqué
+text.savegame = Sauvegarder la partie
+text.loadgame = Charger la partie
+text.joingame = Rejoindre une partie
 text.addplayers = Ajouter/Enlever des joueurs
 text.customgame = Partie personnalisée
 text.sectors = Secteurs
 text.sector = Secteur: [LIGHT_GRAY]{0}
 text.sector.time = Temps: [LIGHT_GRAY]{0}
 text.sector.deploy = Se déployer
+text.sector.abandon = Abandonner
+text.sector.abandon.confirm = Êtes-vous sûr d'abandonner ce secteur ?\nCe choix ne peut être annulé!
 text.sector.resume = Reprendre
 text.sector.locked = [scarlet][[Incomplet]
 text.sector.unexplored = [accent][[Inexploré]
-
 text.missions = Missions:[LIGHT_GRAY] {0}
 text.mission = Mission:[LIGHT_GRAY] {0}
+text.mission.main = Main Mission:[LIGHT_GRAY] {0}
 text.mission.info = Infos sur la Mission
 text.mission.complete = Mission terminée!
 text.mission.complete.body = Le secteur {0},{1} a été conquis.
@@ -56,7 +62,7 @@ text.mission.linknode=Reliez un transmetteur
 text.mission.display = [accent]Mission:\n[LIGHT_GRAY]{0}
 text.mission.mech = Équiper ce mécha[accent] {0}[]
 text.mission.create = Créez[accent] {0}[]
-text.none=<none>
+text.none = <vide>
 text.close = Fermer
 text.quit = Quitter
 text.maps = Cartes
@@ -65,17 +71,18 @@ text.nextmission=Prochaine mission
 text.maps.none = [LIGHT_GRAY]Aucune carte trouvée!
 text.about.button = À propos
 text.name = Nom:
+text.filename = File Name:
 text.unlocked = Nouveau bloc débloqué!
 text.unlocked.plural = Nouveaux blocs débloqués!
 text.players = {0} joueurs en ligne
 text.players.single = {0} joueur en ligne
-text.server.mismatch=Erreur de paquet : incompatibilité possible de version client/serveur. Assurez-vous que vous et l'hôte avez la dernière version de Mindustry!
 text.server.closing = [accent]Fermeture du serveur...
 text.server.kicked.kick = Vous avez été expulsé du serveur!
-text.server.kicked.clientOutdated=Client dépassé! Mettez à jour votre jeu!
-text.server.kicked.serverOutdated=Serveur dépassé! Demandez à l'hôte de le mettre à jour!
+text.server.kicked.serverClose = Server closed.
 text.server.kicked.sectorComplete = Secteur terminé.
 text.server.kicked.sectorComplete.text = Votre mission est complète .\nLe serveur va maintenant aller au prochain secteur .
+text.server.kicked.clientOutdated = Client dépassé! Mettez à jour votre jeu!
+text.server.kicked.serverOutdated = Serveur dépassé! Demandez à l'hôte de le mettre à jour!
 text.server.kicked.banned = Vous êtes banni sur ce serveur.
 text.server.kicked.recentKick = Vous avez été expulsé récemment.\nAttendez avant de vous connecter à nouveau.
 text.server.kicked.nameInUse = Il y a déjà quelqu'un avec ce nom\nsur ce serveur.
@@ -105,10 +112,6 @@ text.trace.lastblockbroken=Dernier bloc détruit: [accent]{0}
 text.trace.totalblocksplaced = Total de blocs placés: [accent]{0}
 text.trace.lastblockplaced = Dernier bloc placé: [accent]{0}
 text.invalidid = text.invalidid=ID du client invalide! Soumettre un rapport d'erreur
-text.server.port=Port:
-text.server.addressinuse=Addresse déjà utilisée!
-text.server.invalidport=numéro de port invalide!
-text.server.error=[crimson]Erreur d'hébergement: [orange]{0}
 text.server.bans = Bannis
 text.server.bans.none = Aucun joueur banni trouvé!
 text.server.admins = Administrateurs
@@ -132,31 +135,34 @@ text.disconnect=Déconnecté.
 text.disconnect.data = Les données du monde n'ont pas pu être chargées !
 text.connecting = [accent]Connexion...
 text.connecting.data = [accent]Chargement des données du monde...
-text.connectfail=[crimson]Échec de la connexion au serveur : [orange]{0}
-text.overwrite=Écraser
-text.selectslot=Sélectionner une sauvegarde.
-text.slot=[accent]Emplacement {0}
-text.save.corrupted=[orange]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]non[] un bug.
-text.sector.corrupted=[orange]Une sauvegarde pour ce secteur a été trouvé, mais son chargement a raté.\nUne nouvelle sauvegarde a été créé.
-text.empty=<vide>
-text.on=On
-text.off=Off
+text.server.port = Port:
+text.server.addressinuse = Addresse déjà utilisée!
+text.server.invalidport = numéro de port invalide!
+text.server.error = [crimson]Erreur d'hébergement: [accent]{0}
 text.save.old = Cette sayvegarde provient d'une ancienne version du jeu, et ne peut plus être utilisée.\n\n[LIGHT_GRAY]la compabilité des anciennes sauvegardes sera bientôt ajoutée dans la version 4.0 stable.
 text.save.new = Nouvelle sauvegarde
 text.save.overwrite = Êtes-vous sûr d'écraser\ncette sauvegarde ?
+text.overwrite = Écraser
 text.save.none = Aucune sauvegarde trouvée !
 text.saveload = [accent]Sauvegarde...
 text.savefail = Échec de la sauvegarde!
 text.save.delete.confirm = Êtes-vous sûr de supprimer cette sauvegarde?
 text.save.delete = supprimer
 text.save.export = Exporter une\nSauvegarde
-text.save.import.invalid=[orange]Cette sauvegarde est invalide!
-text.save.import.fail=[crimson]L'importation de la sauvegarde\na échoué: [orange]{0}
-text.save.export.fail=[crimson]L'exportation de la sauvegarde\na échoué [orange]{0}
+text.save.import.invalid = [accent]Cette sauvegarde est invalide!
+text.save.import.fail = [crimson]L'importation de la sauvegarde\na échoué: [accent]{0}
+text.save.export.fail = [crimson]L'exportation de la sauvegarde\na échoué [accent]{0}
 text.save.import = Importer une sauvegarde
 text.save.newslot = Nom de la sauvegarde:
 text.save.rename = Renommer
 text.save.rename.text = Nouveau nom:
+text.selectslot = Sélectionner une sauvegarde.
+text.slot = [accent]Emplacement {0}
+text.save.corrupted = [accent]Fichier de sauvegarde corrompu ou invalide!\nSi vous venez de mettre à jour votre jeu, c'est probablement dû à un changement du format de sauvegarde et [scarlet]non[] un bug.
+text.sector.corrupted = [accent]Une sauvegarde pour ce secteur a été trouvé, mais son chargement a raté.\nUne nouvelle sauvegarde a été créé.
+text.empty = <vide>
+text.on = On
+text.off = Off
 text.save.autosave = Sauvegarde automatique: {0}
 text.save.map = Carte: {0}
 text.save.wave = Vague {0}
@@ -174,16 +180,17 @@ text.back=Retour
 text.quit.confirm = Êtes-vous sûr de partir?
 text.changelog.title = Notes de mise à jour
 text.changelog.loading = Récupération des notes de mise à jour...
-text.changelog.error.android=[orange]Remarquez que les notes de mise à jour peuvent ne pas marcher sur Android 4.4 et inférieur!\nC'est dû à un bug interne d'Android .
-text.changelog.error.ios=[orange]Les notes de mise à jour ne sont pas suppporté sur iOS.
+text.changelog.error.android = [accent]Remarquez que les notes de mise à jour peuvent ne pas marcher sur Android 4.4 et inférieur!\nC'est dû à un bug interne d'Android .
+text.changelog.error.ios = [accent]Les notes de mise à jour ne sont pas suppporté sur iOS.
 text.changelog.error = [scarlet]Erreur lors de la récupération des notes de mises à jour!\nVérifiez votre connexion internet.
 text.changelog.current = [yellow][[Version actuelle]
-text.changelog.latest=[orange][[Dernière version]
+text.changelog.latest = [accent][[Dernière version]
 text.loading = [accent]Chargement...
 text.saving = [accent]Sauvegarde...
-text.wave=[orange]Vague {0}
+text.wave = [accent]Vague {0}
 text.wave.waiting = [LIGHT_GRAY]Vague dans {0}
 text.waiting = [LIGHT_GRAY]En attente...
+text.waiting.players = En attente de joueurs...
 text.wave.enemies = [LIGHT_GRAY]{0} Ennemis restants
 text.wave.enemy = [LIGHT_GRAY]{0} Ennemi restant
 text.loadimage = Charger l'image
@@ -194,6 +201,7 @@ text.builtin=Pré-fait
 text.map.delete.confirm = Êtes-vous sûr de supprimer cette carte? Cette action ne peut pas être défaite!
 text.map.random = [accent]Carte aléatoire
 text.map.nospawn = Cette carte n'a pas de base pour que le joueur y apparaisse! Ajouter une [ROYAL]base bleue[] sur cette carte dans l'éditeur.
+text.map.nospawn.pvp = Cette carte n'a pas de base ennemies pour qu'un joueur ennemi y apparaisse! Ajouter au moins une [SCARLET]Base rouge[] sur cette carte dans l'éditeur.
 text.map.invalid = Erreur lors du chargement de la carte: carte corrompue ou invalide.
 text.editor.brush = Pinceau
 text.editor.slope = \\
@@ -206,9 +214,8 @@ text.editor.description=Description:
 text.editor.name = Nom:
 text.editor.teams = Équipe
 text.editor.elevation = Élevation
-text.editor.badsize=[orange]Dimensions de l'image invalide![]\nDimensions valides de carte: {0}
-text.editor.errorimageload=Erreur lors du chargement du fichier:\n[orange]{0}
-text.editor.errorimagesave=Erreur lors de la sauvegarde du fichier:\n[orange]{0}
+text.editor.errorimageload = Erreur lors du chargement du fichier:\n[accent]{0}
+text.editor.errorimagesave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
 text.editor.generate = Générer
 text.editor.resize = Redimensionner
 text.editor.loadmap = Charger une carte
@@ -252,6 +259,14 @@ text.tutorial=Tutoriel
 text.editor = Éditeur
 text.mapeditor = Éditeur de carte
 text.donate = Faire un\ndon
+text.connectfail = [crimson]Échec de la connexion au serveur : [accent]{0}
+text.error.unreachable = Server injoignable.
+text.error.invalidaddress = Adresse invalide.
+text.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!
+text.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 !
+text.error.alreadyconnected = Déjà connecté.
+text.error.mapnotfound = Fichier de la carte introuvable!
+text.error.any = Erreur réseau inconnue.
 text.settings.language = Langage
 text.settings.reset = Valeur par défaut.
 text.settings.rebind = Réatttribuer
@@ -271,6 +286,7 @@ text.no=Non
 text.info.title = Info
 text.error.title = [crimson]Une erreur s'est produite
 text.error.crashtitle = Une erreur s'est produite
+text.blocks.unknown = [LIGHT_GRAY]???
 text.blocks.blockinfo = Info sur le bloc
 text.blocks.powercapacity = capacité d'énergie
 text.blocks.powershot = Énergie/Tir
@@ -286,28 +302,33 @@ text.blocks.powerdamage=Énergie/Dégâts
 text.blocks.inputitemcapacity = Capacité d'entrée
 text.blocks.outputitemcapacity = Capacité de sortie
 text.blocks.itemcapacity = Stockage
-text.blocks.maxpowergeneration=Génération maximale d'énergie
+text.blocks.basepowergeneration = Base Power Generation
 text.blocks.powertransferspeed = Vitesse de transfert d'énergie
 text.blocks.craftspeed = Vitesse de production
 text.blocks.inputliquid = Liquide requis
 text.blocks.inputliquidaux = Liquide optionnel
+text.blocks.inputitem = Input Item
 text.blocks.inputitems = objets utilisés
 text.blocks.outputitem = Objet produit
 text.blocks.drilltier = Forable
 text.blocks.drillspeed = Vitesse de forage de base
 text.blocks.liquidoutput = Liquide en sortie
+text.blocks.liquidoutputspeed = Vitesse de production de liquide
 text.blocks.liquiduse = Quantité de liquide utilisée
 text.blocks.coolant = Liquide de refroidissement
 text.blocks.coolantuse = Quantité de liquide de refroidissement utilisée
 text.blocks.inputliquidfuel = Carburant liquide
 text.blocks.liquidfueluse = Quantité de carburant liquide utilisé
-text.blocks.reload=Tirs/Seconde
-text.blocks.inputfuel=Carburant
-text.blocks.fuelburntime=Durée du carburant
-text.blocks.explosive=Hautement explosif!
+text.blocks.boostitem = Boost Item
+text.blocks.boostliquid = Boost Liquid
 text.blocks.health = Santé
 text.blocks.inaccuracy = Précision
 text.blocks.shots = Tir
+text.blocks.reload = Tirs/Seconde
+text.blocks.inputfuel = Carburant
+text.blocks.fuelburntime = Durée du carburant
+text.blocks.inputcapacity = Capacité d'entrée
+text.blocks.outputcapacity = Capacité de production
 text.unit.blocks = blocs
 text.unit.powersecond = Énergie/seconde
 text.unit.liquidsecond = Liquides/seconde
@@ -317,7 +338,6 @@ text.unit.liquidunits=Unité de liquide
 text.unit.powerunits = Unité d'énergie
 text.unit.degrees = degrés
 text.unit.seconds = secondes
-text.unit.none=
 text.unit.items = Objets
 text.category.general = Général
 text.category.power = Énergie
@@ -325,76 +345,78 @@ text.category.liquids=Liquides
 text.category.items = Objets
 text.category.crafting = Fabrication
 text.category.shooting = Défense
+text.category.optional = Optional Enhancements
+setting.autotarget.name = Visée automatique
+setting.fpscap.name = Max FPS
+setting.fpscap.none = None
+setting.fpscap.text = {0} FPS
+setting.difficulty.training = entraînement
 setting.difficulty.easy = facile
 setting.difficulty.normal = normal
 setting.difficulty.hard = difficile
 setting.difficulty.insane = Extreme
-setting.difficulty.purge=Purge
 setting.difficulty.name = Difficulté:
-setting.difficulty.training=entraînement
 setting.screenshake.name = Tremblement d'écran
-setting.indicators.name=Indicateurs ennemis
 setting.effects.name = Montrer les effets
 setting.sensitivity.name = Sensibilité de la manette
 setting.saveinterval.name = Intervalle des sauvegardes auto
 setting.seconds = {0} secondes
 setting.fullscreen.name = Plein écran
-setting.multithread.name=Multithreading [scarlet] (instable!)
 setting.fps.name = Afficher FPS
 setting.vsync.name = VSync
 setting.lasers.name = Afficher les rayons des lasers
-setting.healthbars.name=Afficher les barres de santé des entités
 setting.minimap.name = montrer la minimap
 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
 text.keybind.title = Paramétrer les touches
+category.general.name = General
+category.view.name = Voir
+category.multiplayer.name = Multijoueur
+command.attack = Attaque
+command.retreat = Retraite
+command.patrol = Patrouille
+keybind.press = Appuyer sur une touche...
+keybind.press.axis = Appuyer sur un axe ou une touche...
 keybind.move_x.name = mouvement x
 keybind.move_y.name = mouvement y
 keybind.select.name = sélectionner
 keybind.break.name = Pause
+keybind.deselect.name = Déselectionner
 keybind.shoot.name = tirer
 keybind.zoom_hold.name = tenir le zoom
 keybind.zoom.name = zoom
 keybind.menu.name = menu
 keybind.pause.name = Pause
-keybind.dash.name=sprint
+keybind.dash.name = Courir
 keybind.chat.name = chat
 keybind.player_list.name = Liste des joueurs
 keybind.console.name = console
 keybind.rotate.name = Tourner
-mode.waves.name=Vagues
-mode.sandbox.name=bac à sable
-mode.freebuild.name=construction libre
-liquid.water.name=Eau
-liquid.lava.name=Lave
-liquid.oil.name=Pétrole
-setting.autotarget.name=Visée automatique
-category.general.name=General
-category.view.name=View
-category.multiplayer.name=Multiplayer
-command.attack=Attack
-command.retreat=Retreat
-command.patrol=Patrol
-keybind.toggle_menus.name=Toggle menus
-keybind.chat_history_prev.name=Chat history prev
-keybind.chat_history_next.name=Chat history next
+keybind.toggle_menus.name = Cacher/afficher les menus
+keybind.chat_history_prev.name = remonter l'historique du chat 
+keybind.chat_history_next.name = descendre l'historique du chat
 keybind.chat_scroll.name = Chat scroll
 keybind.drop_unit.name = drop unit
 keybind.zoom_minimap.name = Zoom minimap
 mode.text.help.title = Description des modes de jeu
+mode.waves.name = Vagues
 mode.waves.description = le mode de jeu normal. Ressource limitée et vagues d'ennemis.
+mode.sandbox.name = bac à sable
 mode.sandbox.description = Ressources infinies et pas de timer pour les vagues.
-mode.custom.warning=Notez que les blocs débloqués en partie personnalisées ne sont pas conservés pour les secteurs.\n\n[LIGHT_GRAY]En mode bac à sable, seul les blocs débloqués en mode secteur peuvent être utilisés.
+mode.freebuild.name = construction libre
 mode.freebuild.description = Ressource limitée et pas de timer pour les vagues.
+mode.pvp.name = JcJ
+mode.pvp.description = Battez-vous contre d'autres joueurs en local.
 content.item.name = Objets
 content.liquid.name = Liquides
 content.unit.name = Unités
 content.recipe.name = Blocs
 content.mech.name = Méchas
 item.stone.name = Pierre
-item.stone.description=Un matériau brut commun. Peut-être séparé et raffiné en d'autres matériaux, ou fondus en lave.
+item.stone.description = Un matériau brut commun. Peut être séparé et raffiné en d'autres matériaux, ou fondu en lave.
 item.copper.name = Cuivre
 item.copper.description = Un matériau de construction utile.Utilisé intensivement dans tout les blocs.
 item.lead.name = Plomb
@@ -407,19 +429,25 @@ item.titanium.name=Titane
 item.titanium.description = Un métal rare super-léger largement utilisé dans le transport de liquides et d'objets ainsi que dans les foreuses de haut-niveau et l'aviation .item.thorium.name=Thorium
 item.thorium.name = Thorium
 item.thorium.description = Un métal dense, et radioactif utilisé comme support structurel et comme carburant nucléaire.
-item.silicon.name=Silicon
-item.silicon.description=An extremely useful semiconductor, with applications in solar panels and many complex electronics.
+item.silicon.name = Silicone
+item.silicon.description = Un matériau semi-conducteur extrêmement utile, avec des utilisations dans les panneaux solaires et beaucoup d'autre composants électroniques complexes.
 item.plastanium.name = Plastanium
 item.plastanium.description = Un matériau léger et docile utilisé dans l'aviation avancée et dans les munitions à fragmentation.
-item.phase-matter.name=Matière phasée
+item.phase-fabric.name = Tissu phasé
+item.phase-fabric.description = Une substance au poids quasiment inexistant utilisé pour l'électronique avancé et la technologie auto-réparatrice.
 item.surge-alloy.name = alliage superchargé
+item.surge-alloy.description = Un alliage avancé avec des propriétés électriques avancées.
 item.biomatter.name = Biomasse
+item.biomatter.description = Un mélange de matières organiques; utilisé pour la transformation en huile ou en tant que carburant de base.
 item.sand.name = Sable
 item.sand.description = Un matériau commun utilisé largement dans la fonte, à la fois dans l'alliage et comme un flux.
 item.blast-compound.name = Mélange explosif
 item.blast-compound.description = Un composé volatile utilisé dans les bombes et les explosifs. Bien qu'il puisse être utilisé comme carburant, ce n'est pas conseillé.
 item.pyratite.name = Pyratite
 item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires.
+liquid.water.name = Eau
+liquid.lava.name = Lave
+liquid.oil.name = Pétrole
 liquid.cryofluid.name = liquide cryogénique
 mech.alpha-mech.name = Alpha
 mech.alpha-mech.weapon = fusil automatique
@@ -454,10 +482,6 @@ text.item.explosiveness=[LIGHT_GRAY]Explosivité: {0}
 text.item.flammability = [LIGHT_GRAY]Inflammabilité: {0}
 text.item.radioactivity = [LIGHT_GRAY]Radioactivité: {0}
 text.item.fluxiness = [LIGHT_GRAY]Flux de Puissance: {0}
-text.item.hardness=[LIGHT_GRAY]Dureté: {0}
-text.liquid.heatcapacity=[LIGHT_GRAY]Capacité Thermique: {0}
-text.liquid.viscosity=[LIGHT_GRAY]Viscosité: {0}
-text.liquid.temperature=[LIGHT_GRAY]Température: {0}
 text.unit.health = [LIGHT_GRAY]Health: {0}
 text.unit.speed = [LIGHT_GRAY]Speed: {0}
 text.mech.weapon = [LIGHT_GRAY]Arme: {0}
@@ -466,111 +490,17 @@ text.mech.itemcapacity=[LIGHT_GRAY]Capacité de stockage: {0}
 text.mech.minespeed = [LIGHT_GRAY]Vitesse de minage: {0}
 text.mech.minepower = [LIGHT_GRAY]Puissance du minage: {0}
 text.mech.ability = [LIGHT_GRAY]Compétence: {0}
-
+text.liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique: {0}
+text.liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
+text.liquid.temperature = [LIGHT_GRAY]Température: {0}
+block.constructing = {0}\n[LIGHT_GRAY](Constructing)
 block.spawn.name = Générateur d'ennemi
 block.core.name = Base
 block.metalfloor.name = Sol en métal
-block.copper-wall.name=Mur de cuivre 
-block.copper-wall-large.name=Grand mur de cuivre
-block.thorium-wall.name=Mur en Thorium
-block.dense-alloy-wall.name=Mur en alliage lourd
-block.dense-alloy-wall-large.name=Grand mur en alliage lourd
-block.door.name=Porte
-block.door-large.name=Grande porte
-block.thorium-wall-large.name=Mur en Thorium large
-block.surge-wall.name=mur superchargé
-block.surge-wall-large.name=Grand mur superchargé
-block.phase-wall.name=Mur phasé 
-block.phase-wall-large.name=Grand mur phasé
-block.shock-mine.name=Mines
-block.overdrive-projector.name=Projecteur accélérant
-block.force-projector.name=Projecteur de champ de force
-block.mend-projector.name=Projecteur soignant 
-block.rtg-generator.name=G.T.R.
-block.power-node.name=Transmetteur énergétique
-block.power-node-large.name=Gros transmetteur énergétique
-block.battery.name=Batterie
-block.battery-large.name=Batterie large
-block.combustion-generator.name=Générateur à combustion
-block.turbine-generator.name=Générateur à Turbine
-block.thorium-reactor.name=Réacteur à Thorium 
-block.solar-panel.name=Panneau Solaire
-block.solar-panel-large.name=Grand Panneau Solaire
-block.thermal-generator.name=Générateur thermique
-block.mechanical-drill.name=Foreuse mécanique
-block.pneumatic-drill.name=Foreuse à vérin
-block.laser-drill.name=Foreuse Laser
-block.water-extractor.name=Extracteur d'eau
-block.cultivator.name=Cultivateur
-block.oil-extractor.name=Extracteur d'huile
-block.blast-drill.name=Foreuse à explosion
-block.alloy-smelter.name=Fonderie d'alliage superchargé 
-block.arc-smelter.name=Fonderie d'alliage lourd électrique
-block.silicon-smelter.name=Fonderie de Silicone
-block.phase-weaver.name=Tisseur à Phase
-block.pulverizer.name=Pulvérisateur
-block.cryofluidmixer.name=Refroidisseur
-block.melter.name=Four à Fusion
-block.incinerator.name=Incinérateur
-block.biomattercompressor.name=Compresseur de Biomasse
-block.separator.name=Séparateur
-block.centrifuge.name=Centrifugeuse
-block.plastanium-compressor.name=Compresseur de Plastanium
-block.pyratite-mixer.name=Mixeur à Pyratite
-block.blast-mixer.name=Mixeur à Explosion
-block.solidifer.name=Solidifieur
-block.arc.name=Arc
-block.spectre.name=Spectre
-block.meltdown.name=Meltdown
-block.cyclone.name=Cyclone
-block.fuse.name=Fuse
-block.duo.name=Duo
-block.scorch.name=Scorch
-block.hail.name=Hail
-block.lancer.name=Lancier
-block.wave.name=Vague
-block.swarmer.name=Essaim
-block.salvo.name=Salve
-block.ripple.name=Ripple
-block.conveyor.name=Convoyeur
-block.titanium-conveyor.name=Convoyeur en titane
-block.phase-conveyor.name=convoyeur phasé
-block.mass-driver.name=Transporteur de masse
-block.router.name=[accent]routeur[]
-block.router.description=Distribue les articles dans les 4 directions. Le seul et l'unique.
-block.distributor.name=Distributeur
-block.distributor.description=C'est un bloc qui peut envoyer les articles dans 8 directions.
-block.sorter.description=Trie les articles. Si un article rcorrespond à la sélection, il peut passer. Autrement, l'article est distribué vers la gauche ou la droite.
-block.overflow-gate.name=Barrière de Débordement
-block.overflow-gate.description=C'est la combinaison entre un Routeur et un Diviseur qui peut seulement distribuer à gauche et à droite si le chemin de devant est bloqué.
-block.bridgeconveyor.name=Pont
-block.bridge-conveyor.name=Pont
-block.bridgeconveyor.description=C'est un convoyeur qui peut passer par-dessus les blocs, jusqu'à deux blocs de distance.
-block.bridge-conveyor.description=C'est un convoyeur qui peut passer par-dessus les blocs, jusqu'à deux blocs de distance.
-block.junction.name=Jonction
-block.itemsource.name=Source d'objets
-block.itemvoid.name=Destructeur d'objets
-block.liquidsource.name=Source de liquide
-block.powervoid.name=absorbeur énergétique
-block.powerinfinite.name=Puissance infinie
-block.unloader.name=Déchargeur
-block.sortedunloader.name=Déchargeur-trieur
-block.vault.name=Coffre-Fort
-block.repair-point.name=Point de Réparation
-block.conduit.name=Conduit
-block.pulse-conduit.name=Conduit à Impulsion
-block.phase-conduit.name=Conduit à Phase
-block.liquid-router.name=Routeur de Liquide
-block.liquid-tank.name=Réservoir à Liquide
-block.liquid-junction.name=Jonction à Liquide
-block.bridge-conduit.name=Pont à liquide
-block.rotary-pump.name=Pompe Rotative
-block.mechanical-pump.name=Pompe mécanique
-block.thermal-pump.name=Pompe thermique
 block.deepwater.name = eau profonde
 block.water.name = eau
 block.lava.name = lave
-block.oil.name=pétrole
+block.tar.name = pétrole
 block.blackstone.name = roche sombre
 block.stone.name = roche
 block.dirt.name = terre
@@ -582,7 +512,52 @@ block.shrub.name=buisson
 block.rock.name = pierre
 block.blackrock.name = pierre sombre
 block.icerock.name = pierre gelée
-block.command-center.name=Centre de commandement
+block.copper-wall.name = Mur de cuivre
+block.copper-wall-large.name = Grand mur de cuivre
+block.dense-alloy-wall.name = Mur en alliage lourd
+block.dense-alloy-wall-large.name = Grand mur en alliage lourd
+block.phase-wall.name = Mur phasé
+block.phase-wall-large.name = Grand mur phasé
+block.thorium-wall.name = Mur en Thorium
+block.thorium-wall-large.name = Mur en Thorium large
+block.door.name = Porte
+block.door-large.name = Grande porte
+block.duo.name = Duo
+block.scorch.name = Scorch
+block.hail.name = Hail
+block.lancer.name = Lancier
+block.conveyor.name = Convoyeur
+block.titanium-conveyor.name = Convoyeur en titane
+block.junction.name = Jonction
+block.router.name = [accent]routeur[]
+block.distributor.name = Distributeur
+block.sorter.name = Sorteur
+block.sorter.description = Trie les articles. Si un article rcorrespond à la sélection, il peut passer. Autrement, l'article est distribué vers la gauche ou la droite.
+block.overflow-gate.name = Barrière de Débordement
+block.overflow-gate.description = C'est la combinaison entre un Routeur et un Diviseur qui peut seulement distribuer à gauche et à droite si le chemin de devant est bloqué.
+block.smelter.name = Fonderie d'alliage lourd
+block.arc-smelter.name = Fonderie d'alliage lourd électrique
+block.silicon-smelter.name = Fonderie de Silicone
+block.phase-weaver.name = Tisseur à Phase
+block.pulverizer.name = Pulvérisateur
+block.cryofluidmixer.name = Refroidisseur
+block.melter.name = Four à Fusion
+block.incinerator.name = Incinérateur
+block.biomattercompressor.name = Compresseur de Biomasse
+block.separator.name = Séparateur
+block.centrifuge.name = Centrifugeuse
+block.power-node.name = Transmetteur énergétique
+block.power-node-large.name = Gros transmetteur énergétique
+block.battery.name = Batterie
+block.battery-large.name = Batterie large
+block.combustion-generator.name = Générateur à combustion
+block.turbine-generator.name = Générateur à Turbine
+block.mechanical-drill.name = Foreuse mécanique
+block.pneumatic-drill.name = Foreuse à vérin
+block.laser-drill.name = Foreuse Laser
+block.water-extractor.name = Extracteur d'eau
+block.cultivator.name = Cultivateur
+block.alpha-mech-pad.name = Reconstructeur de mécha "Alpha"
 block.dart-ship-pad.name = Reconstructeur de vaisseau "Dard"
 block.delta-mech-pad.name = Reconstructeur de mécha "Delta"
 block.javelin-ship-pad.name = Reconstructeur de vaisseau "Javelin"
@@ -590,17 +565,80 @@ block.trident-ship-pad.name=Reconstructeur de vaisseau "Trident"
 block.glaive-ship-pad.name = Reconstructeur de vaisseau "Glaive
 block.omega-mech-pad.name = Reconstructeur de mécha "Oméga"
 block.tau-mech-pad.name = Reconstructeur de mécha "Tau"
-block.dagger-factory.name=Usine de "Poignards"
-block.revenant-factory.name=Usine de "Revenants"
+block.conduit.name = Conduit
+block.mechanical-pump.name = Pompe mécanique
+block.itemsource.name = Source d'objets
+block.itemvoid.name = Destructeur d'objets
+block.liquidsource.name = Source de liquide
+block.powervoid.name = absorbeur énergétique
+block.powerinfinite.name = Puissance infinie
+block.unloader.name = Déchargeur
+block.vault.name = Coffre-Fort
+block.wave.name = Vague
+block.swarmer.name = Essaim
+block.salvo.name = Salve
+block.ripple.name = Ripple
+block.phase-conveyor.name = convoyeur phasé
+block.bridge-conveyor.name = Pont
+block.plastanium-compressor.name = Compresseur de Plastanium
+block.pyratite-mixer.name = Mixeur à Pyratite
+block.blast-mixer.name = Mixeur à Explosion
+block.solidifer.name = Solidifieur
+block.solar-panel.name = Panneau Solaire
+block.solar-panel-large.name = Grand Panneau Solaire
+block.oil-extractor.name = Extracteur d'huile
 block.spirit-factory.name = Usine de "Drones spirituels"
 block.phantom-factory.name = Usine de "Drones fantômes"
 block.wraith-factory.name = Usine de "Combattants spectraux"
 block.ghoul-factory.name = Usine de "Bombardiers goules"
+block.dagger-factory.name = Usine de "Poignards"
 block.titan-factory.name = Usine de "Titans"
+block.fortress-factory.name = Usine de "Forteresse"
+block.revenant-factory.name = Usine de "Revenants"
+block.repair-point.name = Point de Réparation
+block.pulse-conduit.name = Conduit à Impulsion
+block.phase-conduit.name = Conduit à Phase
+block.liquid-router.name = Routeur de Liquide
+block.liquid-tank.name = Réservoir à Liquide
+block.liquid-junction.name = Jonction à Liquide
+block.bridge-conduit.name = Pont à liquide
+block.rotary-pump.name = Pompe Rotative
+block.thorium-reactor.name = Réacteur à Thorium
+block.command-center.name = Centre de commandement
+block.mass-driver.name = Transporteur de masse
+block.blast-drill.name = Foreuse à explosion
+block.thermal-pump.name = Pompe thermique
+block.thermal-generator.name = Générateur thermique
+block.alloy-smelter.name = Fonderie d'alliage superchargé
+block.mend-projector.name = Projecteur soignant
+block.surge-wall.name = mur superchargé
+block.surge-wall-large.name = Grand mur superchargé
+block.cyclone.name = Cyclone
+block.fuse.name = Fuse
+block.shock-mine.name = Mines
+block.overdrive-projector.name = Projecteur accélérant
+block.force-projector.name = Projecteur de champ de force
+block.arc.name = Arc
+block.rtg-generator.name = G.T.R.
+block.spectre.name = Spectre
+block.meltdown.name = Meltdown
+block.container.name = Conteneur
+block.core.description = Le batiment le plus important du jeu .
+team.blue.name = bleu
+team.red.name = rouge
+team.orange.name = orange
+team.none.name = gris
+team.green.name = vert
+team.purple.name = violet
+unit.alpha-drone.name = Alpha Drone
 unit.spirit.name = Drone sppirituel
 unit.spirit.description = L'unité de soutien de départ.Apparaît dans la base par défaut .Mine automatiquement les minerais, récupère les objets au sol et répare les blocs.
 unit.phantom.name = Drone Fantôme
 unit.phantom.description = Une unité de soutien avancée. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs. Bien plus efficace qu'un drone spirituel.
+unit.dagger.name = Poignard
+unit.dagger.description = Une unité terrestre basiquee. Utile en armée.
+unit.titan.name = Titan
+unit.titan.description = Une unité terrestre cuirassée avancée. Attaque les unités terrestres comme aériennes.
 unit.ghoul.name = Bombardier goule
 unit.ghoul.description = Un bombardier lourd . Utilise de la pyratite ou des explosifs comme munitions.
 unit.wraith.name = Combattant spectral
@@ -630,28 +668,113 @@ tutorial.daggerfactory=Construire [accent]une usine de "Poignards" []est recomma
 tutorial.router = Les usines ont besoin de ressources pour fonctionner.\nCréez un routeur pour séparer les objets.
 tutorial.dagger = Reliez des transmetteurs énergétiques à l'usine.\nUne fois que les conditions seront remplies , un mécha sera créé.\nConstruisez autant de foreuses, de générateurs et de tapis roulants que nécessaire.
 tutorial.battle = [LIGHT_GRAY]L'Ennemi[] a révélé sa base .\nDétruisez la avec votre unité et des méchas "Poignard".
-text.link.discord.description=the official Mindustry discord chatroom
-text.sector.retry=Retry
-text.wave.lasted=You lasted until wave [accent]{0}[].
-text.map.delete=Are you sure you want to delete the map "[orange]{0}[]"?
-text.deconstruction.title=Block Deconstruction Guide
-text.server.kicked.serverClose=Server closed.
-text.blocks.inputitem=Input Item
-text.blocks.inputcapacity=Input capacity
-text.blocks.outputcapacity=Output capacity
-setting.fpscap.name=Max FPS
-setting.fpscap.none=None
-setting.fpscap.text={0} FPS
-keybind.press=Press a key...
-keybind.press.axis=Press an axis or key...
-keybind.deselect.name=Deselect
-item.silcion.description=An extremely useful semiconductor, with applications in solar panels and many complex electronics.
-item.biomatter.description=A clump of organic mush; used for conversion into oil or as a basic fuel.
-block.sorter.name=Sorter
-block.smelter.name=Smelter
-block.fortress-factory.name=Fortress Mech Factory
-unit.alpha-drone.name=Alpha Drone
-unit.dagger.name=Dagger
-unit.dagger.description=A basic ground unit. Useful in swarms.
-unit.titan.name=Titan
-unit.titan.description=An advanced, armored ground unit. Attacks both ground and air targets.
+block.copper-wall.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles dans les premières lors des premières vagues.
+block.copper-wall-large.description = Un bloc défensif à faible coût.\nUtile pour protéger la base et les tourelles dans les premières lors des premières vagues.\nFait du 2 sur 2.
+block.dense-alloy-wall.description = Un bloc défensif standard .\nProcure une bonne protection contre les ennemis.
+block.dense-alloy-wall-large.description = Un bloc défensif standard .\nProcure une bonne protection contre les ennemis.\nFait du 2 sur 2.
+block.thorium-wall.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les ennemis.
+block.thorium-wall-large.description = Un bloc défensif puissant.\nProcure une très bonne protection contre les ennemis.\nFait du 2 sur 2.
+block.phase-wall.description = Moins puissant qu'un mur en Thorium mais déviera les balles sauf si elles sont trop puissantes.
+block.phase-wall-large.description = Moins puissant qu'un mur en Thorium mais déviera les balles sauf si elles sont trop puissantes.\nFait du 2 sur 2.
+block.surge-wall.description = Le plus puissant bloc défensif .\nA une faible chance de créer des éclairs vers les ennemis .
+block.surge-wall-large.description = Le plus puissant bloc défensif .\nA une faible chance de créer des éclairs vers les ennemis .\nFait du 2 sur 2.
+block.door.description = Une petite porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte les ennemis peuvent tirer et passer à travers.
+block.door-large.description = Une large porte pouvant être ouverte et fermée en appuyant dessus.\nSi elle est ouverte les ennemis peuvent tirer et passer à travers.\nFait du 2 sur 2.
+block.mend-projector.description = Soigne périodiquement les batiments autour de lui.
+block.overdrive-projector.description = Accélère les batiments autour de lui, notamment les foreuses et les convoyeurs.
+block.force-projector.description = Crée un champ de force hexagonal autour de lui qui protège les batiments et les unités à l'intérieur de prendre des dégâts à cause des balles.
+block.shock-mine.description = Blesse les ennemis qui marchent dessus. Quasiment invisble pour l'ennemi.
+block.duo.description = une petite tourelle avec un coût faible .
+block.arc.description = une petite tourelle tirant des arcs électrques vers les ennemis.
+block.hail.description = une petite tourelle d'artillerie.
+block.lancer.description = une tourelle de taille moyenne tirant des rayons chargés en électricité.
+block.wave.description = une tourelle de taille moyenne tirant rapidement des bulles de liquide .
+block.salvo.description = une tourelle de taille moyenne qui tire par salves.
+block.swarmer.description = une tourelle de taille moyenne qui tire des missiles qui se dispersent.
+block.ripple.description = Une grande tourelle d'artillerie qui tire plusieurs tirs simultanément.
+block.cyclone.description = Une grande tourelle tirant rapidement ... très rapidement .
+block.fuse.description = Une grande tourelle qui tire de puissants rayons lasers avec une faible portée.
+block.spectre.description = Une grande tourelle qui tire deux puissantes balles simultanément.
+block.meltdown.description = Une grande tourelle tirant de puissants rayons lasers avec une grande portée.
+block.conveyor.description = Convoyeur basique servant à transporter des objets. Les objets déplacés en avant sont automatiquement déposés dans les tourelles ou les batiments. Peut être tourné.
+block.titanium-conveyor.description = Convoyeur avancé . Déplace les objets plus rapidement que les convoyeurs standards.
+block.phase-conveyor.description = convoyeur très avancé . Utilise de l'énergie pour téléporter des objets à un convoyeur phasé connecté jusqu'à une longue distance .
+block.junction.description = Agit comme un pont pour deux ligne de convoyeurs se croisant. Utile lorsque deux différents convoyeurs déplacent différents matériaux à différents endroits.
+block.mass-driver.description = Batiment de transport d'objet [accent]ultime[]. Collecte un grand nombre d'objets puis les tire à un autre transporteur de masse sur une très longue distance.
+block.smelter.description = Brûle du charbon pour fondre du cuivre et du plomb en un alliage lourd.
+block.arc-smelter.description = Fait fondre du cuivre et du plomb en un alliage lourd en utilisant une source d'énergie extérieure .
+block.silicon-smelter.description = Utilise du sable, du charbon et de l'énergie afin de produire du silicone.
+block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane.
+block.phase-weaver.description = Produit du tissu phasé à partir de thorium et de grandes quantités de sable.
+block.alloy-smelter.description = Produit un alliage superchargé à l'aide de titane de plomb de silicone et de cuivre.
+block.pulverizer.description = Écrase la pierre pour en faire du sable. Utile quand il y a un manque de sable naturel.
+block.pyratite-mixer.description = Mélange charbon, plomb et sable en l'hautement inflammable pyratite.
+block.blast-mixer.description = Utilise du pétrole pour transformer la pyratite en un mélange explosif moins inflammable mais plus explosif que la pyratite.
+block.cryofluidmixer.description = Combine de l'eau et du titane en un liquide cryogénique bien plus efficace pour refroidir.
+block.solidifer.description = Refroidit de la lave en pierre très rapidement.
+block.melter.description = chauffe de la pierre à de très hautes températures pour obtenir de la lave.
+block.incinerator.description = Permet de se débarasser de n'importe quel objet ou liquide en exces .
+block.biomattercompressor.description = Compresse de la biomasse pour en récupérer le pétrole.
+block.separator.description = Expose la pierre à de l'eau sous pression afin d'obtenir différents minéraux contenus dansla pierre.
+block.centrifuge.description = Plus efficace qu'un séparateur mais aussi plus cher à construire et demande plus d'énergie.
+block.power-node.description = Transmet l'énergie aux transmetteurs énergétiques connectés . Jusqu'à quatre sources d'énergie, consommateurs ou transmetteurs peuvent être connectés. Le transmetteur recevra de l'énergie ou le transmettra à n'importe quel batiment adjacent.
+block.power-node-large.description = A un plus grand rayon que le transmetteur énergétique standard et jusqu'à six sources d'énergie, consommateurs ou transmetteurs peuvent être connectés. 
+block.battery.description = Stocke l'énergie quand elle est en abondance et le distribue si il y a trop peu d'énergie tant qu'il lui reste de l'énergie.
+block.battery-large.description = Stocke bien plus d'énergie qu'une batterie normale.
+block.combustion-generator.description = Génère de l'énergie en brûlant du pétrole ou des matériaux inflammables.
+block.turbine-generator.description = Plus efficace qu'un générateur à combustion, mais requiert de l'eau .
+block.thermal-generator.description = Génère une grande quantité d'énergie à partir de lave .
+block.solar-panel.description = Génère une faible quantité d'énergie .
+block.solar-panel-large.description = Génère bien plus d'énergie qu'un panneau solaire standard, Mais est aussi bien plus cher à construire.
+block.thorium-reactor.description = Génère énormément d'énergie à l'aide de la radioactivité du thorium. Requiert néanmoins un refroidissement constant. Explosera violemment en cas de surchauffe.
+block.rtg-generator.description = Un générateur thermo-électrique à radioisotope qui ne demande pas de refroidissement mais produit moins d'énergie qu'un réacteur à Thorium.
+block.unloader.description = Décharge des objets depuis des conteneurs, coffres-forts ou de la base sur un convoyeur ou directement dans un bloc adjacent . Le type d'objet peut être changé en appuyant sur le déchargeur.
+block.container.description = Stocke un petit nombre d'objet . Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [LIGHT_GRAY] déchargeur[] peut être utilisé pour récupérer des objets depuis le conteneur.
+block.vault.description = Stocke un grand nombre d'objets. Utile pour réguler le flux d'objet quand la demande de matériaux est inconstante.un [LIGHT_GRAY] déchargeur[] peut être utilisé pour récupérer des objets depuis le coffre-fort.
+block.mechanical-drill.description = Une foreuse de faible coût. Si elle est placée sur à un endroit approprié, produit des matériaux lentement à l'infini.
+block.pneumatic-drill.description = Une foreuse amélioré plus rapide et capable de forer des matériaux plus dur grâce à l'usage de vérins à air comprimé.
+block.laser-drill.description = Permet de forer bien plus vite grâce à la technologie laser, cela demande néanmoins de l'énergie . Additionnellement, le thorium, un matériau radioactif, peut-être récupéré avec cette foreuse.
+block.blast-drill.description = La Foreuse ultime . Demande une grande quantité d'énergie .
+block.water-extractor.description = Extrait l'eau des nappes phréatiques. Utile quand il n'y a pas d'eau à proximité.
+block.cultivator.description = Cultive le sol avec de l'eau afin d'obtenir de la biomasse.
+block.oil-extractor.description = Utilise une grande quantité d'énergie afin d'extraire du pétrole du sable . Utile quand il n'y a pas de lacs de pétrole à proximité.
+block.dart-ship-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un avion de combat basique .\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.trident-ship-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un bombardier lourd raisonnablement cuirassé .\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.javelin-ship-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un intercepteur rapide et puissant avec des armes électriques.\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.glaive-ship-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un large vaisseau cuirassé .\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.tau-mech-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un mécha de support qui peut soigner les batiments et unités alliées.\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.delta-mech-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un mécha rapide mais peu résistant fait pour les stratégies de harcèlement.\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.omega-mech-pad.description = Quitte ton mécha ou ton vaisseau actuel pour un mécha cuirassé et large, fait pour les assauts frontaux .\nUtilisez le reconstructeur en double cliquant dessus lorsque vous êtes dessus.
+block.spirit-factory.description = Produit des petits drones qui réparent les batiments et minent des matériaux.
+block.phantom-factory.description = Produit des drones avancés qui sont bien plus efficaces que les drones spirituels.
+block.wraith-factory.description = Produit des intercepteurs rapides qui harcèlent l'ennemi.
+block.ghoul-factory.description = Produit des bombardiers lourds.
+block.dagger-factory.description = Produit des unités terrestres basiques.
+block.titan-factory.description = Produit des unités terrestres avancées et cuirassées.
+block.fortress-factory.description = Produit des unités terrestres d'artillerie lourde .
+block.revenant-factory.description = Produit des unités terrestres lourdes avec des lasers.
+block.repair-point.description = Soigne en continu l'unité blessée la plus proche tant qu'elle est à sa portée.
+block.command-center.description = Permet de changer le comportement des IA alliées. Pour le moment, l'attaque, la retraite et les patrouilles sont supportées.
+block.conduit.description = tuyau basique permettant le transport de liquide . Marche comme un convoyeur mais avec les liquides. Utile si utilisé avec des extracteurs, des pompes ou d'autres conduits.
+block.pulse-conduit.description = tuyau avancé permettant le transport de liquide . Transporte les liquides plus rapidement et en stocke plus que les tuyaux standards.
+block.phase-conduit.description = tuyau très avancé permettant le transport de liquide. Utilise de l'énergie pour téléporter les liquides à un autre tuyau phasé sur une longue distance.
+block.liquid-router.description = Accepte les liquide en une direction et les rejete de tout les côtés équitablement. Peut aussi stocker une certaine quantité de liquide. Utile pour envoyer un liquide à plusieurs endroits.
+block.liquid-tank.description = Stocke une grande quantité de liquides . Utile pour réguler la sortie quand la demande est inconstante ou comme sécurité pour refroidir des batiments important.
+block.liquid-junction.description = Agit comme une intersection pour deux conduits se croisant.Utile si deux conduits amènent différents liquides à différents endroits.
+block.bridge-conduit.description = bloc de transport de liquide avancé . Permet le transport de liquides jusqu'à 3 blocs de n'importe quel terrain ou batiment .
+block.mechanical-pump.description = Une pompe de faible prix pompant lentement, mais ne consomme pas d'énergie.
+block.rotary-pump.description = Une pompe avancée qui double sa vitesse en utilisant de l'énergie.
+block.thermal-pump.description = La pompe ultime . Trois fois plus rapide qu'une pompe mécanique et la seule pompe capable de récupérer de la lave.
+block.router.description = Accepte les objets depuis une ou plus directions et le renvoie dans n'importe quelle direction. Utile pour séparer une chaîne de convoyeurs en plusieurs.[accent]Le seul et l'Unique[]
+block.distributor.description = Un routeur avancé qui sépare les objets jusqu'à 7 autres directions équitablement.
+block.bridge-conveyor.description = bloc de transport avancé permettant de traverser jusqu'à 3 blocs de n'importe quel terrain ou batiment.
+block.alpha-mech-pad.description = Avec assez d'énergie, reconstruit votre vaisseau en un mécha [accent] Alpha[].
+block.itemsource.description = Produit des objets à l'infini. Bac à sable uniquement .
+block.liquidsource.description = Source de liquide infinie . Bac à sable uniquement.
+block.itemvoid.description = Désintègre n'importe quel objet qui va à l'intérieur sans utiliser d'énergie. Bac à sable uniquement.
+block.powerinfinite.description = Produit de l'énergie à l'infini. Bac à sable uniquement.
+block.powervoid.description = Supprime toute l'énergie allant à l'intérieur.Bac à sable uniquement
+liquid.water.description = Couramment utilisé pour le refroidissement et le traitement des déchets.
+liquid.lava.description = Peut être transformé en [LIGHT_GRAY]pierre[], utilisé pour produire de l'énergie ou utilisé comme munition par certaines tourelles.
+liquid.oil.description = Peut être brûlé, utilisé comme explosif ou comme liquide de refroidissement.
+liquid.cryofluid.description = Le liquide de refroidissement le plus efficace.