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

Blue Shield & CCC locale fix #366

Merged
merged 8 commits into from
Jul 13, 2024

Conversation

quartuG3
Copy link

О запросе слияния

Добавлен перевод лодауту ОСЩ и КЦК, а так же исправлены локали для предметов ОСЩ и КЦК

Почему / Баланс

Глаза мозолит.

Медиа

lodaut

Чейнджлог
Слишком мало для чейнджлога.

Copy link

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

@quartuG3 quartuG3 changed the title Locale add v2 Blue Shield & CCC locale fix Jun 13, 2024
Copy link

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

Copy link
Collaborator

@MilenVolf MilenVolf left a comment

Choose a reason for hiding this comment

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

Перенеси локаль наших предметов в отдельную папку в Locale/ru-RU/starshine по аналогичному пути. Если папки таковой не будет, создай

@quartuG3
Copy link
Author

Вопрос по локалям лодаутов: их тоже переносить?

@MilenVolf
Copy link
Collaborator

Вопрос по локалям лодаутов: их тоже переносить?

Да, всё что было добавлено нами надо переносить.

Copy link

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

…ace-station-14 into Locale-Add-V2

# Conflicts:
#	Resources/Locale/ru-RU/preferences/loadout-groups.ftl
@MilenVolf MilenVolf merged commit 37f74dc into Workbench-Team:arumoon-server Jul 13, 2024
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants