forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #977 from TheArturZh/corvax-cherrypick-27
Corvax cherrypick 27
- Loading branch information
Showing
162 changed files
with
1,239 additions
and
392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
marking-VoxFacialHairColonel = Вокс Полковник | ||
marking-VoxFacialHairFu = Перья Фу | ||
marking-VoxFacialHairNeck = Шейные перья | ||
marking-VoxFacialHairBeard = Перьевая борода | ||
marking-VoxFacialHairRuffBeard = Грубая борода | ||
marking-VoxFacialHairColonel = Вокс, Полковник | ||
marking-VoxFacialHairFu = Вокс, Перья Фу | ||
marking-VoxFacialHairNeck = Вокс, Шейные перья | ||
marking-VoxFacialHairBeard = Вокс, Перьевая борода | ||
marking-VoxFacialHairMane = Вокс, Борода (Грива) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,22 @@ | ||
marking-VoxHairShortQuills = Вокс Короткие перья | ||
marking-VoxHairKingly = Вокс Королевская | ||
marking-VoxHairAfro = Вокс Афро | ||
marking-VoxHairMohawk = Вокс Могавк | ||
marking-VoxHairYasuhiro = Вокс Ясухиро | ||
marking-VoxHairHorns = Вокс Рога | ||
marking-VoxHairNights = Вокс Ночная | ||
marking-VoxHairSurf = Вокс Сёрфер | ||
marking-VoxHairCropped = Вокс Короткая | ||
marking-VoxHairRuffhawk = Вокс Руфхавк | ||
marking-VoxHairRows = Вокс Ряды | ||
marking-VoxHairMange = Вокс Лишай | ||
marking-VoxHairPony = Вокс Пони | ||
marking-VoxHairShortQuills = Вокс, Короткие перья | ||
marking-VoxHairBraids = Вокс, Косички | ||
marking-VoxHairCrestedQuills = Вокс, Гребнистые перья | ||
marking-VoxHairEmperorQuills = Вокс, Императорские перья | ||
marking-VoxHairFlowing = Вокс, Струящаяся | ||
marking-VoxHairHawk = Вокс, Ястреб | ||
marking-VoxHairKingly = Вокс, Королевская | ||
marking-VoxHairKeelQuills = Вокс, Килевые перья | ||
marking-VoxHairKeetQuills = Вокс, Перья цесарки | ||
marking-VoxHairAfro = Вокс, Афро | ||
marking-VoxHairLongBraid = Вокс, Длинная коса | ||
marking-VoxHairMohawk = Вокс, Могавк | ||
marking-VoxHairHorns = Вокс, Рога | ||
marking-VoxHairNights = Вокс, Ночная | ||
marking-VoxHairRazorClipped = Вокс, Бритва (Обрезанные) | ||
marking-VoxHairRazor = Вокс, Бритва | ||
marking-VoxHairSortBraid = Вокс, Короткая коса | ||
marking-VoxHairSurf = Вокс, Сёрфер | ||
marking-VoxHairTielQuills = Вокс, Тилские перья | ||
marking-VoxHairYasu = Вокс, Ясухиро | ||
marking-VoxHairMange = Вокс, Лишай | ||
marking-VoxHairPony = Вокс, Пони |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
bodyburn-text-others = { $name } сгорает дотла! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/chameleon-projector/chameleon-projector.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
chameleon-projector-invalid = Вы не можете так замаскироваться! | ||
chameleon-projector-success = Новая маскировка спроецирована. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
# Имена | ||
chat-emote-name-scream = Кричать | ||
chat-emote-name-laugh = Смеяться | ||
chat-emote-name-honk = Хонк | ||
chat-emote-name-sigh = Вздыхать | ||
chat-emote-name-whistle = Свистеть | ||
chat-emote-name-crying = Плакать | ||
chat-emote-name-squish = Хлюпать | ||
chat-emote-name-chitter = Стрекотать | ||
chat-emote-name-squeak = Пищать | ||
chat-emote-name-click = Клацать | ||
chat-emote-name-clap = Хлопать | ||
chat-emote-name-snap = Щёлкать пальцами | ||
chat-emote-name-salute = Салютовать | ||
chat-emote-name-deathgasp = Предсмертный хрип | ||
chat-emote-name-buzz = Жужжать | ||
chat-emote-name-weh = Вехать | ||
chat-emote-name-chirp = Чирикать | ||
chat-emote-name-beep = Бип | ||
chat-emote-name-chime = Дзынь | ||
chat-emote-name-buzztwo = Бип буп | ||
chat-emote-name-ping = Пинг | ||
chat-emote-name-sneeze = Чихать | ||
chat-emote-name-cough = Кашлять | ||
chat-emote-name-catmeow = Кошачье мяуканье | ||
chat-emote-name-cathisses = Кошачье шипение | ||
chat-emote-name-monkeyscreeches = Обезьяньи крики | ||
chat-emote-name-robotbeep = Робот | ||
chat-emote-name-yawn = Зевать | ||
chat-emote-name-snore = Храпеть | ||
# Сообщение | ||
chat-emote-msg-scream = кричит! | ||
chat-emote-msg-laugh = смеётся | ||
chat-emote-msg-honk = хонкает | ||
chat-emote-msg-sigh = вздыхает | ||
chat-emote-msg-whistle = свистит | ||
chat-emote-msg-crying = плачет | ||
chat-emote-msg-squish = хлюпает | ||
chat-emote-msg-chitter = щебечет | ||
chat-emote-msg-squeak = пищит | ||
chat-emote-msg-click = клацает | ||
chat-emote-msg-clap = хлопает! | ||
chat-emote-msg-snap = щёлкает пальцами | ||
chat-emote-msg-salute = салютует | ||
chat-emote-msg-deathgasp = замирает и бездыханно оседает, { POSS-ADJ($entity) } глаза мертвы и безжизненны... | ||
chat-emote-msg-deathgasp-monkey = издаёт слабый взвизг, оседает и замирает... | ||
chat-emote-msg-buzz = жужжит! | ||
chat-emote-msg-chirp = щебечет! | ||
chat-emote-msg-beep = пищит. | ||
chat-emote-msg-chime = издаёт звон. | ||
chat-emote-msg-buzzestwo = издаёт бип-буп. | ||
chat-emote-msg-ping = издаёт пинг. | ||
chat-emote-msg-sneeze = чихает | ||
chat-emote-msg-cough = кашляет | ||
chat-emote-msg-catmeow = мяукает | ||
chat-emote-msg-cathisses = шипит | ||
chat-emote-msg-monkeyscreeches = кричит | ||
chat-emote-msg-robotbeep = издаёт бип | ||
chat-emote-msg-yawn = зевает | ||
chat-emote-msg-snore = храпит |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
emote-menu-category-general = Общие | ||
emote-menu-category-vocal = Голос | ||
emote-menu-category-hands = Жесты |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/chemistry/components/solution-status.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
solution-status-volume = Объём: [color=white]{ $currentVolume }/{ $maxVolume }ед.[/color] | ||
solution-status-transfer = Перемещение: [color=white]{ $volume }ед.[/color] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
cmd-tippy-desc = Передать сообщение от имени клоуна Типпи. | ||
cmd-tippy-help = tippy <user | all> <message> [entity prototype] [speak time] [slide time] [waddle interval] | ||
cmd-tippy-auto-1 = <user | all> | ||
cmd-tippy-auto-2 = текст | ||
cmd-tippy-auto-3 = прототип сущности | ||
cmd-tippy-auto-4 = время сообщения, в секундах | ||
cmd-tippy-auto-5 = время анимации, в секундах | ||
cmd-tippy-auto-6 = интервал прыжков, в секундах | ||
cmd-tippy-error-no-user = Пользователь не найден. | ||
cmd-tippy-error-no-prototype = Прототип не найден: { $proto } | ||
cmd-tip-desc = Спавн случайного игрового совета. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/construction/conditions/machine-frame-complete.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/construction/conditions/toilet-lid-closed.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# ToiletLidClosed | ||
construction-examine-condition-toilet-lid-closed = Используйте [color=yellow]лом[/color] чтобы закрыть крышку. | ||
construction-examine-condition-toilet-lid-closed = Используйте [color=yellow]монтировку[/color] чтобы закрыть крышку. | ||
construction-step-condition-toilet-lid-closed = Убедитесь, что крышка унитаза закрыта. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
container-verb-text-enter = Забраться | ||
container-verb-text-empty = Покинуть | ||
container-thrown-missed = Промах! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
damage-group-brute = Механические | ||
damage-group-burn = Физические | ||
damage-group-airloss = Нехватка воздуха | ||
damage-group-toxin = Токсины | ||
damage-group-genetic = Генетические |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
damage-type-asphyxiation = Удушение | ||
damage-type-bloodloss = Кровопотеря | ||
damage-type-blunt = Ушибы | ||
damage-type-cellular = Клеточные | ||
damage-type-caustic = Кислотные | ||
damage-type-cold = Обморожение | ||
damage-type-heat = Термические | ||
damage-type-piercing = Уколы | ||
damage-type-poison = Яды | ||
damage-type-radiation = Радиация | ||
damage-type-shock = Электрические | ||
damage-type-slash = Порезы | ||
damage-type-structural = Структурные |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
mopping-system-target-container-empty = В { CAPITALIZE($target) } пусто! | ||
mopping-system-target-container-empty-water = В { CAPITALIZE($target) } нет воды! | ||
mopping-system-target-container-empty = В { $target } пусто! | ||
mopping-system-target-container-empty-water = В { $target } нет воды! | ||
mopping-system-puddle-space = В { $used } полно воды | ||
mopping-system-puddle-evaporate = { $target } испаряется | ||
mopping-system-puddle-evaporate = { CAPITALIZE($target) } испаряется | ||
mopping-system-no-water = В { $used } нет воды! | ||
mopping-system-full = { $used } заполнена! | ||
mopping-system-empty = { $used } пуста! | ||
mopping-system-full = { CAPITALIZE($used) } заполнена! | ||
mopping-system-empty = { CAPITALIZE($used) } пуста! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
geras-popup-morph-message-user = Вы меняетесь и превращаетесь в маленькую версию себя! | ||
geras-popup-morph-message-others = { CAPITALIZE($entity) } меняется и превращается в сгусток слизи! |
Oops, something went wrong.