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.

Sign up for GitHub

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

Jump to bottom

Cargo & bounty translate [Machinima edition] #130

Closed
wants to merge 34 commits into from
Closed

Cargo & bounty translate [Machinima edition] #130

wants to merge 34 commits into from

Conversation

Chorden523
Copy link

@Chorden523 Chorden523 commented Apr 19, 2024 •
edited
Loading

About The Pull Request

Перевод карго консоли и баунти консоли.
Фаргус едишн

@Chorden523 Chorden523 marked this pull request as draft April 19, 2024 09:52
@larentoun
Copy link
Collaborator

Чтобы избавляться от артиклей у предметов, обращайся к имени.

This is [src] -> Это [src.name].

@Chorden523 Chorden523 marked this pull request as ready for review April 20, 2024 09:13
@Chorden523
Copy link
Author

Первый тестовый версия доступна, аваитинг ревью

@Chorden523 Chorden523 changed the title Cargo & bounty translate Cargo & bounty translate [Machinima edition] Apr 20, 2024
larentoun
larentoun requested changes Apr 20, 2024
View reviewed changes
Copy link
Collaborator

@larentoun larentoun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Первая партия. Надеюсь, гитхаб перестанет лагать, если я отправлю ее

code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/mining.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/mining.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/mining.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/mining.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/mining.dm Outdated Show resolved Hide resolved
larentoun
larentoun requested changes Apr 20, 2024
View reviewed changes
Copy link
Collaborator

@larentoun larentoun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Короче, я допроверю после того, как ты проведешь code/modules/cargo/bounties/assistant.dm через инструменты для проверки орфографии и пунктуации.

ЦентКом преврати в ЦК. Я устал.

code/modules/cargo/bounties/reagent.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/reagent.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/reagent.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/reagent.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/reagent.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/security.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/security.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/security.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
@Chorden523 Chorden523 marked this pull request as draft April 20, 2024 12:26
@Chorden523 Chorden523 marked this pull request as ready for review April 23, 2024 13:24
@Chorden523
Copy link
Author

Chorden523 commented Apr 23, 2024 •
edited
Loading

Вроде всё прогнал, как надо было. Надо бы ещё строчку найти лишнюю, где я добавил. И разобраться с линтером ТГУИ.

@Chorden523 Chorden523 requested a review from larentoun April 23, 2024 13:25
larentoun
larentoun requested changes Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@larentoun larentoun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Гораздо лучше. Посмотри линтер, он ругается на некоторые файлы. Открой их и нажми сохрани файл, должен Prettier сработать

code/game/machinery/civilian_bounties.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
code/modules/cargo/bounties/assistant.dm Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/Cargo.jsx Outdated Show resolved Hide resolved
tgui/packages/tgui/interfaces/Cargo.jsx Outdated Show resolved Hide resolved
Chorden523 and others added 7 commits April 23, 2024 23:35
@larentoun larentoun marked this pull request as draft April 26, 2024 13:30
@larentoun
Copy link
Collaborator

Перевожу в драфт. Как будет готово - открывай для ревью.

Там обновили интерфейс у карго консоли, потому, ПР немного сломался.

@Chorden523 Chorden523 closed this Apr 28, 2024
@Chorden523 Chorden523 deleted the cargo_&_bounty_translate branch April 28, 2024 15:10
@Chorden523 Chorden523 restored the cargo_&_bounty_translate branch April 28, 2024 15:14
@Chorden523 Chorden523 reopened this Apr 28, 2024
@larentoun
Copy link
Collaborator

У тебя конфликт в файлах

@Chorden523 Chorden523 closed this May 6, 2024
@Chorden523 Chorden523 deleted the cargo_&_bounty_translate branch May 16, 2024 08:25
@Chorden523 Chorden523 restored the cargo_&_bounty_translate branch July 2, 2024 09:57
@Chorden523 Chorden523 mentioned this pull request Jul 2, 2024
Merged
@Chorden523 Chorden523 deleted the cargo_&_bounty_translate branch July 2, 2024 14:16
larentoun pushed a commit that referenced this pull request Jul 8, 2024
@Chorden523
перевод баунти (#326)
ecc0517 
## About The Pull Request
Переводит на русский язык все баунти. Сам перевод взят со старого пра и
немного подрекдактирован. #130

## Why It's Good For The Game
Русский язык в игре это хорошо
@Chorden523 Chorden523 mentioned this pull request Jul 17, 2024
Merged
larentoun added a commit that referenced this pull request Jul 19, 2024
@Chorden523 @larentoun
Перевод баунти консоли (#407)
a975801 
## About The Pull Request
Перевод баунти консоль и её интерфейс. Перевод был взят с этого пра #130
и отредактирован чтобы соответстовавать действительности.

![Screenshot_1](https://github.com/user-attachments/assets/70d334e4-9df4-4902-b0e4-fdff6bd00413)

![Screenshot_2](https://github.com/user-attachments/assets/01a17152-1ee2-4424-8c32-45bfadf8cfbd)

![Screenshot_3](https://github.com/user-attachments/assets/452f5dc2-3fb0-4147-b837-311a88905ff2)

![Screenshot_4](https://github.com/user-attachments/assets/417cdb56-4600-41e5-9065-d1f07f473863)

![Screenshot_5](https://github.com/user-attachments/assets/0af0c304-431d-4aa5-b851-7fe114bd8e5f)

![Screenshot_6](https://github.com/user-attachments/assets/2f88c4a7-283b-42b4-aa9b-a8c0d279c261)

---------

Co-authored-by: larentoun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dj-34 dj-34 dj-34 left review comments

@larentoun larentoun larentoun requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Chorden523 @larentoun @dj-34