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

[Translate] Guidebooks #1189

Merged
merged 18 commits into from
Oct 5, 2023
Merged

[Translate] Guidebooks #1189

merged 18 commits into from
Oct 5, 2023

Conversation

lzk228
Copy link
Collaborator

@lzk228 lzk228 commented Jul 5, 2023 •
edited
Loading

Описание PR

Учёл все ошибки с пул реквеста мякота + переработал некоторые моменты
Depends on #1457
Медиа

Проверки

  • PR полностью завершён и мне не нужна помощь чтобы его закончить.
  • Я внимательно просмотрел все свои изменения и багов в них не нашёл.
  • Я запускал локальный сервер со своими изменениями и всё протестировал.
  • Я добавил скриншот/видео демонстрации PR в игре, или этот PR этого не требует.

Изменения

🆑 Myakot, lzk228

  • add: Добавлены переводы руководств

@lzk228 lzk228 requested a review from Morb0 as a code owner July 5, 2023 22:29
@lzk228 lzk228 changed the title comit1 Переводы руководств Jul 5, 2023
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged Changes: No C# Code has not been changed labels Jul 5, 2023
@lzk228 lzk228 changed the title Переводы руководств [Translate] Guidebooks Jul 26, 2023
@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Aug 2, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Aug 2, 2023
Myakot
Myakot reviewed Aug 17, 2023
View reviewed changes
Resources/ServerInfo/Guidebook/Engineering/Networking.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Engineering/Networking.xml Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Engineering/Networking.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Medical/Botanicals.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Service/Chef.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Service/Chef.xml Outdated Show resolved Hide resolved
Resources/ServerInfo/Guidebook/Service/Chef.xml Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict PR have unsolved merge conflicts label Oct 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict PR have unsolved merge conflicts label Oct 5, 2023
@Morb0 Morb0 merged commit 55be416 into space-syndicate:master Oct 5, 2023
8 of 9 checks passed
@lzk228 lzk228 deleted the guidebooks-translate branch October 5, 2023 20:36
@TheArturZh TheArturZh mentioned this pull request Oct 6, 2023
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Myakot Myakot Myakot left review comments

@Morb0 Morb0 Morb0 approved these changes

Assignees
No one assigned
Labels
Changes: No C# Code has not been changed Status: Needs Review This PR requires new reviews before it can be merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lzk228 @Morb0 @Myakot