diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl index 9cce893bfe..54b8aca15b 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -1,8 +1,8 @@ ent-ClothingOuterHardsuitAtmos = atmos hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Has thermal shielding. .suffix = { "" } -ent-ClothingOuterHardsuitCap = captain's armor - .desc = A suit of protective formal armor made for the station's captain. +ent-ClothingOuterHardsuitCap = captain's armored spacesuit + .desc = A formal armored spacesuit, made for the station's captain. .suffix = { "" } ent-ClothingOuterHardsuitDeathsquad = deathsquad hardsuit .desc = An advanced hardsuit favored by commandos for use in special operations. @@ -41,7 +41,7 @@ ent-ClothingOuterHardsuitSecurityRed = head of security's hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. .suffix = { "" } ent-ClothingOuterHardsuitSyndie = blood red hardsuit - .desc = A dual-mode advanced hardsuit designed for work in special operations. + .desc = A heavily armored and agile advanced hardsuit designed for work in special operations. .suffix = { "" } ent-ClothingOuterHardsuitWizard = wizard hardsuit .desc = A bizarre gem-encrusted suit that radiates magical energies. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl index 270e37dd94..9efc07ca65 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -136,3 +136,6 @@ ent-SingularityToy = singuloth-brand toy ent-PonderingOrb = pondering orb .desc = Ponderous, man... Really ponderous. .suffix = { "" } +ent-ToySword = toy sword + .desc = New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! + .suffix = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl index f616bff1c1..3a0639f4ed 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl @@ -1,6 +1,3 @@ -ent-BaseBulletDonkSoft = foam dart - .desc = { ent-BaseItem.desc } - .suffix = { "" } -ent-BulletDonkSoft = foam dart +ent-BulletFoam = foam dart .desc = I hope you're wearing eye protection. .suffix = { "" } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index cd8bce0dee..f2adac3d0d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -43,9 +43,6 @@ ent-BulletGrenadeFlash = flash grenade ent-BulletGrenadeFrag = frag grenade .desc = { ent-BaseBulletTrigger.desc } .suffix = { "" } -ent-BulletFoam = foam dart - .desc = { ent-BaseBullet.desc } - .suffix = { "" } ent-BulletCap = cap bullet .desc = { ent-BaseBullet.desc } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/actions/actions/combat-mode.ftl b/Resources/Locale/ru-RU/actions/actions/combat-mode.ftl index 455d100a43..38315f3ea4 100644 --- a/Resources/Locale/ru-RU/actions/actions/combat-mode.ftl +++ b/Resources/Locale/ru-RU/actions/actions/combat-mode.ftl @@ -1,5 +1,4 @@ action-name-combat = [color=red]Боевой режим[/color] action-description-combat = Войти в боевой режим. -action-popup-combat = Боевой режим включён! -action-popup-combat-enabled = Combat mode enabled! -action-popup-combat-disabling = Боевой режим отключён. +action-popup-combat = Боевой режим отключён! +action-popup-combat-enabled = Боевой режим включён! diff --git a/Resources/Locale/ru-RU/disposal/mailing/components/disposal-mailing-unit-component.ftl b/Resources/Locale/ru-RU/disposal/mailing/components/disposal-mailing-unit-component.ftl index d1f8f96141..a660c66c64 100644 --- a/Resources/Locale/ru-RU/disposal/mailing/components/disposal-mailing-unit-component.ftl +++ b/Resources/Locale/ru-RU/disposal/mailing/components/disposal-mailing-unit-component.ftl @@ -5,25 +5,3 @@ ui-mailing-unit-button-flush = Send ui-mailing-unit-destination-select-label = Select a destination: ui-mailing-unit-self-reference-label = This unit: ui-mailing-unit-target-label = Destination: -disposal-mailing-unit-window-state-label = Состояние: -disposal-mailing-unit-window-ready-state = Готово -disposal-mailing-unit-pressure-label = Давление: -disposal-mailing-unit-handle-label = Ручка: -disposal-mailing-unit-engage-button = Активировать -disposal-mailing-unit-eject-label = Извлечь: -disposal-mailing-unit-eject-button = Извлечь содержимое -disposal-mailing-unit-power-button = Питание -disposal-mailing-unit-destination-select-label = Выберите место назначения: -disposal-mailing-unit-unit-self-reference = Это устройство: -disposal-mailing-unit-is-valid-interaction-cannot-interact = Вы не можете этого сделать! -disposal-mailing-unit-is-valid-interaction-cannot-reach = Вы не можете туда достать! -disposal-mailing-unit-is-valid-interaction-no-hands = У вас нет рук. - -## SelfInsertVerb - -disposal-self-insert-verb-get-data-text = Залезть - -## FlushVerb - -disposal-flush-verb-get-data-text = Смыть -disposal-eject-verb-contents = содержимое diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl index 15ab63b19c..96a776d410 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl @@ -4,5 +4,5 @@ ent-CrateFoodMRE = MRE crate .desc = A military style meal fit to feed a whole department. ent-CrateFoodCooking = Kitchen supplies crate .desc = Extra kitchen supplies, in case the botanists are absent. -ent-CrateFoodKvassTank = Kvass tank crate - .desc = A tank with refreshing kvass, which helps so much in the heat. +ent-CrateFoodKvassTank = ящик с бочкой кваса + .desc = Прохладный освежающий напиток с привкусом социализма. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/food.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/food.ftl index bdbf37a57a..dd40295c02 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/food.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/food.ftl @@ -7,6 +7,3 @@ ent-CrateFoodMRE = ящик ИРП ent-CrateFoodCooking = ящик кухонных припасов .desc = Дополнительные кухонные припасы на случай отсутствия ботаников. .suffix = { "" } -ent-CrateFoodKvassTank = ящик с бочкой кваса - .desc = { ent-CrateGenericSteel.desc } - .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/gas_tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/gas_tanks.ftl index a40abcd5ac..a380de56dc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/gas_tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/gas_tanks.ftl @@ -4,9 +4,6 @@ ent-OxygenTankFilled = { ent-OxygenTank } ent-YellowOxygenTankFilled = { ent-YellowOxygenTank } .desc = { ent-YellowOxygenTank.desc } .suffix = Заполненный -ent-RedOxygenTankFilled = { ent-RedOxygenTank } - .desc = { ent-RedOxygenTank.desc } - .suffix = Заполненный ent-EmergencyOxygenTankFilled = { ent-EmergencyOxygenTank } .desc = { ent-EmergencyOxygenTank.desc } .suffix = Заполненный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/base_clothinguniforms.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/base_clothinguniforms.ftl index c314f65ed9..2fc802f8f0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/base_clothinguniforms.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/base_clothinguniforms.ftl @@ -4,9 +4,6 @@ ent-UnsensoredClothingUniformBase = { ent-Clothing } ent-UnsensoredClothingUniformSkirtBase = { ent-UnsensoredClothingUniformBase } .desc = { ent-UnsensoredClothingUniformBase.desc } .suffix = { "" } -ent-ClothingWithSuitSensor = { ent-Clothing } - .desc = { ent-Clothing.desc } - .suffix = { "" } ent-ClothingUniformBase = { ent-ClothingWithSuitSensor } .desc = { ent-ClothingWithSuitSensor.desc } .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl index 50450dd413..2df9e8477a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl @@ -136,3 +136,6 @@ ent-SingularityToy = игрушечная сингулярность ent-PonderingOrb = шар размышлений .desc = Это тяжело, мужик... Очень тяжело. .suffix = { "" } +ent-ToySword = toy sword + .desc = New Sandy-Cat plastic sword! Comes with realistic sound and full color! Looks almost like the real thing! + .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl index e48e935b25..40a1679a3d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/gas_tanks.ftl @@ -10,9 +10,6 @@ ent-YellowOxygenTank = кислородный баллон ent-NitrogenTank = nitrogen tank .desc = A tank of nitrogen. .suffix = { "" } -ent-RedOxygenTank = кислородный баллон - .desc = Красный баллон с кислородом. - .suffix = { "" } ent-EmergencyOxygenTank = аварийный кислородный баллон .desc = Используется в чрезвычайных ситуациях. Содержит очень мало кислорода, поэтому постарайтесь сохранить его до тех пор, пока он вам действительно не понадобится. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl index 4c9ac7f309..50cada314f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/projectiles/toy.ftl @@ -1,6 +1,3 @@ -ent-BaseBulletDonkSoft = поролоновый дротик - .desc = { ent-BaseItem.desc } - .suffix = { "" } -ent-BulletDonkSoft = поролоновый дротик +ent-BulletFoam = поролоновый дротик .desc = Надеюсь, вы носите защиту для глаз. .suffix = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index cd8bce0dee..f2adac3d0d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -43,9 +43,6 @@ ent-BulletGrenadeFlash = flash grenade ent-BulletGrenadeFrag = frag grenade .desc = { ent-BaseBulletTrigger.desc } .suffix = { "" } -ent-BulletFoam = foam dart - .desc = { ent-BaseBullet.desc } - .suffix = { "" } ent-BulletCap = cap bullet .desc = { ent-BaseBullet.desc } .suffix = { "" }