Merge remote-tracking branch 'origin/master'

This commit is contained in:
pahimar 2012-10-24 21:53:51 -04:00
commit f47d87f639
6 changed files with 95 additions and 1 deletions

View file

@ -17,9 +17,11 @@ public class Localizations {
LANG_RESOURCE_LOCATION + "cy_GB.xml",
LANG_RESOURCE_LOCATION + "de_DE.xml",
LANG_RESOURCE_LOCATION + "en_US.xml",
LANG_RESOURCE_LOCATION + "fr_FR.xml",
LANG_RESOURCE_LOCATION + "it_IT.xml",
LANG_RESOURCE_LOCATION + "nl_NL.xml",
LANG_RESOURCE_LOCATION + "pt_PT.xml",
LANG_RESOURCE_LOCATION + "es_ES.xml",
LANG_RESOURCE_LOCATION + "ru_RU.xml"
};

View file

@ -5,6 +5,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.GuiIds;
import ee3.common.lib.ItemIds;
@ -43,7 +44,7 @@ public class PacketKeyPressed extends PacketEE {
public void execute(INetworkManager manager, Player player) {
EntityPlayer thePlayer = (EntityPlayer) player;
if ((this.key.equals(Reference.KEYBINDING_EXTRA)) && (thePlayer.getCurrentEquippedItem().getItem().shiftedIndex == ItemIds.MINIUM_STONE)) {
if ((this.key.equals(LanguageRegistry.instance().getStringLocalization(Reference.KEYBINDING_EXTRA))) && (thePlayer.getCurrentEquippedItem().getItem().shiftedIndex == ItemIds.MINIUM_STONE)) {
thePlayer.openGui(EquivalentExchange3.instance, GuiIds.PORTABLE_CRAFTING, thePlayer.worldObj, (int)thePlayer.posX, (int)thePlayer.posY, (int)thePlayer.posZ);
}
}

View file

@ -0,0 +1,26 @@
<?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>
<entry key="item.miniumShard.name">Úlomek suříku</entry>
<entry key="item.miniumStone.name">Kámen suříku</entry>
<entry key="item.philStone.name">Kámen mudrců</entry>
<entry key="tile.redWaterStill.name">Rudá voda (v klidu)</entry>
<entry key="tile.redWaterFlowing.name">Rudá voda (tekoucí)</entry>
<entry key="tile.calcinator.name">Kalcinátor</entry>
<entry key="version.uninitialized">Neinicializováno</entry>
<entry key="version.current">Proud</entry>
<entry key="version.outdated">Zastaralé</entry>
<entry key="version.connection_error">Chyba připojení</entry>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Vypustit</entry>
<entry key="key.toggle">Přepnout</entry>
<entry key="key.charge">Nabít</entry>
<entry key="gui.calcinator.name">Kalcinátor</entry>
<entry key="version.init_log_message">Provádím kontrolu verze, vzdálený soubor umístěn na </entry>
<entry key="version.uninitialized">Kontrola verze neproběhla úspěšně (nezdařila se inicializace)</entry>
<entry key="version.current">Používáte nejaktuálnější verzi, která je pro vaši verzi Minecraftu</entry>
<entry key="version.outdated">Používáte neaktuální verzi; zvažte aktualizaci - http://goo.gl/sNcGl</entry>
<entry key="version.connection_error">Chyba při připojování k servru poskytujícímu informace o verzi (je v pořádku vaše připojení k Internetu?)</entry>
<entry key="version.check_disabled">Kontrola verze deaktivována, přeskakuji</entry>
</properties>

View file

@ -0,0 +1,22 @@
<?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>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Lanzamiento</entry>
<entry key="key.toggle">Alternar</entry>
<entry key="key.charge">Carga</entry>
<entry key="item.miniumShard.name">Fragmento de Minio</entry>
<entry key="item.miniumStone.name">Piedra de Minio</entry>
<entry key="item.philStone.name">Piedra Filosofal</entry>
<entry key="tile.redWaterStill.name">Agua Roja (Quieta)</entry>
<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.check_disabled">Chequeo remoto de versiones desactivado, omitiendo</entry>
</properties>

View file

@ -0,0 +1,21 @@
<?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>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Libérer</entry>
<entry key="key.toggle">Baculer</entry>
<entry key="key.charge">Charger</entry>
<entry key="item.miniumShard.name">Eclat de Minium</entry>
<entry key="item.miniumStone.name">Pierre de Minium</entry>
<entry key="item.philStone.name">Pierre Philosophale</entry>
<entry key="tile.redWaterStill.name">Eau rouge (Immobile)</entry>
<entry key="tile.redWaterFlowing.name">Eau rouge (Ruisselante)</entry>
<entry key="tile.calcinator.name">Calcinateur</entry>
<entry key="version.init_log_message">Lancement de la vérification de votre version par rapport à cette de reference : </entry>
<entry key="version.uninitialized">Le lancement de la vérification a échoué</entry>
<entry key="version.current">Vous utilisez la version la plus à jour pour votre version de Minecraft</entry>
<entry key="version.outdated">Vous utilisez une verison obsolète, pensez à effecuter une mise a jour ici - http://goo.gl/sNcGl</entry>
<entry key="version.connection_error">Erreur de connexion vers la version de référence (vérifiez votre connexion internet ?)</entry>
<entry key="version.check_disabled">Verification de version désactiée</entry>
</properties>

View file

@ -0,0 +1,22 @@
<?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>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Släpp</entry>
<entry key="key.toggle">Växla</entry>
<entry key="key.charge">Laddda</entry>
<entry key="item.miniumShard.name">Fragment av Minium</entry>
<entry key="item.miniumStone.name">Minium Sten</entry>
<entry key="item.philStone.name">Filosofens Sten</entry>
<entry key="tile.redWaterStill.name">Rött Vatten (Stilla)</entry>
<entry key="tile.redWaterFlowing.name">Rött Vatten (Forsande)</entry>
<entry key="tile.calcinator.name">Kalcinator</entry>
<entry key="gui.calcinator.name">Kalcinator</entry>
<entry key="version.init_log_message">Initierar versionskontroll mot den avlägsna versions auktoritet filen, lokaliserad vid</entry>
<entry key="version.uninitialized">Versionskontrollen avslutades inte framgångsrikt (Versionskontrollen initierade inte riktigt)</entry>
<entry key="version.current">Du använder för närvarande den mest uppdaterade versionen för din version av Minecraft</entry>
<entry key="version.outdated">Du använder för närvarande en utdaterad version; Fundera på att updattera här - http://goo.gl/sNcGl</entry>
<entry key="version.connection_error">Fel att ansluta till den avlägsna versions auktoritets fil (Kolla din internetanslutning?)</entry>
<entry key="version.check_disabled">Avlägsens versions kontroll inaktiverad, hoppar över</entry>
</properties>