Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

micro-upstream #4 #149

Merged
merged 7 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 62 additions & 53 deletions Resources/Changelog/ChangelogSyndie.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,4 @@
Entries:
- author: lapatison
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
\u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\
\u044B"
type: Add
id: 220
time: '2022-08-16T16:26:53.0000000+00:00'
- author: lapatison
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\
\u0435\u0432\u043E\u0434\u044B"
type: Add
id: 221
time: '2022-08-16T16:42:20.0000000+00:00'
- author: Morty
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
\u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
\u043D\u0438\u044F"
type: Add
id: 222
time: '2022-08-17T07:30:50.0000000+00:00'
- author: lapatison
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\
\u0435\u0432\u043E\u0434\u044B"
type: Add
id: 223
time: '2022-08-17T20:10:56.0000000+00:00'
- author: lapatison
changes:
- message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0442\u0430\
\u0431\u043B\u0438\u0447\u043A\u0438"
type: Tweak
id: 224
time: '2022-08-18T16:31:19.0000000+00:00'
- author: Morty
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\
\u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\
\u043D\u0438\u044F"
type: Add
id: 225
time: '2022-08-19T20:09:21.0000000+00:00'
- author: lapatison
changes:
- message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u043E \u043F\u043E\
\u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\
\u0435\u043D\u0438\u0435"
type: Tweak
id: 226
time: '2022-08-19T21:28:25.0000000+00:00'
- author: lapatison
changes:
- message: "\u041F\u043E\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\
Expand Down Expand Up @@ -4551,3 +4498,65 @@
id: 719
time: '2024-11-30T10:45:49.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2818
- author: MureixloL, KREKS, SonicDC
changes:
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
\u0439\u0442\u044B!"
type: Tweak
id: 720
time: '2024-12-11T23:32:29.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2802
- author: TiFeRi
changes:
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\
\u0430 Paper."
type: Tweak
id: 721
time: '2024-12-01T17:32:59.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2822
- author: Litogin
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\
\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0443\u043D\u0438\u0444\
\u043E\u0440\u043C\u044B \u043D\u0430 \u0436\u0435\u043D\u0441\u043A\u0438\u0445\
\ \u0432\u0435\u0440\u0441\u0438\u044F\u0445 \u0443\u043D\u0430\u0442\u0445\u043E\
\u0432 \u0438 \u0432\u0443\u043B\u044C\u043F"
type: Fix
id: 722
time: '2024-12-05T23:10:01.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2832
- author: Ko4erga
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
\u0442\u0430 Tushkan."
type: Tweak
id: 723
time: '2024-12-02T12:51:18.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2826
- author: doctor_jake
changes:
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\
\u0430 Silly."
type: Tweak
id: 724
time: '2024-11-30T15:45:31.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2809
- author: Ko4erga
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
\u0442\u0430 Pilgrim."
type: Tweak
id: 725
time: '2024-11-30T15:45:52.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2821
- author: Ko4erga
changes:
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\
\u0442\u0430 Pilgrim."
type: Tweak
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u043F\u0430\u0440\u0430\u043B\
\u0430\u043A\u0441 \u043D\u0430 Silly."
type: Tweak
id: 726
time: '2024-12-03T07:23:23.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2828
4 changes: 3 additions & 1 deletion Resources/Locale/ru-RU/GPS/handheld-gps.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
handheld-gps-coordinates-title = Координаты: { $coordinates }
handheld-gps-coordinates-title =
Координаты:
{ $coordinates }
10 changes: 5 additions & 5 deletions Resources/Locale/ru-RU/atmos/gas-pipe-sensor.ftl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gas-pipe-sensor-distribution-loop = Distribution loop
gas-pipe-sensor-waste-loop = Waste loop
gas-pipe-sensor-mixed-air = Mixed air
gas-pipe-sensor-teg-hot-loop = TEG hot loop
gas-pipe-sensor-teg-cold-loop = TEG cold loop
gas-pipe-sensor-distribution-loop = Распределительный контур
gas-pipe-sensor-waste-loop = Контур отходов
gas-pipe-sensor-mixed-air = Воздушная смесь
gas-pipe-sensor-teg-hot-loop = Горячий контур ТЭГ
gas-pipe-sensor-teg-cold-loop = Холодный контур ТЭГ
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ plant-holder-component-heat-improper-warning = Мигает [color=orange]пре
plant-holder-component-pressure-improper-warning = Мигает [color=lightblue]предупреждение о неподходящем атмосферном давлении[/color].
plant-holder-component-gas-missing-warning = Мигает [color=cyan]предупреждение о неподходящем атмосферном составе[/color].
plant-holder-component-early-sample-message = Растение ещё не выросло настолько, чтобы извлечь семена.
plant-holder-component-ligneous-cant-harvest-message = The plant is too tough to harvest with your bare hands.
plant-holder-component-ligneous-cant-harvest-message = Растение слишком прочное, чтобы собрать его голыми руками.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
chameleon-projector-inside-container = There's no room to scan that!
chameleon-projector-inside-container = Нет места чтобы просканировать это!
chameleon-projector-invalid = Вы не можете так замаскироваться!
chameleon-projector-success = Новая маскировка спроецирована.
chameleon-projector-set-disguise = Set Disguise
chameleon-projector-set-disguise = Установить маскировку
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/chat/commands/ghost-command.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ghost-command-help-text =
Обратите внимание, что это действие необратимо, и вы не сможете вернуться в тело своего персонажа.
ghost-command-no-session = Вы не в сеансе, вы не можете использовать ghost.
ghost-command-denied = Вы не можете стать призраком в данный момент.
ghost-command-error-lobby = You can't ghost right now. You are not in the game!
ghost-command-error-lobby = Вы не можете стать призраком в данный момент. Вы не в игре!

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ construction-menu-place-ghost = Разместить призрак констр
construction-menu-clear-all = Очистить всё
construction-menu-eraser-mode = Режим ластика
construction-menu-craft = Создание
construction-menu-grid-view = Grid View
construction-menu-grid-view = Вид плиткой

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

138 changes: 69 additions & 69 deletions Resources/Locale/ru-RU/datasets/names/borer.ftl
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
names-borer-dataset-1 = Alcyonium
names-borer-dataset-2 = Anomia
names-borer-dataset-3 = Aphrodita
names-borer-dataset-4 = Arca
names-borer-dataset-5 = Argonauta
names-borer-dataset-6 = Ascaris
names-borer-dataset-7 = Asterias
names-borer-dataset-8 = Buccinum
names-borer-dataset-9 = Bulla
names-borer-dataset-10 = Cardium
names-borer-dataset-11 = Chama
names-borer-dataset-12 = Chiton
names-borer-dataset-13 = Conus
names-borer-dataset-14 = Corallina
names-borer-dataset-15 = Cypraea
names-borer-dataset-16 = Dentalium
names-borer-dataset-17 = Donax
names-borer-dataset-18 = Doris
names-borer-dataset-19 = Echinus
names-borer-dataset-20 = Eschara
names-borer-dataset-21 = Fasciola
names-borer-dataset-22 = Furia
names-borer-dataset-23 = Gordius
names-borer-dataset-24 = Gorgonia
names-borer-dataset-25 = Haliotis
names-borer-dataset-26 = Helix
names-borer-dataset-27 = Hirudo
names-borer-dataset-28 = Holothuria
names-borer-dataset-29 = Hydra
names-borer-dataset-30 = Isis
names-borer-dataset-31 = Lepas
names-borer-dataset-32 = Lernaea
names-borer-dataset-33 = Limax
names-borer-dataset-34 = Lumbricus
names-borer-dataset-35 = Madrepora
names-borer-dataset-36 = Medusa
names-borer-dataset-37 = Millepora
names-borer-dataset-38 = Murex
names-borer-dataset-39 = Myes
names-borer-dataset-40 = Mytilus
names-borer-dataset-41 = Myxine
names-borer-dataset-42 = Nautilus
names-borer-dataset-43 = Nereis
names-borer-dataset-44 = Neritha
names-borer-dataset-45 = Ostrea
names-borer-dataset-46 = Patella
names-borer-dataset-47 = Pennatula
names-borer-dataset-48 = Pholas
names-borer-dataset-49 = Pinna
names-borer-dataset-50 = Priapus
names-borer-dataset-51 = Scyllaea
names-borer-dataset-52 = Sepia
names-borer-dataset-53 = Serpula
names-borer-dataset-54 = Sertularia
names-borer-dataset-55 = Solen
names-borer-dataset-56 = Spondylus
names-borer-dataset-57 = Strombus
names-borer-dataset-58 = Taenia
names-borer-dataset-59 = Tellina
names-borer-dataset-60 = Teredo
names-borer-dataset-61 = Tethys
names-borer-dataset-62 = Triton
names-borer-dataset-63 = Trochus
names-borer-dataset-64 = Tubipora
names-borer-dataset-65 = Tubularia
names-borer-dataset-66 = Turbo
names-borer-dataset-67 = Venus
names-borer-dataset-68 = Voluta
names-borer-dataset-69 = Volvox
names-borer-dataset-1 = Альционий
names-borer-dataset-2 = Аномия
names-borer-dataset-3 = Афродита
names-borer-dataset-4 = Арка
names-borer-dataset-5 = Аргонавт
names-borer-dataset-6 = Аскарида
names-borer-dataset-7 = Астерия
names-borer-dataset-8 = Букцинум
names-borer-dataset-9 = Булла
names-borer-dataset-10 = Кардиум
names-borer-dataset-11 = Хама
names-borer-dataset-12 = Хитон
names-borer-dataset-13 = Конус
names-borer-dataset-14 = Кораллина
names-borer-dataset-15 = Ципрея
names-borer-dataset-16 = Денталиум
names-borer-dataset-17 = Донакс
names-borer-dataset-18 = Дорис
names-borer-dataset-19 = Эхинус
names-borer-dataset-20 = Эшара
names-borer-dataset-21 = Фасциола
names-borer-dataset-22 = Фурия
names-borer-dataset-23 = Гордиус
names-borer-dataset-24 = Горгония
names-borer-dataset-25 = Галиотис
names-borer-dataset-26 = Хеликс
names-borer-dataset-27 = Гирудо
names-borer-dataset-28 = Голотурия
names-borer-dataset-29 = Гидра
names-borer-dataset-30 = Исида
names-borer-dataset-31 = Лепас
names-borer-dataset-32 = Лернея
names-borer-dataset-33 = Лимакс
names-borer-dataset-34 = Люмбрикус
names-borer-dataset-35 = Мадрепора
names-borer-dataset-36 = Медуза
names-borer-dataset-37 = Миллепора
names-borer-dataset-38 = Мурекс
names-borer-dataset-39 = Майес
names-borer-dataset-40 = Митилус
names-borer-dataset-41 = Миксина
names-borer-dataset-42 = Наутилус
names-borer-dataset-43 = Нереис
names-borer-dataset-44 = Нерита
names-borer-dataset-45 = Остра
names-borer-dataset-46 = Пателла
names-borer-dataset-47 = Пеннатула
names-borer-dataset-48 = Фолас
names-borer-dataset-49 = Пинна
names-borer-dataset-50 = Приап
names-borer-dataset-51 = Скиллея
names-borer-dataset-52 = Сепия
names-borer-dataset-53 = Серпула
names-borer-dataset-54 = Сертулария
names-borer-dataset-55 = Солен
names-borer-dataset-56 = Спондилус
names-borer-dataset-57 = Стромбус
names-borer-dataset-58 = Тения
names-borer-dataset-59 = Теллина
names-borer-dataset-60 = Тередо
names-borer-dataset-61 = Тетис
names-borer-dataset-62 = Тритон
names-borer-dataset-63 = Трохус
names-borer-dataset-64 = Тубипора
names-borer-dataset-65 = Тубулярия
names-borer-dataset-66 = Турбо
names-borer-dataset-67 = Венера
names-borer-dataset-68 = Волута
names-borer-dataset-69 = Вольвокс
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
fire-extinguisher-component-after-interact-refilled-message = Вы заправили { $owner }
fire-extinguisher-component-safety-on-message = Включён предохранитель.
fire-extinguisher-component-verb-remove = Remove safety
fire-extinguisher-component-verb-engage = Engage safety
fire-extinguisher-component-verb-text = Вкл/Выкл предохранитель
fire-extinguisher-component-safety-on-message = Предохранитель включён.
fire-extinguisher-component-verb-remove = Выключить предохранитель
fire-extinguisher-component-verb-engage = Включить предохранитель
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/ghost/ghost-gui.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ghost-target-window-title = Телепорт призрака
ghost-target-window-current-button = Телепорт в: { $name }
ghost-target-window-warp-to-most-followed = Телепорт к самому следуемому
ghost-roles-window-title = Роли призраков
ghost-roles-window-available-button = Available ({ $rolesCount })
ghost-roles-window-available-button = Доступно ({ $rolesCount })
ghost-roles-window-join-raffle-button = Участвовать в лотерее
ghost-roles-window-raffle-in-progress-button =
Участвовать в лотерее (Осталось { $time }, { $players ->
Expand Down
10 changes: 5 additions & 5 deletions Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ ghost-role-information-behonker-description = Вы - антагонист, не
ghost-role-information-nukeop-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с другими Ядерными оперативниками. Помощь агентов на станции не гарантируется.
ghost-role-information-loneop-name = Одинокий оперативник
ghost-role-information-loneop-description = Вы - одинокий ядерный оперативник. Уничтожьте станцию.
ghost-role-information-loneop-rules = Вы [color=red][bold]Командный антагонист[/bold][/color], в команде с другими Ядерными оперативниками. Помощь агентов на станции не гарантируется.
ghost-role-information-loneop-rules = Вы [color=red][bold]Соло-антагонист[/bold][/color]. Помощь агентов на станции не гарантируется.
ghost-role-information-hellspawn-name = Адское отродье
ghost-role-information-hellspawn-description = Несите смерть всем, кто не повинуется великой богине Нар'Си.
ghost-role-information-Death-Squad-name = Оперативник Эскадрона смерти
Expand Down Expand Up @@ -229,15 +229,15 @@ ghost-role-information-syndie-disaster-victim-name = Жертва катастр
ghost-role-information-syndie-disaster-victim-description = Вы - обычный пассажир со станции Синдиката. К несчастью, спасательная капсула закинула вас во вражеский сектор...
ghost-role-information-artifact-name = Разумный артефакт
ghost-role-information-artifact-description = Осуществляйте свои инопланетные прихоти. Принудительно активируйте свои узлы во благо или во зло.
ghost-role-information-gingerbread-name = Gingerbread Man
ghost-role-information-gingerbread-name = Пряничный человечек
ghost-role-information-gingerbread-description =
A being of pure holiday spirit.
Spread molassesy goodness and to all good cheer.
Существо чистого праздничного духа.
Распространяйте паточную вкуснятину и хорошее настроение.
ghost-role-information-tomatokiller-name = Томат-убийца
ghost-role-information-tomatokiller-description = Этот маленький помидор будет служить ботанику до конца своей жизни... то есть пару минут.
# Corvax-start
ghost-role-information-syndicate-smuggler-name = Контрабандист Синдиката
ghost-role-information-syndicate-smuggler-description = Вы - специально обученный контрабандист синдиката. Отправляйтесь на поиски выданной вам цели и отыщите её любыми средствами.
ghost-role-information-syndicate-smuggler-description = Вы - специально обученный контрабандист Синдиката. Отправляйтесь на поиски выданной вам цели и отыщите её любыми средствами.

# Corvax-end

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ inventory-component-can-equip-cannot = Вы не можете экипирова
inventory-component-can-equip-does-not-fit = Это не подходит!
inventory-component-can-unequip-cannot = Вы не можете снять это!
inventory-component-dropped-from-unequip =
You dropped { $items ->
[1] an item!
*[other] some items!
Вы уронили { $items ->
[1] какой-то предмет!
*[other] несколько предметов!
}
Loading
Loading