Merge pull request #114 from KorDum/feature/refactoring

[1.7.10] Added some localization
This commit is contained in:
Alexander Kornilov authored and GitHub committed 2017-06-11 12:16:03 +03:00
commit 82fab2c1cb
11 files changed
+45 -38

No files matched your search

@@ -44,12 +44,12 @@ public class WindowPolymeriser extends WindowMachine {
new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon());
x += 34;
new ControlMachineProgress(this, x + 18, y - 6, progressBase, progress, Position.LEFT);
new ControlSlot(this, x, y).assign(0);
new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(0);
new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(1);
new ControlSlot(this, x, y).assign(Polymeriser.SLOT_SERUM);
new ControlLiquidTank(this, x, y + 18 + 16, true).setTankID(Polymeriser.TANK_BACTERIA);
new ControlLiquidTank(this, x, y + 18 + 16 + 18 + 8, true).setTankID(Polymeriser.TANK_DNA);
new ControlEnergyBar(this, x + 120, 96, 64, 16, Position.LEFT);
x += 40;
new ControlSlot(this, x + 30, y + 18 + 8).assign(1);
new ControlSlot(this, x + 30, y + 18 + 8).assign(Polymeriser.SLOT_GOLD);
new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColor(0xffd800);
x += 138;
new ControlSlotArray(this, x, y + 9, 2, 2).create(Polymeriser.SLOT_SERUM_FINISHED);
@@ -9,11 +9,11 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
public enum GeneticLiquid implements IFluidType {
GrowthMedium("Growth Medium", "growthMedium", 15460533),
Bacteria("Bacteria", "bacteria", 14203521),
BacteriaPoly("Polymerising Bacteria", "bacteriaPoly", 11443396),
RawDNA("Raw DNA", "dna.raw", 15089129),
BacteriaVector("Bacteria Vector", "bacteriaVector", 15960958);
GrowthMedium("growthMedium", 0xebe8b5),
Bacteria("bacteria", 0xd8ba81),
BacteriaPoly("bacteriaPoly", 0xae9cc4),
RawDNA("dna.raw", 0xe63de9),
BacteriaVector("bacteriaVector", 0xf38b7e);
protected String name;
protected String ident;
@@ -21,9 +21,9 @@ public enum GeneticLiquid implements IFluidType {
protected int color;
protected float transparency;
GeneticLiquid(String name, String ident, int color) {
GeneticLiquid(String name, int color) {
this.name = name;
this.ident = ident;
this.ident = name;
this.color = color;
transparency = 1.0f;
}
@@ -13,6 +13,6 @@ class PolymerisingBacteriaValidator extends Validator<FluidStack> {
@Override
public String getTooltip() {
return I18N.localise("fluid.polymerisingBacteria");
return I18N.localise("fluid.bacteriaPoly");
}
}
@@ -277,7 +277,7 @@ binniecore.gui.database.furtherMutations=Further Mutations
binniecore.gui.database.resultantMutations=Resultant Mutations
binniecore.gui.database.descriptor=%s Profile
binniecore.gui.database.time.minute=1 minute
binniecore.gui.database.time.minute=%d minutes
binniecore.gui.database.time.minutes=%d minutes
binniecore.gui.database.time.second=1 second
binniecore.gui.database.time.seconds=%d seconds
binniecore.gui.database.time.progress=Progress
@@ -277,7 +277,7 @@ binniecore.gui.database.furtherMutations=Дальнейшие мутации
binniecore.gui.database.resultantMutations=Результирующие мутации
binniecore.gui.database.descriptor=%s
binniecore.gui.database.time.minute=1 минута
binniecore.gui.database.time.minute=%d мин.
binniecore.gui.database.time.minutes=%d мин.
binniecore.gui.database.time.second=1 секунда
binniecore.gui.database.time.seconds=%d сек.
binniecore.gui.database.time.progress=Прогресс
@@ -285,8 +285,8 @@ binniecore.gui.database.time.notInProgress=Не в прогрессе
binniecore.gui.database.time.inProgress=В прогрессе
binniecore.gui.database.time.left=Осталось времени: %s
binniecore.gui.database.time.total=Всего времени: %s
binniecore.gui.database.energyCost.0=Energy Cost: %d RF
binniecore.gui.database.energyCost.1=Energy Cost: %.2f RF / tick
binniecore.gui.database.energyCost.0=Энергопотребление: %d RF
binniecore.gui.database.energyCost.1=Энергопотребление: %.2f RF / tick
binniecore.gui.temperature.short=Темп.
binniecore.gui.humidity.short=Влаж.
@@ -239,7 +239,7 @@ binniecore.gui.database.furtherMutations=次代突变
binniecore.gui.database.resultantMutations=导向突变
binniecore.gui.database.descriptor=%s 档案
binniecore.gui.database.time.minute=1 分钟
binniecore.gui.database.time.minute=%d 分钟
binniecore.gui.database.time.minutes=%d 分钟
binniecore.gui.database.time.second=1 秒钟
binniecore.gui.database.time.seconds=%d 秒钟
binniecore.gui.database.time.progress=进度
@@ -17,21 +17,21 @@ botany.design.blank=Пустой
botany.design.octagon=Октагон
botany.design.diamond=Алмаз
botany.design.ringed=Кольцо
botany.design.squared=Squared
botany.design.multiply=Multiply
botany.design.halved=Halved
botany.design.striped=Striped
botany.design.thinStriped=Thin Striped
botany.design.fullChequered=Full Chequered
botany.design.fullTiled=Full Tiled
botany.design.chequered=Chequered
botany.design.tiled=Tiled
botany.design.veryThinCornered=Very Thin Cornered
botany.design.thinCornered=Thin Cornered
botany.design.cornered=Cornered
botany.design.thickCornered=Thick Cornered
botany.design.edged=Edged
botany.design.thinEdged=Thin Edged
botany.design.squared=Квадрат
botany.design.multiply=Звезда
botany.design.halved=Половинчатый
botany.design.striped=Полосы
botany.design.thinStriped=Мелкие полосы
botany.design.fullChequered=Полные клетки
botany.design.fullTiled=Полные плитки
botany.design.chequered=Клетки
botany.design.tiled=Плитки
botany.design.veryThinCornered=Очень маленький угол
botany.design.thinCornered=Маленький угол
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
@@ -43,9 +43,9 @@ botany.design.thickSaltire=Thick Saltire
botany.design.thinCrossed=Thin Crossed
botany.design.crossed=Crossed
botany.design.thickCrossed=Thick Crossed
botany.design.thinTSection=Thin T Section
botany.design.thinTSection=Маленькая Т-секция
botany.design.tSection=T-секция
botany.design.thickTSection=Thick T Section
botany.design.thickTSection=Большая Т-секция
botany.design.thinBarredCorner=Thin Barred Corner
botany.design.barredCorner=Barred Corner
botany.design.thickBarredCorner=Thick Barred Corner
@@ -1,3 +1,5 @@
fluid.bacteriaPoly=Polymerising Bacteria
genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This requires the use of fluorescent dye and has a long computational time.
genetics.machine.machine.polymeriser.info=The Polymeriser takes serums and refills them using Raw DNA and replicating bacteria. This can be accelerated using gold nuggets.
genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process takes a very long time and requires a Bacteria Vector, but is 100% successful.
@@ -1,5 +1,8 @@
fluid.polymerisingBacteria=Polymerising Bacteria
fluid.rawDNA=Raw DNA
fluid.bacteria=Bacteria
fluid.bacteriaPoly=Polymerizing Bacteria
fluid.growthMedium=Growth Medium
fluid.bacteriaVector=Bacteria Vector
genetics.item.casingIron.name=Reinforced Casing
genetics.item.dnaDye.name=DNA Dye
@@ -1,5 +1,8 @@
fluid.polymerisingBacteria=Полимеризированная бактерия
fluid.rawDNA=Сырая ДНК
fluid.bacteria=Бактерия
fluid.bacteriaPoly=Полимеризированная бактерия
fluid.growthMedium=Питательная среда
fluid.bacteriaVector=Бактерия Вектор
genetics.item.casingIron.name=Укреплённый корпус
genetics.item.dnaDye.name=Краситель ДНК
@@ -40,7 +43,7 @@ genetics.machine.polymeriser.error.noLiquid=Недостаточно Бакте
genetics.machine.polymeriser.error.noDNA=Недостаточно ДНК
genetics.machine.polymeriser.replicatingWithGene=Репликация с одним геном
genetics.machine.polymeriser.replicatingWithGenes=Репликация с %d генами
genetics.machine.polymeriser.unfilledSerum=Unfilled Serum
genetics.machine.polymeriser.unfilledSerum=Незаполненная сыворотка
genetics.machine.machine.inoculator=Инокулятор
genetics.machine.machine.inoculator.info=Инокулятор использует сыворотку для прививки новых генов. Процесс продолжителен и требует Бактерию Вектор, но на 100% успешен.
@@ -1,4 +1,3 @@
fluid.polymerisingBacteria=Polymerising Bacteria
fluid.rawDNA=原生 DNA
genetics.item.casingIron.name=强化外壳