From 4c35f7810ca0c6c599ddda74d37348569db031f1 Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Wed, 24 Oct 2012 22:08:10 -0400
Subject: [PATCH] Fix some file encodings for localizations (remember it HAS to
 be UTF-8 folks) and fix the Portable Crafting GUI to show labels

---
 ee3_client/ee3/client/gui/GuiPortableCrafting.java |  2 +-
 resources/ee3/lang/cs_CZ.xml                       |  2 +-
 resources/ee3/lang/de_DE.xml                       |  2 +-
 resources/ee3/lang/en_US.xml                       |  2 +-
 resources/ee3/lang/es_ES.xml                       | 12 ++++++------
 resources/ee3/lang/fr_FR.xml                       |  2 +-
 resources/ee3/lang/it_IT.xml                       |  2 +-
 resources/ee3/lang/nl_NL.xml                       |  2 +-
 resources/ee3/lang/pt_PT.xml                       |  2 +-
 resources/ee3/lang/sv_SE.xml                       |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ee3_client/ee3/client/gui/GuiPortableCrafting.java b/ee3_client/ee3/client/gui/GuiPortableCrafting.java
index e03266c1..83a3ef11 100644
--- a/ee3_client/ee3/client/gui/GuiPortableCrafting.java
+++ b/ee3_client/ee3/client/gui/GuiPortableCrafting.java
@@ -21,7 +21,7 @@ public class GuiPortableCrafting extends GuiContainer {
     /**
      * Draw the foreground layer for the GuiContainer (everything in front of the items)
      */
-    protected void drawGuiContainerForegroundLayer() {
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         this.fontRenderer.drawString(StatCollector.translateToLocal("container.crafting"), 28, 6, 4210752);
         this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
     }
diff --git a/resources/ee3/lang/cs_CZ.xml b/resources/ee3/lang/cs_CZ.xml
index 2e3d49c1..4ff2ff33 100644
--- a/resources/ee3/lang/cs_CZ.xml
+++ b/resources/ee3/lang/cs_CZ.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Czech (CS) Localization File</comment>
diff --git a/resources/ee3/lang/de_DE.xml b/resources/ee3/lang/de_DE.xml
index 8bac46da..3c0e2588 100644
--- a/resources/ee3/lang/de_DE.xml
+++ b/resources/ee3/lang/de_DE.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 <comment>German (DE) Localization File</comment>
diff --git a/resources/ee3/lang/en_US.xml b/resources/ee3/lang/en_US.xml
index b5f02cd4..b37611a0 100644
--- a/resources/ee3/lang/en_US.xml
+++ b/resources/ee3/lang/en_US.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>English (US) Localization File</comment>
diff --git a/resources/ee3/lang/es_ES.xml b/resources/ee3/lang/es_ES.xml
index 297359ad..2030b08e 100644
--- a/resources/ee3/lang/es_ES.xml
+++ b/resources/ee3/lang/es_ES.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
-	<comment>Archivo de Traducción en Español (ES)</comment>
+	<comment>Archivo de Traducción en Español (ES)</comment>
 	<entry key="key.extra">Extra</entry>
 	<entry key="key.release">Lanzamiento</entry>
 	<entry key="key.toggle">Alternar</entry>
@@ -13,10 +13,10 @@
 	<entry key="tile.redWaterFlowing.name">Agua Roja (Fluyendo)</entry>
 	<entry key="tile.calcinator.name">Calcinador</entry>
 	<entry key="gui.calcinator.name">Calcinador</entry>
-	<entry key="version.init_log_message">Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en</entry>
-	<entry key="version.uninitialized">El chequeo de versiones no se completó exitosamente (el chequeo de versiones no se inicializó correctamente)</entry>
-	<entry key="version.current">Actualmente estás usando la versión más actualizada para tu versión de Minecraft</entry>
-	<entry key="version.outdated">Actualmente estás usando una versión desactualizada; considera actualizarla aquí - http://goo.gl/sNcGl</entry>
-	<entry key="version.connection_error">Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?)</entry>
+	<entry key="version.init_log_message">Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en</entry>
+	<entry key="version.uninitialized">El chequeo de versiones no se completó exitosamente (el chequeo de versiones no se inicializó correctamente)</entry>
+	<entry key="version.current">Actualmente estás usando la versión más actualizada para tu versión de Minecraft</entry>
+	<entry key="version.outdated">Actualmente estás usando una versión desactualizada; considera actualizarla aquí - http://goo.gl/sNcGl</entry>
+	<entry key="version.connection_error">Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?)</entry>
 	<entry key="version.check_disabled">Chequeo remoto de versiones desactivado, omitiendo</entry>
 </properties>
diff --git a/resources/ee3/lang/fr_FR.xml b/resources/ee3/lang/fr_FR.xml
index bc943161..8dab7323 100644
--- a/resources/ee3/lang/fr_FR.xml
+++ b/resources/ee3/lang/fr_FR.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 <comment>French (FR) Localization File</comment>
diff --git a/resources/ee3/lang/it_IT.xml b/resources/ee3/lang/it_IT.xml
index 0ba77db0..64c844c4 100644
--- a/resources/ee3/lang/it_IT.xml
+++ b/resources/ee3/lang/it_IT.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Italian (IT) Localization File</comment>
diff --git a/resources/ee3/lang/nl_NL.xml b/resources/ee3/lang/nl_NL.xml
index e7dec311..7d04cd4b 100644
--- a/resources/ee3/lang/nl_NL.xml
+++ b/resources/ee3/lang/nl_NL.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Dutch (NL) Localization File</comment>
diff --git a/resources/ee3/lang/pt_PT.xml b/resources/ee3/lang/pt_PT.xml
index 3c8414e9..e959e412 100644
--- a/resources/ee3/lang/pt_PT.xml
+++ b/resources/ee3/lang/pt_PT.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 <comment>Portuguese (PT) Post Reform Localization File</comment>
diff --git a/resources/ee3/lang/sv_SE.xml b/resources/ee3/lang/sv_SE.xml
index 0ffc218e..d1865902 100644
--- a/resources/ee3/lang/sv_SE.xml
+++ b/resources/ee3/lang/sv_SE.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 <properties version="1.0">
 	<comment>Swedish (SE) Localization File</comment>