Апстрим локализации

Resources/Locale/en-US/_prototypes/_sunrise/entities/mobs/cyborgs/borg_chassis.ftl

@@ -4,8 +4,6 @@ ent-BorgChassisPeace = peace cyborg
     .desc = { ent-BorgChassisSelectable.desc }
 ent-BorgChassisClown = clown cyborg
     .desc = { ent-BorgChassisSelectable.desc }
-ent-BorgChassisSecurityCombat = security combat cyborg
-    .desc = { ent-BaseBorgChassisNT.desc }
 ent-BorgChassisSyndicateReaper = syndicate reaper cyborg
     .desc = { ent-BaseBorgChassisSyndicate.desc }
 ent-BorgChassisERT = ERT combat cyborg

Resources/Locale/en-US/_prototypes/_sunrise/entities/mobs/player/silicon.ftl

@@ -1,30 +1,27 @@
 ent-PlayerBorgMiningBattery = { ent-BorgChassisMining }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisMining.desc }
 ent-PlayerBorgEngineerBattery = { ent-BorgChassisEngineer }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisEngineer.desc }
 ent-PlayerBorgJanitorBattery = { ent-BorgChassisJanitor }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisJanitor.desc }
 ent-PlayerBorgMedicalBattery = { ent-BorgChassisMedical }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisMedical.desc }
 ent-PlayerBorgServiceBattery = { ent-BorgChassisService }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisService.desc }
 ent-PlayerBorgSecurityBattery = { ent-BorgChassisSecurity }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisSecurity.desc }
 ent-PlayerBorgPeaceBattery = { ent-BorgChassisPeace }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisPeace.desc }
 ent-PlayerBorgClownBattery = { ent-BorgChassisClown }
-    .suffix = Battery, Tools
+    .suffix = Battery
     .desc = { ent-BorgChassisClown.desc }
-ent-PlayerBorgSecurityCombatBattery = { ent-BorgChassisSecurityCombat }
-    .suffix = Battery, Tools
-    .desc = { ent-BorgChassisSecurityCombat.desc }
 ent-PlayerBorgChassisERTBattery = { ent-BorgChassisERT }
     .suffix = Battery, Tools
     .desc = { ent-BorgChassisERT.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/devices/circuitboards/machine/production.ftl

@@ -5,4 +5,4 @@ ent-PacificatorCircuitboard = pacifism generator machine board
 ent-ReflectorMachineCircuitboard = reflector machine board
     .desc = { ent-BaseMachineCircuitboard.desc }
 ent-ExosuitFabricatorHyperConvectionMachineCircuitboard = hyper convection exosuit fabricator machine board
-    .desc = { ent-BaseMachineCircuitboard.desc }
+    .desc = A machine printed circuit board for a hyper convection fabricator.

Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl

@@ -0,0 +1,17 @@
+ent-MiniSyringeCryostasis = cryostasis mini syringe
+    .desc = A cryostasis syringe, reshaped to fit inside of a gun.
+    .suffix = Cryostasis, MiniSyringe
+ent-MiniSyringeBluespace = bluespace mini syringe
+    .desc = A Bluespace syringe, reshaped to fit inside of a gun.
+    .suffix = Bluespace, MiniSyringe
+ent-PrefilledMiniSyringe = { ent-MiniSyringe }
+    .desc = { ent-MiniSyringe.desc }
+ent-MiniSyringeMuteToxin = { ent-PrefilledMiniSyringe }
+    .suffix = MuteToxin, MiniSyringe
+    .desc = { ent-PrefilledMiniSyringe.desc }
+ent-MiniSyringeFresium = { ent-PrefilledMiniSyringe }
+    .suffix = Fresium, MiniSyringe
+    .desc = { ent-PrefilledMiniSyringe.desc }
+ent-MiniSyringeCarpoToxin = { ent-PrefilledMiniSyringe }
+    .suffix = CarpoToxin, MiniSyringe
+    .desc = { ent-PrefilledMiniSyringe.desc }

Resources/Locale/en-US/_prototypes/_sunrise/entities/structures/machines/printer.ftl

@@ -1,4 +1,4 @@
 ent-PrinterDoc = document printer
     .desc = Bureaucratic perfection. Stores a database of all Nanotrasen documents, and lets you print them as long as you have paper.
 ent-ExosuitFabricatorHyperConvection = hyper convection exosuit fabricator
-    .desc = A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.
+    .desc = A highly-experimental Exosuit Fabricator that harnesses the power of extreme heat to slowly create objects more cost-effectively.

Resources/Locale/en-US/_prototypes/_sunrise/roles/mindroles/mind_roles.ftl

@@ -6,3 +6,7 @@ ent-MindRoleFugitive = Fugitive Role
     .desc = { ent-BaseMindRoleAntag.desc }
 ent-MindRolePlanetPrisoner = Planet Prisoner Role
     .desc = { ent-BaseMindRoleAntag.desc }
+ent-MindRoleChangeling = Changeling Role
+    .desc = { ent-BaseMindRoleAntag.desc }
+ent-MindRoleVampire = Vampire Role
+    .desc = { ent-BaseMindRoleAntag.desc }

Resources/Locale/en-US/_prototypes/catalog/fills/crates/engineering.ftl

@@ -32,3 +32,5 @@ ent-CrateParticleDecelerators = particle decelerators crate
     .desc = A crate containing 3 Particle Decelerators.
 ent-CrateEngineeringSpaceHeater = space heater crate
     .desc = Contains a space heater for climate control.
+ent-CrateTechBoardRandom = surplus boards
+    .desc = Surplus boards from somewhere.

Resources/Locale/en-US/_prototypes/catalog/fills/crates/materials.ftl

@@ -18,3 +18,5 @@ ent-CrateMaterialCardboard = cardboard crate
     .desc = 60 pieces of cardboard.
 ent-CrateMaterialPaper = paper crate
     .desc = 90 sheets of paper.
+ent-CrateMaterialRandom = surplus materials
+    .desc = Surplus materials from somewhere.

Resources/Locale/en-US/_prototypes/entities/clothing/neck/mantles.ftl

@@ -7,7 +7,7 @@ ent-ClothingNeckMantleCMO = chief medical officer's mantle
 ent-ClothingNeckMantleHOP = head of personnel's mantle
     .desc = A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
 ent-ClothingNeckMantleHOS = head of security's mantle
-    .desc = Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
+    .desc = Shootouts with syndicate agents are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station.
 ent-ClothingNeckMantleRD = research director's mantle
     .desc = For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy.
 ent-ClothingNeckMantleQM = quartermaster's mantle

Resources/Locale/en-US/_prototypes/entities/clothing/neck/pins.ftl

@@ -18,6 +18,8 @@ ent-ClothingNeckNonBinaryPin = non-binary pin
     .desc = 01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101
 ent-ClothingNeckPansexualPin = pansexual pin
     .desc = Be pan do crime.
+ent-ClothingNeckOmnisexualPin = omnisexual pin
+    .desc = Be omni do crime.
 ent-ClothingNeckTransPin = transgender pin
     .desc = Be trans do crime.
 ent-ClothingNeckAutismPin = autism pin

Resources/Locale/en-US/_prototypes/entities/clothing/neck/scarfs.ftl

@@ -22,3 +22,23 @@ ent-ClothingNeckScarfStripedCentcom = striped CentComm scarf
     .desc = A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold.
 ent-ClothingNeckScarfStripedZebra = zebra scarf
     .desc = A striped scarf, a mandatory accessory for artists.
+ent-ClothingNeckScarfStripedAce = striped asexual scarf
+    .desc = A stylish striped asexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedAro = striped aromantic scarf
+    .desc = A stylish striped aromantic scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedBiSexual = striped bisexual scarf
+    .desc = A stylish striped bisexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedGay = striped gay scarf
+    .desc = A stylish striped gay scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedInter = striped intersex scarf
+    .desc = A stylish striped intersex scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedLesbian = striped lesbian scarf
+    .desc = A stylish striped lesbian scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedPan = striped pan scarf
+    .desc = A stylish striped pan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedNonBinary = striped non-binary scarf
+    .desc = A stylish striped non-binary scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedRainbow = rainbow scarf
+    .desc = A stylish rainbow scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.
+ent-ClothingNeckScarfStripedTrans = striped trans scarf
+    .desc = A stylish striped trans scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks.

Resources/Locale/en-US/_prototypes/entities/markers/spawners/random/maintenance.ftl

@@ -10,3 +10,6 @@ ent-MaintenanceWeaponSpawner = Maint Loot Spawner
 ent-MaintenancePlantSpawner = Maint Loot Spawner
     .suffix = Plants
     .desc = { ent-MarkerBase.desc }
+ent-MaintenanceInsulsSpawner = Maint Loot Spawner
+    .suffix = Insuls, safe
+    .desc = { ent-MarkerBase.desc }

Resources/Locale/en-US/_prototypes/entities/markers/spawners/random/vending.ftl

@@ -1,3 +1,6 @@
 ent-RandomVending = random vending machine spawner
     .suffix = Any
     .desc = { ent-MarkerBase.desc }
+ent-RandomVendingClothing = random vending machine spawner
+    .suffix = Clothing
+    .desc = { ent-MarkerBase.desc }

Resources/Locale/en-US/_prototypes/entities/objects/consumable/food/food_base.ftl

@@ -1,5 +1,7 @@
-ent-FoodBase = { ent-BaseItem }
+ent-EdibleBase = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
+ent-FoodBase = { ent-EdibleBase }
+    .desc = { ent-EdibleBase.desc }
 ent-FoodInjectableBase = { ent-FoodBase }
     .desc = { ent-FoodBase.desc }
 ent-FoodOpenableBase = { "" }

Resources/Locale/en-US/_prototypes/entities/stations/base.ftl

@@ -10,6 +10,8 @@ ent-BaseStationArrivals = { "" }
     .desc = { "" }
 ent-BaseStationGateway = { "" }
     .desc = { "" }
+ent-BaseStationShuttles = { "" }
+    .desc = { "" }
 ent-BaseStationEvacuation = { "" }
     .desc = { "" }
 ent-BaseStationAlertLevels = { "" }

Resources/Locale/en-US/_prototypes/entities/structures/machines/vending_machines.ftl

@@ -40,6 +40,8 @@ ent-VendingMachinePwrGame = Pwr Game Vendor
     .desc = You want it, we got it. Brought to you in partnership with Vlad's Salads.
 ent-VendingMachineDrGibb = Dr. Gibb Vendor
     .desc = Canned explosion of different flavors in this very vendor!
+ent-VendingMachineSmite = Smite Vendor
+    .desc = Popular with the administration.
 ent-VendingMachineDinnerware = Plasteel Chef's Dinnerware Vendor
     .desc = A kitchen and restaurant equipment vendor.
 ent-VendingMachineMagivend = MagiVend
@@ -140,6 +142,8 @@ ent-VendingMachineCentDrobe = CentDrobe
     .desc = A one-of-a-kind vending machine for all your centcomm aesthetic needs!
 ent-VendingMachineHappyHonk = Happy Honk Dispenser
     .desc = A happy honk meal box dispenser made by honk! co.
+ent-VendingMachinePride = Pride-O-Mat
+    .desc = A vending machine containing pride.
 ent-VendingMachineTankDispenserEVA = gas tank dispenser
     .desc = A vendor for dispensing gas tanks.
     .suffix = EVA [O2, N2]

Resources/Locale/en-US/_prototypes/entities/structures/piping/atmospherics/binary.ftl

@@ -18,3 +18,6 @@ ent-GasRecycler = gas recycler
     .desc = Recycles carbon dioxide and nitrous oxide. Heater and compressor not included.
 ent-HeatExchanger = radiator
     .desc = Transfers heat between the pipe and its surroundings.
+ent-HeatExchangerBend = { ent-HeatExchanger }
+    .suffix = Bend
+    .desc = { ent-HeatExchanger.desc }

Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/intercom.ftl

@@ -36,3 +36,6 @@ ent-IntercomSupply = { ent-Intercom }
 ent-IntercomAll = { ent-Intercom }
     .suffix = All
     .desc = { ent-Intercom.desc }
+ent-IntercomFreelance = { ent-Intercom }
+    .suffix = Freelance
+    .desc = { ent-Intercom.desc }

Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/signs/signs.ftl

@@ -52,6 +52,8 @@ ent-SignDirectionalSupply = supply sign
     .desc = A direction sign, pointing to some supplies.
 ent-SignDirectionalWash = washroom sign
     .desc = A direction sign, pointing to the way to a washroom.
+ent-SignDirectionalEscapePod = escape pods sign
+    .desc = A direction sign, pointing out the way to an escape pod dock.
 ent-SignAi = ai sign
     .desc = A sign, indicating an AI is present.
 ent-SignAiUpload = ai upload sign

Resources/Locale/en-US/_prototypes/roles/mindroles/mind_roles.ftl

@@ -4,10 +4,24 @@ ent-BaseMindRoleAntag = { ent-BaseMindRole }
     .desc = { ent-BaseMindRole.desc }
 ent-MindRoleObserver = Observer Role
     .desc = { ent-BaseMindRole.desc }
-ent-MindRoleGhostMarker = Ghost Role
+ent-MindRoleGhostRoleNeutral = Ghost Role
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleFamiliar = Ghost Role (Familiar)
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleFreeAgent = Ghost Role (Free Agent)
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleSilicon = Ghost Role (Silicon)
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleSiliconAntagonist = Ghost Role (Silicon Antagonist)
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleSoloAntagonist = Ghost Role (Solo Antagonist)
+    .desc = { ent-BaseMindRole.desc }
+ent-MindRoleGhostRoleTeamAntagonist = Ghost Role (Team Antagonist)
     .desc = { ent-BaseMindRole.desc }
 ent-MindRoleJob = Job Role
     .desc = { ent-BaseMindRole.desc }
+ent-MindRoleSiliconBrain = Borg Brain Role
+    .desc = { ent-BaseMindRole.desc }
 ent-MindRoleSubvertedSilicon = Subverted Silicon Role
     .desc = { ent-BaseMindRoleAntag.desc }
 ent-MindRoleDragon = Dragon Role
@@ -30,11 +44,9 @@ ent-MindRoleTraitor = Traitor Role
     .desc = { ent-BaseMindRoleAntag.desc }
 ent-MindRoleTraitorSleeper = Sleeper Agent Role
     .desc = { ent-MindRoleTraitor.desc }
+ent-MindRoleTraitorReinforcement = Syndicate Reinforcement Role
+    .desc = { ent-MindRoleTraitor.desc }
 ent-MindRoleInitialInfected = Initial Infected Role
     .desc = { ent-BaseMindRoleAntag.desc }
 ent-MindRoleZombie = Zombie Role
     .desc = { ent-BaseMindRoleAntag.desc }
-ent-MindRoleChangeling = Changeling Role
-    .desc = { ent-BaseMindRoleAntag.desc }
-ent-MindRoleVampire = Vampire Role
-    .desc = { ent-BaseMindRoleAntag.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/implanters.ftl

@@ -1,2 +1,2 @@
 ent-IcarusKeyImplanter = имплантатор ключей "Икарус"
-.desc = { ent-BaseImplantOnlyImplanter.desc }
+    .desc = { ent-BaseImplantOnlyImplanter.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/assaultops/pda.ftl

@@ -1,2 +1,2 @@
 ent-AssaultOpsPDA = КПК пассажира
-.desc = Почему он не серый?
+    .desc = Почему он не серый?

Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/belt.ftl

@@ -0,0 +1,5 @@
+ent-ClothingBeltSheathSyndicateFilled = { ent-ClothingBeltSheathSyndicate }
+    .suffix = Filled
+    .desc = { ent-ClothingBeltSheathSyndicate.desc }
+ent-BeltSheathSyndieFilledBox = the Wrapped Rapier of the Syndicate
+    .desc = Unwrap.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/poker_cards.ftl

@@ -146,7 +146,7 @@ ent-PokerCardQueenSpade = { ent-BasePokerCard }
     .desc = Покерная карта, с которой вы можете играть. Это пиковая дама
     .suffix = Sergeev_Vladimer ,PlayableCards ,Spade ,Queen
 ent-PokerCardQueenSpadeFlipped = { ent-BasePokerCard }
-   .desc = Покерная карта, с которой можно играть.
+    .desc = Покерная карта, с которой можно играть.
     .suffix = Sergeev_Vladimer , PlayableCards , Base
 ent-PokerCardKingSpade = { ent-BasePokerCard }
     .desc = Покерная карта, с которой вы можете играть. Это король пик.

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/fun/poker_cards_classic.ftl

@@ -191,14 +191,14 @@ ent-PokerCardClassicSixHeartFlipped = { ent-BasePokerCardClassic }
     .desc = Покерная карта, с которой можно играть.
     .suffix = Sergeev_Vladimer ,PlayableCards ,Base
 ent-PokerCardClassicSevenHeart = { ent-BasePokerCardClassic }
-   .desc = Покерная карта, с которой вы можете играть. Это семерка червей.
-   .suffix = Sergeev_Vladimer,PlayableCards,Heart,Seven
+    .desc = Покерная карта, с которой вы можете играть. Это семерка червей.
+    .suffix = Sergeev_Vladimer,PlayableCards,Heart,Seven
 ent-PokerCardClassicSevenHeartFlipped = { ent-BasePokerCardClassic }
     .desc = Покерная карта, с которой можно играть.
     .suffix = Sergeev_Vladimer ,PlayableCards ,Base
 ent-PokerCardClassicEightHeart = { ent-BasePokerCardClassic }
-   .desc = Покерная карта, с которой вы можете играть. Это восьмерка червей.
-   .suffix = Sergeev_Vladimer ,PlayableCards ,Heart ,Eight
+    .desc = Покерная карта, с которой вы можете играть. Это восьмерка червей.
+    .suffix = Sergeev_Vladimer ,PlayableCards ,Heart ,Eight
 ent-PokerCardClassicEightHeartFlipped = { ent-BasePokerCardClassic }
     .desc = Покерная карта, с которой можно играть.
     .suffix = Sergeev_Vladimer , PlayableCards , Base

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/bluecrystal.ftl

@@ -8,5 +8,5 @@ ent-Bluecrystal25 = { ent-Bluecrystal }
     .suffix = 25 BC
     .desc = { ent-Bluecrystal.desc }
 ent-Bluecrystal50 = { ent-Bluecrystal }
-   .suffix = 50 BC
-   .desc = { ent-Bluecrystal.desc }
+    .suffix = 50 BC
+    .desc = { ent-Bluecrystal.desc }

Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/crystallite.ftl

@@ -1,12 +1,12 @@
 ent-Crystallite = кристаллит
-   .desc = Похоже, он переливается манящей энергией.
-   .suffix = 100 К
+    .desc = Похоже, он переливается манящей энергией.
+    .suffix = 100 К
 ent-Crystallite1 = { ent-Crystallite }
-   .suffix = 1 К
-   .desc = { ent-Crystallite.desc }
+    .suffix = 1 К
+    .desc = { ent-Crystallite.desc }
 ent-Crystallite25 = { ent-Crystallite }
-   .suffix = 25 К
-   .desc = { ent-Crystallite.desc }
+    .suffix = 25 К
+    .desc = { ent-Crystallite.desc }
 ent-Crystallite50 = { ent-Crystallite }
-   .suffix = 50 К
-   .desc = { ent-Crystallite.desc }
+    .suffix = 50 К
+    .desc = { ent-Crystallite.desc }