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

Перевод кухонной машинерии #292

Closed
wants to merge 38 commits into from

Conversation

Kar4es
Copy link

@Kar4es Kar4es commented Jun 5, 2024

About The Pull Request

периважу куханую машинерию

🆑
fix: Кухня на правильном русском языке
/:cl:

Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the 💩 Stale Иногда нам просто похуй. label Jun 16, 2024
@Kar4es
Copy link
Author

Kar4es commented Jun 17, 2024

не забыть бы холодосик полностью перевести

@Kar4es Kar4es marked this pull request as ready for review June 17, 2024 08:28
@Kar4es
Copy link
Author

Kar4es commented Jun 17, 2024

@larentoun ревью бы...

@github-actions github-actions bot removed the 💩 Stale Иногда нам просто похуй. label Jun 18, 2024
@larentoun
Copy link
Collaborator

@larentoun ревью бы...

Я боюсь ревьювить после твоей мафии.

@larentoun
Copy link
Collaborator

Исправишь перевод мафии - я сделаю ревью здесь

@Kar4es
Copy link
Author

Kar4es commented Jun 18, 2024

Исправишь перевод мафии - я сделаю ревью здесь

мафия вмержена уже, я её вообще дропнуть хотел

@Kar4es
Copy link
Author

Kar4es commented Jun 18, 2024

Исправишь перевод мафии - я сделаю ревью здесь

мафия вмержена уже, я её вообще дропнуть хотел

гахер по итогу попросил твои правки вбахать и мержанул

@larentoun
Copy link
Collaborator

Исправишь перевод мафии - я сделаю ревью здесь

мафия вмержена уже, я её вообще дропнуть хотел

гахер по итогу попросил твои правки вбахать и мержанул

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

@larentoun
Copy link
Collaborator

Исправишь перевод мафии - я сделаю ревью здесь

мафия вмержена уже, я её вообще дропнуть хотел

Ревертать смысла нет, но перевод просто ужасен. "Вы готовитесь Разговаривайте с духами, чтобы узнать бла-бла"

Copy link

@awkwardsocialist awkwardsocialist left a comment

Choose a reason for hiding this comment

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

Я посмотрел первые два файла, и мне не понравилось, как твой личный ревьювер говорю тебе: плохо. Если потом будет время, посмотрю оставшиеся файлы, чтобы не висеть мертвым в pending пока оставлю ревью так

code/datums/components/bakeable.dm Outdated Show resolved Hide resolved
code/datums/components/bakeable.dm Outdated Show resolved Hide resolved
code/datums/components/bakeable.dm Outdated Show resolved Hide resolved
code/datums/components/bakeable.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
code/modules/food_and_drinks/machinery/coffeemaker.dm Outdated Show resolved Hide resolved
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.

Если что-то стоит в начале предложения, стоит к нему применять capitalize(), как в примерах выше


if(positive_result)
used_oven.visible_message(
span_notice("You smell something great coming from [used_oven]."),
blind_message = span_notice("You smell something great..."),
span_notice("Вы чувствует как [used_oven] источает приятный запах."),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
span_notice("Вы чувствует как [used_oven] источает приятный запах."),
span_notice("Вы чувствуете, как [used_oven.name] источает приятный запах."),


if(positive_result)
used_oven.visible_message(
span_notice("You smell something great coming from [used_oven]."),
blind_message = span_notice("You smell something great..."),
span_notice("Вы чувствует как [used_oven.name] источает приятный запах."),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
span_notice("Вы чувствует как [used_oven.name] источает приятный запах."),
span_notice("Вы чувствуете, как [used_oven.name] источает приятный запах."),

ignored_mobs = asomnia_hadders,
)
BLACKBOX_LOG_FOOD_MADE(baked_result.type)
else
used_oven.visible_message(
span_warning("You smell a burnt smell coming from [used_oven]."),
blind_message = span_warning("You smell a burnt smell..."),
span_warning("Вы чувствует как [used_oven.name] испускает горелое зловоние."),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
span_warning("Вы чувствует как [used_oven.name] испускает горелое зловоние."),
span_warning("Вы чувствуете, как [used_oven.name] испускает горелое зловоние."),

@@ -118,15 +118,15 @@
if(!current_bake_time) //Not baked yet
if(positive_result)
if(initial(bake_result.gender) == PLURAL)
examine_list += span_notice("[parent] can be [span_bold("baked")] into some [initial(bake_result.name)].")
examine_list += span_notice("Это [parent.name]. [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Я не уверен, что это компилируется. parent является просто датумом, у него почти нет переменных никаких.

Так как это сигнал, нам повезло. Скорее всего, source и является нашим parent.

Suggested change
examine_list += span_notice("Это [parent.name]. [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.")
examine_list += span_notice("Это [source.name], и [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.")

else
examine_list += span_notice("[parent] can be [span_bold("baked")] into \a [initial(bake_result.name)].")
examine_list += span_notice("Это [parent.name]. [span_bold("Готовится")] в [initial(bake_result.name)].")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
examine_list += span_notice("Это [parent.name]. [span_bold("Готовится")] в [initial(bake_result.name)].")
examine_list += span_notice("Это [source.name]. [span_bold("Готовится")] в [initial(bake_result.name)].")

@@ -192,7 +192,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
fry_loop.start()

/obj/machinery/deepfryer/proc/blow_up()
visible_message(span_userdanger("[src] blows up from the entropic reaction!"))
visible_message(span_userdanger("[src.name] взрывается в результате энтропийной реакции!"))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
visible_message(span_userdanger("[src.name] взрывается в результате энтропийной реакции!"))
visible_message(span_userdanger("[capitalize(src.name)] взрывается в результате энтропийной реакции!"))

if(istype(frying_item, /obj/item/freeze_cube))
log_bomber(user, "put a freeze cube in a", src)
visible_message(span_userdanger("[src] starts glowing... Oh no..."))
visible_message(span_userdanger("[src.name] начинает пылать... О нет..."))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
visible_message(span_userdanger("[src.name] начинает пылать... О нет..."))
visible_message(span_userdanger("[capitalize(src.name)] начинает пылать... О нет..."))

reagents.expose(dunking_target, TOUCH)
var/bio_multiplier = dunking_target.getarmor(BODY_ZONE_HEAD, BIO) * 0.01
var/target_temp = dunking_target.bodytemperature
var/cold_multiplier = 1
if(target_temp < TCMB + 10) // a tiny bit of leeway
dunking_target.visible_message(span_userdanger("[dunking_target] explodes from the entropic difference! Holy fuck!"))
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src]).", INVESTIGATE_DEATHS)
dunking_target.visible_message(span_userdanger("[dunking_target.name] взрывается от энтропийной разницы! Блять!"))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
dunking_target.visible_message(span_userdanger("[dunking_target.name] взрывается от энтропийной разницы! Блять!"))
dunking_target.visible_message(span_userdanger("[capitalize(dunking_target.name)] взрывается от энтропийной разницы! Блять!"))

dunking_target.visible_message(span_userdanger("[dunking_target] explodes from the entropic difference! Holy fuck!"))
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src]).", INVESTIGATE_DEATHS)
dunking_target.visible_message(span_userdanger("[dunking_target.name] взрывается от энтропийной разницы! Блять!"))
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src.name]).", INVESTIGATE_DEATHS)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src.name]).", INVESTIGATE_DEATHS)
dunking_target.investigate_log("has been gibbed by entropic difference (being dunked into [src]).", INVESTIGATE_DEATHS)

не трогаем логи

dunking_target.gib(DROP_ALL_REMAINS)
log_combat(user, dunking_target, "blew up", null, "by dunking them into [src]")
log_combat(user, dunking_target, "blew up", null, "by dunking them into [src.name]")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
log_combat(user, dunking_target, "blew up", null, "by dunking them into [src.name]")
log_combat(user, dunking_target, "blew up", null, "by dunking them into [src]")

@msw7007
Copy link

msw7007 commented Jul 16, 2024

Проверить бы

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.

Пока что те же проблемы - нет капитализации для .name в начале предложения


if(positive_result)
used_oven.visible_message(
span_notice("You smell something great coming from [used_oven]."),
blind_message = span_notice("You smell something great..."),
span_notice("Вы чувствуете как [used_oven.name] источает приятный запах."),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
span_notice("Вы чувствуете как [used_oven.name] источает приятный запах."),
span_notice("Вы чувствуете, как [used_oven.name] источает приятный запах."),

ignored_mobs = asomnia_hadders,
)
BLACKBOX_LOG_FOOD_MADE(baked_result.type)
else
used_oven.visible_message(
span_warning("You smell a burnt smell coming from [used_oven]."),
blind_message = span_warning("You smell a burnt smell..."),
span_warning("Вы чувствуете как [used_oven.name] испускает горелое зловоние."),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
span_warning("Вы чувствуете как [used_oven.name] испускает горелое зловоние."),
span_warning("Вы чувствуете, как [used_oven.name] испускает горелое зловоние."),

if(!current_bake_time) //Not baked yet
if(positive_result)
if(initial(bake_result.gender) == PLURAL)
examine_list += span_notice("[parent] can be [span_bold("baked")] into some [initial(bake_result.name)].")
examine_list += span_notice("Это [sourceobj.name]. [initial(bake_result.name)] могут [span_bold("готовиться")] из нее.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

atom/source и является уже parent. Посмотри сигнал COMSIG_ATOM_EXAMINE.


/obj/machinery/food_cart/proc/pack_up()
if(!unpacked)
return
visible_message(span_notice("[src] retracts all of it's unpacked components."))
visible_message(span_notice("[src.name] втягивает все свои распакованные части."))
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
visible_message(span_notice("[src.name] втягивает все свои распакованные части."))
visible_message(span_notice("[capitalize(src.name)] втягивает все свои распакованные части."))

@larentoun larentoun marked this pull request as draft July 20, 2024 09:01
Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Jul 28, 2024
@Gaxeer Gaxeer added RED LABEL PR не может быть устаревшим. Видать кто-то подкупил хэда. and removed Stale labels Aug 2, 2024
Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Aug 10, 2024
@Gaxeer Gaxeer removed the Stale label Aug 13, 2024
Copy link

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale label Aug 21, 2024
@Gaxeer Gaxeer removed the Stale label Aug 22, 2024
@github-actions github-actions bot added the TGUI Добавление или изменение существующего интерфейса на базе фреймворка TGUI label Sep 7, 2024
@github-actions github-actions bot removed the TGUI Добавление или изменение существующего интерфейса на базе фреймворка TGUI label Sep 15, 2024
@larentoun larentoun closed this Oct 4, 2024
larentoun added a commit that referenced this pull request Oct 12, 2024
## About The Pull Request

Продолжение перевода кухни от каркарчеса

## Why It's Good For The Game

РУССКИЙ

## Changelog

Пока не русский

:cl:
/:cl:
#292

---------

Co-authored-by: Kar4es <[email protected]>
Co-authored-by: Kar4es <[email protected]>
Co-authored-by: awkwardsocialist <[email protected]>
Co-authored-by: larentoun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📝 Перевод Фаргус® Полностью на русском языке RED LABEL PR не может быть устаревшим. Видать кто-то подкупил хэда.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants