From bcde36e74cb10e43dfde664b30eb7fb4fbe7688a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 10 Feb 2014 22:12:14 +0100 Subject: [PATCH] renamed localization keys to be more standard conform --- .../li/cil/oc/common/block/Delegator.scala | 2 +- .../java/li/cil/oc/common/block/Item.scala | 4 +- .../assets/opencomputers/lang/de_DE.lang | 38 +++++++++---------- .../assets/opencomputers/lang/en_US.lang | 38 +++++++++---------- .../assets/opencomputers/lang/fr_FR.lang | 36 +++++++++--------- .../assets/opencomputers/lang/pt_PT.lang | 36 +++++++++--------- .../assets/opencomputers/lang/zh_CN.lang | 36 +++++++++--------- 7 files changed, 95 insertions(+), 95 deletions(-) diff --git a/src/main/java/li/cil/oc/common/block/Delegator.scala b/src/main/java/li/cil/oc/common/block/Delegator.scala index 65a14c961..8cb97b590 100644 --- a/src/main/java/li/cil/oc/common/block/Delegator.scala +++ b/src/main/java/li/cil/oc/common/block/Delegator.scala @@ -109,7 +109,7 @@ class Delegator[Child <: Delegate](id: Int) extends Block(id, Material.iron) { def getUnlocalizedName(metadata: Int) = subBlock(metadata) match { case Some(subBlock) => subBlock.unlocalizedName - case _ => Settings.namespace + "block" + case _ => Settings.namespace + "tile" } override def damageDropped(metadata: Int) = diff --git a/src/main/java/li/cil/oc/common/block/Item.scala b/src/main/java/li/cil/oc/common/block/Item.scala index 21d6a4605..6003b9194 100644 --- a/src/main/java/li/cil/oc/common/block/Item.scala +++ b/src/main/java/li/cil/oc/common/block/Item.scala @@ -27,11 +27,11 @@ class Item(id: Int) extends ItemBlock(id) { override def getMetadata(itemDamage: Int) = itemDamage - override def getUnlocalizedName = Settings.namespace + "block" + override def getUnlocalizedName = Settings.namespace + "tile" override def getUnlocalizedName(stack: ItemStack) = Block.blocksList(getBlockID) match { - case delegator: Delegator[_] => Settings.namespace + "block." + delegator.getUnlocalizedName(stack.getItemDamage) + case delegator: Delegator[_] => Settings.namespace + "tile." + delegator.getUnlocalizedName(stack.getItemDamage) case block => block.getUnlocalizedName } diff --git a/src/main/resources/assets/opencomputers/lang/de_DE.lang b/src/main/resources/assets/opencomputers/lang/de_DE.lang index 7d1602e63..9c4eba203 100644 --- a/src/main/resources/assets/opencomputers/lang/de_DE.lang +++ b/src/main/resources/assets/opencomputers/lang/de_DE.lang @@ -3,25 +3,25 @@ #Suggestions for improvements are welcome # Blocks -oc:block.Adapter.name=Adapter -oc:block.Cable.name=Kabel -oc:block.Capacitor.name=Kondensator -oc:block.Case0.name=Computergehäuse (Stufe 1) -oc:block.Case1.name=Computergehäuse (Stufe 2) -oc:block.Case2.name=Computergehäuse (Stufe 3) -oc:block.Charger.name=Ladestation -oc:block.DiskDrive.name=Diskettenlaufwerk -oc:block.Keyboard.name=Tastatur -oc:block.PowerConverter.name=Leistungswandler -oc:block.PowerDistributor.name=Stromverteiler -oc:block.Redstone.name=Redstone-I/O -oc:block.Robot.name=Roboter -oc:block.RobotAfterimage.name=Roboter -oc:block.Router.name=Router -oc:block.Screen0.name=Bildschirm (Stufe 1) -oc:block.Screen1.name=Bildschirm (Stufe 2) -oc:block.Screen2.name=Bildschirm (Stufe 3) -oc:block.ServerRack.name=Serverschrank +oc:tile.Adapter.name=Adapter +oc:tile.Cable.name=Kabel +oc:tile.Capacitor.name=Kondensator +oc:tile.Case0.name=Computergehäuse (Stufe 1) +oc:tile.Case1.name=Computergehäuse (Stufe 2) +oc:tile.Case2.name=Computergehäuse (Stufe 3) +oc:tile.Charger.name=Ladestation +oc:tile.DiskDrive.name=Diskettenlaufwerk +oc:tile.Keyboard.name=Tastatur +oc:tile.PowerConverter.name=Leistungswandler +oc:tile.PowerDistributor.name=Stromverteiler +oc:tile.Redstone.name=Redstone-I/O +oc:tile.Robot.name=Roboter +oc:tile.RobotAfterimage.name=Roboter +oc:tile.Router.name=Router +oc:tile.Screen0.name=Bildschirm (Stufe 1) +oc:tile.Screen1.name=Bildschirm (Stufe 2) +oc:tile.Screen2.name=Bildschirm (Stufe 3) +oc:tile.ServerRack.name=Serverschrank # Items oc:item.AbstractBusCard.name=Abstrakter-Bus-Karte diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 88b3ec616..22abe2be9 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -3,25 +3,25 @@ # Use [nl] to for a line break. # Blocks -oc:block.Adapter.name=Adapter -oc:block.Cable.name=Cable -oc:block.Capacitor.name=Capacitor -oc:block.Case0.name=Computer Case (Tier 1) -oc:block.Case1.name=Computer Case (Tier 2) -oc:block.Case2.name=Computer Case (Tier 3) -oc:block.Charger.name=Charger -oc:block.DiskDrive.name=Disk Drive -oc:block.Keyboard.name=Keyboard -oc:block.PowerConverter.name=Power Converter -oc:block.PowerDistributor.name=Power Distributor -oc:block.Redstone.name=Redstone I/O -oc:block.Robot.name=Robot -oc:block.RobotAfterimage.name=Robot -oc:block.Router.name=Router -oc:block.Screen0.name=Screen (Tier 1) -oc:block.Screen1.name=Screen (Tier 2) -oc:block.Screen2.name=Screen (Tier 3) -oc:block.ServerRack.name=Server Rack +oc:tile.Adapter.name=Adapter +oc:tile.Cable.name=Cable +oc:tile.Capacitor.name=Capacitor +oc:tile.Case0.name=Computer Case (Tier 1) +oc:tile.Case1.name=Computer Case (Tier 2) +oc:tile.Case2.name=Computer Case (Tier 3) +oc:tile.Charger.name=Charger +oc:tile.DiskDrive.name=Disk Drive +oc:tile.Keyboard.name=Keyboard +oc:tile.PowerConverter.name=Power Converter +oc:tile.PowerDistributor.name=Power Distributor +oc:tile.Redstone.name=Redstone I/O +oc:tile.Robot.name=Robot +oc:tile.RobotAfterimage.name=Robot +oc:tile.Router.name=Router +oc:tile.Screen0.name=Screen (Tier 1) +oc:tile.Screen1.name=Screen (Tier 2) +oc:tile.Screen2.name=Screen (Tier 3) +oc:tile.ServerRack.name=Server Rack # Items oc:item.AbstractBusCard.name=Abstract Bus Card diff --git a/src/main/resources/assets/opencomputers/lang/fr_FR.lang b/src/main/resources/assets/opencomputers/lang/fr_FR.lang index 4badbe652..058e747b9 100644 --- a/src/main/resources/assets/opencomputers/lang/fr_FR.lang +++ b/src/main/resources/assets/opencomputers/lang/fr_FR.lang @@ -1,22 +1,22 @@ # Blocks -oc:block.Adapter.name=Adaptateur -oc:block.Cable.name=Cable -oc:block.Capacitor.name=Capaciteur -oc:block.Case0.name=Boitier (Niveau 1) -oc:block.Case1.name=Boitier (Niveau 2) -oc:block.Case2.name=Boitier (Niveau 3) -oc:block.Charger.name=Chargeur -oc:block.DiskDrive.name=Lecteur de disquettes -oc:block.Keyboard.name=Clavier -oc:block.PowerConverter.name=Convertisseur -oc:block.PowerDistributor.name=Distributeur -oc:block.Redstone.name=Redstone E/S -oc:block.Robot.name=Robot -oc:block.RobotAfterimage.name=Robot -oc:block.Router.name=Routeur -oc:block.Screen0.name=Ecran (Niveau 1) -oc:block.Screen1.name=Ecran (Niveau 2) -oc:block.Screen2.name=Ecran (Niveau 3) +oc:tile.Adapter.name=Adaptateur +oc:tile.Cable.name=Cable +oc:tile.Capacitor.name=Capaciteur +oc:tile.Case0.name=Boitier (Niveau 1) +oc:tile.Case1.name=Boitier (Niveau 2) +oc:tile.Case2.name=Boitier (Niveau 3) +oc:tile.Charger.name=Chargeur +oc:tile.DiskDrive.name=Lecteur de disquettes +oc:tile.Keyboard.name=Clavier +oc:tile.PowerConverter.name=Convertisseur +oc:tile.PowerDistributor.name=Distributeur +oc:tile.Redstone.name=Redstone E/S +oc:tile.Robot.name=Robot +oc:tile.RobotAfterimage.name=Robot +oc:tile.Router.name=Routeur +oc:tile.Screen0.name=Ecran (Niveau 1) +oc:tile.Screen1.name=Ecran (Niveau 2) +oc:tile.Screen2.name=Ecran (Niveau 3) # Items oc:item.Acid.name=Grog diff --git a/src/main/resources/assets/opencomputers/lang/pt_PT.lang b/src/main/resources/assets/opencomputers/lang/pt_PT.lang index ab07ac47a..92e5f97f3 100644 --- a/src/main/resources/assets/opencomputers/lang/pt_PT.lang +++ b/src/main/resources/assets/opencomputers/lang/pt_PT.lang @@ -11,24 +11,24 @@ # Blocks -oc:block.Adapter.name=Adaptador -oc:block.Cable.name=Cabo -oc:block.Capacitor.name=Condensador -oc:block.Case0.name=Caixa Básica -oc:block.Case1.name=Caixa Avançada -oc:block.Case2.name=Caixa Superior -oc:block.Charger.name=Carregador -oc:block.DiskDrive.name=Drive de Disquetes -oc:block.Keyboard.name=Teclado -oc:block.PowerConverter.name=Conversor de Energia -oc:block.PowerDistributor.name=Distribuidor de Energia -oc:block.Redstone.name=E/S de Redstone -oc:block.Robot.name=Robô -oc:block.RobotAfterimage.name=Robô -oc:block.Router.name=Roteador -oc:block.Screen0.name=Ecrã Básico -oc:block.Screen1.name=Ecrã Avançado -oc:block.Screen2.name=Ecrã Superior +oc:tile.Adapter.name=Adaptador +oc:tile.Cable.name=Cabo +oc:tile.Capacitor.name=Condensador +oc:tile.Case0.name=Caixa Básica +oc:tile.Case1.name=Caixa Avançada +oc:tile.Case2.name=Caixa Superior +oc:tile.Charger.name=Carregador +oc:tile.DiskDrive.name=Drive de Disquetes +oc:tile.Keyboard.name=Teclado +oc:tile.PowerConverter.name=Conversor de Energia +oc:tile.PowerDistributor.name=Distribuidor de Energia +oc:tile.Redstone.name=E/S de Redstone +oc:tile.Robot.name=Robô +oc:tile.RobotAfterimage.name=Robô +oc:tile.Router.name=Roteador +oc:tile.Screen0.name=Ecrã Básico +oc:tile.Screen1.name=Ecrã Avançado +oc:tile.Screen2.name=Ecrã Superior # Items oc:item.Acid.name=Grogue diff --git a/src/main/resources/assets/opencomputers/lang/zh_CN.lang b/src/main/resources/assets/opencomputers/lang/zh_CN.lang index 0a951e142..389a920de 100644 --- a/src/main/resources/assets/opencomputers/lang/zh_CN.lang +++ b/src/main/resources/assets/opencomputers/lang/zh_CN.lang @@ -3,24 +3,24 @@ # Use [nl] to for a line break. # Blocks -oc:block.Adapter.name=适配器 -oc:block.Cable.name=线缆 -oc:block.Capacitor.name=电容 -oc:block.Case0.name=基础机箱 -oc:block.Case1.name=高级机箱 -oc:block.Case2.name=超级机箱 -oc:block.Charger.name=充电器 -oc:block.DiskDrive.name=磁盘驱动器 -oc:block.Keyboard.name=键盘 -oc:block.PowerConverter.name=能量转换器 -oc:block.PowerDistributor.name=能量分配器 -oc:block.Redstone.name=红石I/O -oc:block.Robot.name=机器人 -oc:block.RobotAfterimage.name=机器人 -oc:block.Router.name=路由器 -oc:block.Screen0.name=基础屏幕 -oc:block.Screen1.name=高级屏幕 -oc:block.Screen2.name=超级屏幕 +oc:tile.Adapter.name=适配器 +oc:tile.Cable.name=线缆 +oc:tile.Capacitor.name=电容 +oc:tile.Case0.name=基础机箱 +oc:tile.Case1.name=高级机箱 +oc:tile.Case2.name=超级机箱 +oc:tile.Charger.name=充电器 +oc:tile.DiskDrive.name=磁盘驱动器 +oc:tile.Keyboard.name=键盘 +oc:tile.PowerConverter.name=能量转换器 +oc:tile.PowerDistributor.name=能量分配器 +oc:tile.Redstone.name=红石I/O +oc:tile.Robot.name=机器人 +oc:tile.RobotAfterimage.name=机器人 +oc:tile.Router.name=路由器 +oc:tile.Screen0.name=基础屏幕 +oc:tile.Screen1.name=高级屏幕 +oc:tile.Screen2.name=超级屏幕 # Items oc:item.Acid.name=蚀刻药水