diff --git a/binnie-mods-2.0(1.7.10)-ru-u8.zs b/binnie-mods-2.0(1.7.10)-ru-u8.zs deleted file mode 100644 index c041a94d..00000000 --- a/binnie-mods-2.0(1.7.10)-ru-u8.zs +++ /dev/null @@ -1,58 +0,0 @@ -# This is a script for the translation of certain items mod Binnie, which are not delivered in the language file. -# Translation into Russian. -# If possible translated or names or tooltips. -# The format of this script file MineTweaker - UTF8 - -# Necessary modifications: -# forestry_1.7.10 -# binnie-mods-2.0.15-7, -# NotEnoughItems-1.7.10-1.0.5.110, CodeChickenCore-1.7.10-1.0.7.46, CodeChickenLib-1.7.10-1.1.3.138, -# CraftTweaker-1.7.10 - -# Optional modification: -# Waila-1.5.10 - -# How to use: -# Copy the necessary modifications in the folder .minecraft\mods -# Copy this file in the folder .minecraft\scripts - -import mods.nei.NEI; - -# DATABASES - -# Gene Database -NEI.overrideName(,"Генная база данных"); -.addTooltip(format.darkGreen("Gene Database")); -# Master Gene Database -NEI.overrideName(,"Генная база данных мастера"); -.addTooltip(format.darkGreen("Master Gene Database")); -# Registry -NEI.overrideName(,"Картотека"); -.addTooltip(format.darkGreen("Registry")); -# Master Registry -NEI.overrideName(,"Картотека мастера"); -.addTooltip(format.darkGreen("Master Registry")); -# Analyst -NEI.overrideName(,"Аналитик"); -.addTooltip(format.darkGreen("Analyst")); - - -# Gen.Machines energy cost tooltips -# Isolator -.addShiftTooltip(format.lightPurple("40 RF/t")); -# Sequencer -.addShiftTooltip(format.lightPurple("20 RF/t")); -# Polymeriser -.addShiftTooltip(format.lightPurple("40 RF/t")); -# Inoculator -.addShiftTooltip(format.lightPurple("50 RF/t")); -# Analyser -.addShiftTooltip(format.lightPurple("30 RF/t")); -# Incubator -.addShiftTooltip(format.lightPurple("2 RF/t")); -# Genepool -.addShiftTooltip(format.lightPurple("20 RF/t")); -# Acclimatiser -.addShiftTooltip(format.lightPurple("2 RF/t")); -# Splicer -.addShiftTooltip(format.lightPurple("10000 RF/t")); diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 2cf12034..26bd2b07 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -61,7 +61,7 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { return (stack.getItemDamage() == 0) - ? I18N.localise("botany.item.botanistDatabase.0.name") - : I18N.localise("botany.item.botanistDatabase.1.name"); + ? I18N.localise("botany.item.database.0.name") + : I18N.localise("botany.item.database.1.name"); } } diff --git a/src/main/java/binnie/core/genetics/BreedingSystem.java b/src/main/java/binnie/core/genetics/BreedingSystem.java index 3d937330..23266085 100644 --- a/src/main/java/binnie/core/genetics/BreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BreedingSystem.java @@ -397,7 +397,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative { return getName(); } - public abstract boolean isDNAManipulable(ItemStack p0); + public abstract boolean isDNAManipulable(ItemStack member); public IIndividual getConversion(ItemStack stack) { return null; diff --git a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java index ff102489..5503843f 100644 --- a/src/main/java/binnie/genetics/genetics/GeneArrayItem.java +++ b/src/main/java/binnie/genetics/genetics/GeneArrayItem.java @@ -4,6 +4,7 @@ import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.api.IGene; import forestry.api.core.INBTTagable; import forestry.api.genetics.ISpeciesRoot; @@ -45,7 +46,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem { @Override public void getInfo(List tooltip) { - List totalList = new ArrayList(); + List totalList = new ArrayList<>(); for (IGene gene : genes) { String chromosomeName = getBreedingSystem().getChromosomeName(gene.getChromosome()); totalList.add(EnumChatFormatting.GOLD + chromosomeName + EnumChatFormatting.GRAY + ": " + gene.getName()); @@ -56,7 +57,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem { } else { tooltip.add(totalList.get(0)); tooltip.add(totalList.get(1)); - tooltip.add(totalList.size() - 2 + " more genes. Hold shift to display."); + tooltip.add(I18N.localise("genetics.gene.more", totalList.size() - 2)); } } diff --git a/src/main/java/binnie/genetics/genetics/GeneProject.java b/src/main/java/binnie/genetics/genetics/GeneProject.java deleted file mode 100644 index 54cda439..00000000 --- a/src/main/java/binnie/genetics/genetics/GeneProject.java +++ /dev/null @@ -1,66 +0,0 @@ -package binnie.genetics.genetics; - -import com.mojang.authlib.GameProfile; - -import java.util.ArrayList; -import java.util.List; - -public class GeneProject { - protected int id; - protected String name; - protected GameProfile leader; - protected List members; - - public GeneProject(int id, String name, GameProfile leader) { - this.id = 0; - this.leader = null; - members = new ArrayList<>(); - setID(id); - setName(name); - setLeader(leader); - } - - public int getID() { - return id; - } - - public void setID(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public GameProfile getLeader() { - return leader; - } - - public void setLeader(GameProfile leader) { - addPlayer(this.leader = leader); - } - - public boolean isEmpty() { - return members.isEmpty(); - } - - public void addPlayer(GameProfile player) { - if (!members.contains(player)) { - members.add(player); - } - if (leader == null) { - leader = player; - } - } - - public void removePlayer(GameProfile player) { - if (player == leader) { - throw new RuntimeException("Can't remove leader of a Gene Project"); - } - members.remove(player); - } -} diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 10c94671..62fce600 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; @@ -25,13 +26,13 @@ public class ItemAnalyst extends Item { } @Override - public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { Genetics.proxy.openGui(GeneticsGUI.Analyst, player, (int) player.posX, (int) player.posY, (int) player.posZ); - return itemstack; + return stack; } @Override - public String getItemStackDisplayName(ItemStack i) { - return "Analyst"; + public String getItemStackDisplayName(ItemStack stack) { + return I18N.localise("genetics.item.analyst.name"); } } diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 9860349b..90fd9d22 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; @@ -51,19 +52,19 @@ public class ItemDatabase extends Item { } @Override - public ItemStack onItemRightClick(ItemStack itemststackck, World world, EntityPlayer player) { - if (itemststackck.getItemDamage() == 0) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (stack.getItemDamage() == 0) { Genetics.proxy.openGui(GeneticsGUI.Database, player, (int) player.posX, (int) player.posY, (int) player.posZ); } else { Genetics.proxy.openGui(GeneticsGUI.DatabaseNEI, player, (int) player.posX, (int) player.posY, (int) player.posZ); } - return itemststackck; + return stack; } @Override public String getItemStackDisplayName(ItemStack stack) { return (stack.getItemDamage() == 0) ? - "Gene Database" : - "Master Gene Database"; + I18N.localise("genetics.item.database.0.name") : + I18N.localise("genetics.item.database.1.name"); } } diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index f878841f..c0c32c46 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.genetics.IGeneItem; @@ -70,18 +71,18 @@ public abstract class ItemGene extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(itemstack, player, tooltip, advanced); - int damage = getMaxDamage() - itemstack.getItemDamage(); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); + int damage = getMaxDamage() - stack.getItemDamage(); if (damage == 0) { - tooltip.add("Empty"); + tooltip.add(I18N.localise("genetics.gene.charge.empty")); } else if (damage == 1) { - tooltip.add("1 Charge"); + tooltip.add(I18N.localise("genetics.gene.charge.one")); } else { - tooltip.add(damage + " Charges"); + tooltip.add(I18N.localise("genetics.gene.charge.many", damage)); } - IGeneItem gene = getGeneItem(itemstack); + IGeneItem gene = getGeneItem(stack); gene.getInfo(tooltip); } diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index bfa32d10..3acbf83c 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; @@ -31,7 +32,7 @@ public class ItemMasterRegistry extends Item { } @Override - public String getItemStackDisplayName(ItemStack i) { - return "Master Registry"; + public String getItemStackDisplayName(ItemStack stack) { + return I18N.localise("genetics.item.registry.1.name"); } } diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index acbcc4dc..c196c329 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.core.GeneticsGUI; @@ -32,6 +33,6 @@ public class ItemRegistry extends Item { @Override public String getItemStackDisplayName(ItemStack i) { - return "Registry"; + return I18N.localise("genetics.item.registry.0.name"); } } diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 7882669c..348e733b 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -47,9 +47,9 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl public String getItemStackDisplayName(ItemStack stack) { GeneItem gene = new GeneItem(stack); if (gene.isCorrupted()) { - return "Corrupted Sequence"; + return I18N.localise("genetics.sequence.corrupted"); } - return gene.getBreedingSystem().getDescriptor() + " DNA Sequence"; + return I18N.localise("genetics.sequence.descriptor", gene.getBreedingSystem().getDescriptor()); } @Override @@ -65,16 +65,16 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl if (gene.analysed) { gene.getInfo(tooltip); } else { - tooltip.add(""); + tooltip.add(I18N.localise("genetics.sequence.unknown")); } int seq = gene.sequenced; if (seq == 0) { - tooltip.add("Unsequenced"); + tooltip.add(I18N.localise("genetics.sequence.unsequenced")); } else if (seq < 100) { - tooltip.add("Partially Sequenced (" + seq + "%)"); + tooltip.add(I18N.localise("genetics.sequence.partially", seq)); } else { - tooltip.add("Fully Sequenced"); + tooltip.add(I18N.localise("genetics.sequence.fully")); } } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 07d43401..dec903d9 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,7 +1,9 @@ package binnie.genetics.item; import binnie.Binnie; +import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; @@ -37,8 +39,8 @@ public class ItemSerum extends ItemGene implements IItemSerum { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(itemstack, player, tooltip, advanced); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); } @Override @@ -90,7 +92,8 @@ public class ItemSerum extends ItemGene implements IItemSerum { @Override public String getItemStackDisplayName(ItemStack stack) { IGeneItem gene = getGeneItem(stack); - return Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getDescriptor() + " Serum"; + BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot()); + return I18N.localise("genetics.item.serum.name", breedingSystem.getDescriptor()); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 780b93a6..1927c6a2 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,7 +1,9 @@ package binnie.genetics.item; import binnie.Binnie; +import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; +import binnie.core.util.I18N; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemSerum; @@ -108,7 +110,8 @@ public class ItemSerumArray extends ItemGene implements IItemSerum { @Override public String getItemStackDisplayName(ItemStack stack) { IGeneItem gene = getGeneItem(stack); - return Binnie.Genetics.getSystem(gene.getSpeciesRoot()).getDescriptor() + " Serum Array"; + BreedingSystem breedingSystem = Binnie.Genetics.getSystem(gene.getSpeciesRoot()); + return I18N.localise("genetics.item.serumArray.name", breedingSystem.getDescriptor()); } @Override diff --git a/src/main/resources/assets/botany/lang/en_US.lang b/src/main/resources/assets/botany/lang/en_US.lang index b402c097..ca31b340 100644 --- a/src/main/resources/assets/botany/lang/en_US.lang +++ b/src/main/resources/assets/botany/lang/en_US.lang @@ -169,8 +169,8 @@ botany.item.botany.name=%1$s %2$s botany.item.pollen.tag.name=Pollen botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=Corrupted Flower -botany.item.botanistDatabase.0.name=Botanist Database -botany.item.botanistDatabase.1.name=Master Botanist Database +botany.item.database.0.name=Botanist Database +botany.item.database.1.name=Master Botanist Database botany.item.fieldKit.name=Field Kit botany.item.powderAsh.name=Ash Powder botany.item.powderPulp.name=Pulp Powder diff --git a/src/main/resources/assets/botany/lang/ru_RU.lang b/src/main/resources/assets/botany/lang/ru_RU.lang index 1d0f3b7f..cdf2e929 100644 --- a/src/main/resources/assets/botany/lang/ru_RU.lang +++ b/src/main/resources/assets/botany/lang/ru_RU.lang @@ -32,25 +32,25 @@ botany.design.cornered=Угол botany.design.thickCornered=Большой угол botany.design.edged=Кант botany.design.thinEdged=Маленький кант -botany.design.thinBarred=Thin Barred -botany.design.barred=Barred -botany.design.thickBarred=Thick Barred -botany.design.diagonal=Diagonal -botany.design.thickDiagonal=Thick Diagonal -botany.design.thinSaltire=Thin Saltire -botany.design.saltire=Saltire -botany.design.thickSaltire=Thick Saltire -botany.design.thinCrossed=Thin Crossed -botany.design.crossed=Crossed -botany.design.thickCrossed=Thick Crossed +botany.design.thinBarred=Тонкая перемычка +botany.design.barred=Перемычка +botany.design.thickBarred=Широкая перемычка +botany.design.diagonal=Диагональ +botany.design.thickDiagonal=Широкая диагональ +botany.design.thinSaltire=Тонкая крестовина +botany.design.saltire=Крестовина +botany.design.thickSaltire=Широкая крестовина +botany.design.thinCrossed=Тонкие скрещенные линии +botany.design.crossed=Скрещенные линии +botany.design.thickCrossed=Широкие скрещенные линии botany.design.thinTSection=Маленькая Т-секция botany.design.tSection=T-секция botany.design.thickTSection=Большая Т-секция -botany.design.thinBarredCorner=Thin Barred Corner -botany.design.barredCorner=Barred Corner -botany.design.thickBarredCorner=Thick Barred Corner -botany.design.thinStripedCorner=Thin Striped Corner -botany.design.stripedCorner=Striped Corner +botany.design.thinBarredCorner=Маленький закрытый угол +botany.design.barredCorner=Закрытый угол +botany.design.thickBarredCorner=Широкий закрытый угол +botany.design.thinStripedCorner=Тонкий полосатый угол +botany.design.stripedCorner=Полосатый угол botany.design.emblem1=Эмблема 1 botany.design.emblem2=Эмблема 2 botany.design.emblem3=Эмблема 3 @@ -82,38 +82,38 @@ botany.design.letterW=Буква W botany.design.letterX=Буква X botany.design.letterY=Буква Y botany.design.letterZ=Буква Z -botany.design.thinCurvedCrossed=Thin Curved Crossed -botany.design.thinCurvedBarredCorner=Thin Curved Barred Corner -botany.design.curvedBarredCorner=Curved Barred Corner -botany.design.thinCurvedCorner=Thin Curved Corner -botany.design.curvedCorner=Curved Corner -botany.design.thinCurvedTSection=Thin Curved T Section -botany.design.curvedTSection=Curved T Section -botany.design.barredEnd=Barred End -botany.design.diagonalCorner=Diagonal Corner -botany.design.diagonalTSection=Diagonal T Section -botany.design.diagonalCurvedCorner=Diagonal Curved Corner -botany.design.diagonalCurvedTSection=Diagonal Curved T Section -botany.design.ornateBarred=Ornate Barred -botany.design.splitBarred=Split Barred -botany.design.splitBarredCorner=Split Barred Corner -botany.design.splitBarredTSection=Split Barred T Section -botany.design.splitCrossed=Split Crossed -botany.design.splitBarredEnd=Split Barred End -botany.design.ornateThinBarred=Ornate Thin Barred +botany.design.thinCurvedCrossed=Тонкие изогнутыне скрещенные линии +botany.design.thinCurvedBarredCorner=Тонкий изогнутый угол перемычки +botany.design.curvedBarredCorner=Изогнутый угол перемычки +botany.design.thinCurvedCorner=Тонкий изогнутый угол +botany.design.curvedCorner=Изогнутый угол +botany.design.thinCurvedTSection=Тонкая скругленная Т-секция +botany.design.curvedTSection=Скругленная Т-секция +botany.design.barredEnd=Конец перемычки +botany.design.diagonalCorner=Диагональный угол +botany.design.diagonalTSection=Диагональная Т-секция +botany.design.diagonalCurvedCorner=Диагональный скругленный угол +botany.design.diagonalCurvedTSection=Диагональная скругленная Т-секция +botany.design.ornateBarred=Декоративная перемычка +botany.design.splitBarred=Разделенная перемычка +botany.design.splitBarredCorner=Разеленный угол перемечки +botany.design.splitBarredTSection=Разделенная Т-секция перемычки +botany.design.splitCrossed=Разделенные скрещенные линии +botany.design.splitBarredEnd=Разделенный конец перемычки +botany.design.ornateThinBarred=Декоративная тонкая перемычка botany.design.circle=Круг botany.design.plus=Крест botany.design.creeper=Крипер -botany.design.ornateStripedCorner=Ornate Striped Corner +botany.design.ornateStripedCorner=Деккоративный полосатый угол botany.design.testingBlock=Тестовый блок -botany.design.diagonalHalved=Diagonal Halved -botany.design.corneredDiagonal=Cornered Diagonal -botany.design.oppositeCorneredDiagonal=Opposite Cornered Diagonal -botany.design.thickCorneredDiagonal=Thick Cornered Diagonal -botany.design.thinBarredEnd=Thin Barred End -botany.design.thickBarredEnd=Thick Barred End -botany.design.overlappedBarred=Overlapped Barred -botany.design.overlappedSplitBarred=Overlapped Split Barred +botany.design.diagonalHalved=Половинчатая диагональ +botany.design.corneredDiagonal=Угловая диагональ +botany.design.oppositeCorneredDiagonal=Противоположная уголовая диаогналь +botany.design.thickCorneredDiagonal=Тонкая угловая диаогналь +botany.design.thinBarredEnd=Тонкий конец перемычки +botany.design.thickBarredEnd=Широкий конец перемычки +botany.design.overlappedBarred=Перекрытая перемычка +botany.design.overlappedSplitBarred=Перекрытая разделенная перемычка botany.design.category.designsEmblems=Дизайны и эмблемы botany.design.category.squaresStripes=Квадраты и полосы @@ -169,8 +169,8 @@ botany.item.botany.name=%2$s %1$s botany.item.pollen.tag.name=Пыльца цветка botany.item.germling.tag.name=Росток цветка botany.item.flowerCorrupted.name=Поврежденный цветок -botany.item.botanistDatabase.0.name=База данных ботаника -botany.item.botanistDatabase.1.name=База данных мастера-ботаника +botany.item.database.0.name=База данных ботаника +botany.item.database.1.name=База данных мастера-ботаника botany.item.fieldKit.name=Полевая лаборатория botany.item.powderAsh.name=Измельченная зола botany.item.powderPulp.name=Измельченная древесная масса diff --git a/src/main/resources/assets/botany/lang/zh_CN.lang b/src/main/resources/assets/botany/lang/zh_CN.lang index b2371361..fba1ab34 100644 --- a/src/main/resources/assets/botany/lang/zh_CN.lang +++ b/src/main/resources/assets/botany/lang/zh_CN.lang @@ -166,8 +166,8 @@ botany.item.botany.name=%1$s %2$s botany.item.pollen.tag.name=花粉 botany.item.germling.tag.name=Germling botany.item.flowerCorrupted.name=腐烂的花 -botany.item.botanistDatabase.0.name=园丁数据库 -botany.item.botanistDatabase.1.name=园艺大师数据库 +botany.item.database.0.name=园丁数据库 +botany.item.database.1.name=园艺大师数据库 botany.item.fieldKit.name=实地考察工具包 botany.item.powderAsh.name=灰烬粉 botany.item.powderPulp.name=Pulp Powder diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index ec3a1bfc..8b2ef774 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -16,6 +16,33 @@ genetics.item.cylinderEmpty.name=Glass Cylinder genetics.item.integratedCircuit.name=Integrated Circuit Board genetics.item.integratedCPU.name=Integrated CPU genetics.item.casingCircuit.name=Integrated Casing +genetics.item.analyst.name=Analyst +genetics.item.database.0.name=Gene Database +genetics.item.database.1.name=Master Gene Database +genetics.item.registry.0.name=Registry +genetics.item.registry.1.name=Master Registry +genetics.item.serum.name=%s Serum +genetics.item.serumArray.name=%s Serum Array + +genetics.item.sequence=DNA Sequence +genetics.item.sequence.0=Very Faint +genetics.item.sequence.1=Faint +genetics.item.sequence.2=Weak +genetics.item.sequence.3=Average +genetics.item.sequence.4=Strong +genetics.item.sequence.5=Very Strong + +genetics.gene.charge.empty=Empty +genetics.gene.charge.one=1 Charge +genetics.gene.charge.many=%d Charges +genetics.gene.more=%d more genes. Hold shift to display + +genetics.sequence.corrupted=Corrupted Sequence +genetics.sequence.descriptor=%s DNA Sequence +genetics.sequence.unknown= +genetics.sequence.unsequenced=Unsequenced +genetics.sequence.fully=Fully Sequenced +genetics.sequence.partially=Partially Sequenced (%d%%) genetics.machine.machine.isolator=Isolator genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. @@ -112,11 +139,3 @@ genetics.machine.splicer.splicingIn.0=Splicing in %d/%d genes genetics.machine.splicer.splicingIn.1=Splicing in %d/%d gene genetics.machine.splicer.splicingIn.2=Splicing in %d genes genetics.machine.splicer.splicingIn.3=Splicing in %d gene - -genetics.item.sequence=DNA Sequence -genetics.item.sequence.0=Very Faint -genetics.item.sequence.1=Faint -genetics.item.sequence.2=Weak -genetics.item.sequence.3=Average -genetics.item.sequence.4=Strong -genetics.item.sequence.5=Very Strong diff --git a/src/main/resources/assets/genetics/lang/ru_RU.lang b/src/main/resources/assets/genetics/lang/ru_RU.lang index 658e3637..a7d2b7fc 100644 --- a/src/main/resources/assets/genetics/lang/ru_RU.lang +++ b/src/main/resources/assets/genetics/lang/ru_RU.lang @@ -16,6 +16,33 @@ genetics.item.cylinderEmpty.name=Пустой баллон genetics.item.integratedCircuit.name=Интегральная печатная плата genetics.item.integratedCPU.name=Интегральный процессор genetics.item.casingCircuit.name=Интегральный корпус +genetics.item.analyst.name=Аналитик +genetics.item.database.0.name=Генная база данных +genetics.item.database.1.name=Генная база данных мастера +genetics.item.registry.0.name=Картотека +genetics.item.registry.1.name=Картотека мастера +genetics.item.serum.name=Сыворотка (%s) +genetics.item.serumArray.name=Массив (%s) + +genetics.item.sequence=Сыворотка ДНК +genetics.item.sequence.0=Очень слабо +genetics.item.sequence.1=Слабо +genetics.item.sequence.2=Слабовато +genetics.item.sequence.3=Средне +genetics.item.sequence.4=Сильно +genetics.item.sequence.5=Очень сильно + +genetics.gene.charge.empty=Пусто +genetics.gene.charge.one=1 заряд +genetics.gene.charge.many=%d зарядов +genetics.gene.more=%d генов. Зажмите SHIFT для подробностей + +genetics.sequence.corrupted=Разрушенная секвенция +genetics.sequence.descriptor=Автор %s +genetics.sequence.unknown=<Неизвестно> +genetics.sequence.unsequenced=Не секвенцировано +genetics.sequence.fully=Полностью секвенцировано +genetics.sequence.partially=Частично секвенцировано (%d%%) genetics.machine.machine.isolator=Изолятор genetics.machine.machine.isolator.info=Изолятор извлекает случайный ген от пчелы, дерева или другого организма и копирует его в пустой пузырек сыворотки (empty sequence vial). Требуется Этанол для растворения и Фермент для извлечения ДНК. Полученная сыворотка с геном затем может быть усилена в Полимеризаторе и исследована в Секвенсоре. @@ -112,11 +139,3 @@ genetics.machine.splicer.splicingIn.0=Соединения в %d/%d генах genetics.machine.splicer.splicingIn.1=Соединения в %d/%d гене genetics.machine.splicer.splicingIn.2=Соединения в %d генах genetics.machine.splicer.splicingIn.3=Соединения в %d гене - -genetics.item.sequence=Сыворотка ДНК -genetics.item.sequence.0=Очень слабо -genetics.item.sequence.1=Слабо -genetics.item.sequence.2=Слабовато -genetics.item.sequence.3=Средне -genetics.item.sequence.4=Сильно -genetics.item.sequence.5=Очень сильно diff --git a/src/main/resources/assets/genetics/lang/zh_CN.lang b/src/main/resources/assets/genetics/lang/zh_CN.lang index 62c84f2d..3606e8fa 100644 --- a/src/main/resources/assets/genetics/lang/zh_CN.lang +++ b/src/main/resources/assets/genetics/lang/zh_CN.lang @@ -13,6 +13,14 @@ genetics.item.integratedCircuit.name=集成电路板 genetics.item.integratedCPU.name=集成CPU genetics.item.casingCircuit.name=集成外壳 +genetics.item.sequence=DNA序列 +genetics.item.sequence.0=极弱 +genetics.item.sequence.1=弱 +genetics.item.sequence.2=略弱 +genetics.item.sequence.3=中等 +genetics.item.sequence.4=强 +genetics.item.sequence.5=极强 + genetics.machine.machine.isolator=基因分离器 genetics.machine.machine.isolator.info=基因分离器将会从蜜蜂、树苗或者其它的独立个体中随机提取基因片段,并复制到一个空的序列瓶中。此过程需要乙醇作为溶剂,还需要酶来切断DNA。未序列化的血清可以在序列分析器中序列化,并在基因同化器中重新装填。 genetics.machine.isolator.error.noIndividual=没有个体样本 @@ -108,11 +116,3 @@ genetics.machine.splicer.splicingIn.0=正在拼接 %d/%d 个基因 genetics.machine.splicer.splicingIn.1=正在拼接 %d/%d 个基因 genetics.machine.splicer.splicingIn.2=正在拼接 %d 个基因 genetics.machine.splicer.splicingIn.3=正在拼接 %d 个基因 - -genetics.item.sequence=DNA序列 -genetics.item.sequence.0=极弱 -genetics.item.sequence.1=弱 -genetics.item.sequence.2=略弱 -genetics.item.sequence.3=中等 -genetics.item.sequence.4=强 -genetics.item.sequence.5=极强