From ebc40319224fba634db31fe1231d57ebc2bd1c10 Mon Sep 17 00:00:00 2001
From: LQ <islqislq@gmail.com>
Date: Sat, 13 Oct 2018 20:57:31 +0800
Subject: [PATCH 1/2] set charset (#238)

default file charset is not utf8 when run from win10
---
 tools/src/io/anuke/mindustry/BundleLauncher.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/src/io/anuke/mindustry/BundleLauncher.java b/tools/src/io/anuke/mindustry/BundleLauncher.java
index 5cfe5bf6e6..8cb120d8af 100644
--- a/tools/src/io/anuke/mindustry/BundleLauncher.java
+++ b/tools/src/io/anuke/mindustry/BundleLauncher.java
@@ -10,6 +10,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -29,7 +30,7 @@ public class BundleLauncher {
                 Log.info("Parsing bundle: {0}", child);
 
                 OrderedMap<String, String> other = new OrderedMap<>();
-                PropertiesUtils.load(other, Files.newBufferedReader(child));
+                PropertiesUtils.load(other, Files.newBufferedReader(child, Charset.forName("UTF-8")));
                 removals.clear();
 
                 for(String key : other.orderedKeys()){
@@ -62,7 +63,7 @@ public class BundleLauncher {
                     result.append(e.toString().replace("\\", "\\\\").replace("\n", "\\n"));
                     result.append("\n");
                 }
-                Files.write(child, result.toString().getBytes());
+                Files.write(child, result.toString().getBytes("UTF-8"));
 
             }catch (IOException e){
                 throw new RuntimeException(e);
@@ -70,4 +71,4 @@ public class BundleLauncher {
         });
     }
 
-}
\ No newline at end of file
+}

From 554b7d2ec4c81e048a6425c7ac82ad985929463b Mon Sep 17 00:00:00 2001
From: Baramos666 <43490889+Baramos666@users.noreply.github.com>
Date: Sat, 13 Oct 2018 14:58:04 +0200
Subject: [PATCH 2/2] Update bundle_fr.properties (#239)

---
 core/assets/bundles/bundle_fr.properties | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index ae7a4628da..676749fb74 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -55,6 +55,8 @@ text.sector.deploy=Se déployer
 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.info=Infos sur la Mission
 text.mission.complete=Mission terminée!
@@ -350,7 +352,7 @@ text.unit.pixelssecond=Pixels/seconde
 text.unit.liquidunits=Unité de liquide
 text.unit.powerunits=Unité d'énergie
 text.unit.degrees=degrés
-text.unit.seconds=secondes
+text.unit.seconds=secondes 
 text.unit.none=
 text.unit.items=Objets 
 text.category.general=Général
@@ -528,7 +530,7 @@ 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}
 
-
+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