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

Translation fix after [Merge Upstream 25.12.2024] #911

Merged
merged 2 commits into from
Dec 25, 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
12 changes: 6 additions & 6 deletions code/datums/components/pet_commands/pet_commands_basic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
command_name = "Stay"
command_desc = "Command your pet to stay idle in this location."
radial_icon_state = "halt"
speech_commands = list("sit", "stay", "stop")
speech_commands = list("sit", "stay", "stop", "сидеть", "лежать", "место", "фу", "стоп", "стой", "стоять")
command_feedback = "sits"

/datum/pet_command/idle/execute_action(datum/ai_controller/controller)
Expand All @@ -25,7 +25,7 @@
command_name = "Loose"
command_desc = "Allow your pet to resume its natural behaviours."
radial_icon_state = "free"
speech_commands = list("free", "loose")
speech_commands = list("free", "loose", "гулять", "вон", "свобод", "брысь")
command_feedback = "relaxes"

/datum/pet_command/free/execute_action(datum/ai_controller/controller)
Expand All @@ -43,7 +43,7 @@
command_name = "Follow"
command_desc = "Command your pet to accompany you."
radial_icon_state = "follow"
speech_commands = list("heel", "follow")
speech_commands = list("heel", "follow", "за мной", "след", "охран", "к ноге", "ко мне")
callout_type = /datum/callout_option/move
///the behavior we use to follow
var/follow_behavior = /datum/ai_behavior/pet_follow_friend
Expand All @@ -67,7 +67,7 @@
command_name = "Play Dead"
command_desc = "Play a macabre trick."
radial_icon_state = "play_dead"
speech_commands = list("play dead") // Don't get too creative here, people talk about dying pretty often
speech_commands = list("play dead", "притворись мертвым", "умри") // Don't get too creative here, people talk about dying pretty often

/datum/pet_command/play_dead/execute_action(datum/ai_controller/controller)
controller.queue_behavior(/datum/ai_behavior/play_dead)
Expand Down Expand Up @@ -180,7 +180,7 @@
command_desc = "Command your pet to attempt to breed with a partner."
requires_pointing = TRUE
radial_icon_state = "breed"
speech_commands = list("breed", "consummate")
speech_commands = list("breed", "consummate", "размножайся")
///the behavior we use to make babies
var/datum/ai_behavior/reproduce_behavior = /datum/ai_behavior/make_babies

Expand Down Expand Up @@ -217,7 +217,7 @@
radial_icon = 'icons/mob/actions/actions_spells.dmi'
radial_icon_state = "projectile"
requires_pointing = TRUE
speech_commands = list("shoot", "blast", "cast")
speech_commands = list("shoot", "blast", "cast", "стреля", "выстрел", "пиу", "паф", "каст")
command_feedback = "growl"
pointed_reaction = "and growls"
/// Blackboard key where a reference to some kind of mob ability is stored
Expand Down
6 changes: 3 additions & 3 deletions code/datums/elements/slapcrafting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@

for(var/datum/crafting_recipe/recipe as anything in slapcraft_recipes)
var/atom/result = initial(recipe.result)
examine_list += "<a href='byond://?src=[REF(source)];check_recipe=[REF(recipe)]'>See Recipe For [initial(result.name)]</a>"
examine_list += "<a href='byond://?src=[REF(source)];check_recipe=[REF(recipe)]'>Узнать рецепт для [declent_ru_initial(result::name, GENITIVE, result::name)]</a>"

/datum/element/slapcrafting/proc/topic_handler(atom/source, user, href_list)
SIGNAL_HANDLER
Expand Down Expand Up @@ -179,7 +179,7 @@

// If we did find ingredients then add them onto the list.
if(length(string_ingredient_list))
to_chat(user, span_boldnotice("Extra Ingredients:"))
to_chat(user, span_boldnotice("Дополнительные ингредиенты:"))
to_chat(user, boxed_message(span_notice(string_ingredient_list)))

var/list/tool_list = ""
Expand All @@ -193,7 +193,7 @@
tool_list += "[string]\n"

if(length(tool_list))
to_chat(user, span_boldnotice("Required Tools:"))
to_chat(user, span_boldnotice("Необходимые инструменты:"))
to_chat(user, boxed_message(span_notice(tool_list)))

qdel(cur_recipe)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/elements/weapon_description.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
SIGNAL_HANDLER

if(item.force >= 5 || item.throwforce >= 5 || item.override_notes || item.offensive_notes || attached_proc) /// Only show this tag for items that could feasibly be weapons, shields, or those that have special notes
examine_texts += span_notice("<a href='byond://?src=[REF(item)];examine=1'>See combat information.</a>")
examine_texts += span_notice("<a href='byond://?src=[REF(item)];examine=1'>Боевые характеристики.</a>")

/**
*
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
if(MOOD_HAPPY2 to INFINITY)
msg += span_boldnicegreen(event.description + "\n")
else
msg += "[span_grey("I don't have much of a reaction to anything right now.")]\n"
msg += "[span_grey("Сейчас у меня нет особой реакции на что-либо.")]\n"
to_chat(user, boxed_message(msg))

/// Updates the mob's moodies, if the area provides a mood bonus
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/antag_panel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ GLOBAL_VAR(antag_prototypes)

var/out = "<B>[name]</B>[(current && (current.real_name != name))?" (as [current.real_name])":""]<br>"
out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>"
out += "Assigned role: [assigned_role.title]. <a href='byond://?src=[REF(src)];role_edit=1'>Edit</a><br>"
out += "Assigned role: [job_title_ru(assigned_role.title)]. <a href='byond://?src=[REF(src)];role_edit=1'>Edit</a><br>"
out += "Faction and special role: <b><font color='red'>[special_role]</font></b><br>"
out += "<a href='byond://?_src_=holder;[HrefToken()];check_teams=1'>Show Teams</a><br><br>"

Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/verbs/secrets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -347,15 +347,15 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
if(SSeconomy.full_ancap)
priority_announce("Принцип неагрессивности действует в полную силу. Любое проявление агрессии запрещено.", null, SSstation.announcer.get_rand_report_sound())
else
priority_announce("The NAP has been revoked.", null, SSstation.announcer.get_rand_report_sound())
priority_announce("Принцип неагрессивности отменен.", null, SSstation.announcer.get_rand_report_sound())
if("send_shuttle_back")
if (!is_funmin)
return
if (SSshuttle.emergency.mode != SHUTTLE_ESCAPE)
to_chat(usr, span_warning("Emergency shuttle not currently in transit!"), confidential = TRUE)
return
var/make_announcement = tgui_alert(usr, "Make a CentCom announcement?", "Emergency shuttle return", list("Yes", "Custom Text", "No")) || "No"
var/announcement_text = "Emergency shuttle trajectory overriden, rerouting course back to [station_name()]."
var/announcement_text = "Траектория эвакуационного шаттла изменена, перенаправление курса обратно на [station_name()]."
if (make_announcement == "Custom Text")
announcement_text = tgui_input_text(usr, "Custom CentCom announcement", "Emergency shuttle return", multiline = TRUE) || announcement_text
var/new_timer = tgui_input_number(usr, "How long should the shuttle remain in transit?", "When are we droppin' boys?", 180, 600)
Expand All @@ -366,9 +366,9 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
if (make_announcement != "No")
priority_announce(
text = announcement_text,
title = "Shuttle Trajectory Override",
title = "Принудительное изменение траектории шаттла",
sound = 'sound/announcer/announcement/announce_dig.ogg',
sender_override = "Emergency Shuttle Uplink Alert",
sender_override = "Система оповещения эвакуационного шаттла",
color_override = "grey",
)
SSshuttle.emergency.timer = INFINITY
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
. += how_cool_are_your_threads.Join()

if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)) || (clothing_flags & STOPSPRESSUREDAMAGE) || (visor_flags & STOPSPRESSUREDAMAGE))
. += span_notice("It has a <a href='byond://?src=[REF(src)];list_armor=1'>tag</a> listing its protection classes.")
. += span_notice("Имеется <a href='byond://?src=[REF(src)];list_armor=1'>бирка</a>, указывающая классы защиты.")

/obj/item/clothing/examine_tags(mob/user)
. = ..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/food_and_drinks/machinery/processor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@
if(!LAZYLEN(processor_contents))
to_chat(user, span_warning("Внутри [declent_ru(GENITIVE)] пусто!"))
return TRUE
user.visible_message(span_notice("[user] turns on [src]."), \
span_notice("You turn on [src]."), \
span_hear("You hear a food processor."))
user.visible_message(span_notice("[capitalize(user.declent_ru(NOMINATIVE))] включает [declent_ru(ACCUSATIVE)]."), \
span_notice("Вы включаете [declent_ru(ACCUSATIVE)]."), \
span_hear("Вы слышите кухонный комбайн."))
processing()


Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/carbon_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,9 @@
visible_message(span_notice("[capitalize(declent_ru(NOMINATIVE))] осматривает себя."), \
span_notice("Вы проверяете себя на наличие осколков."))
if(I.is_embed_harmless())
to_chat(src, "\t <a href='byond://?src=[REF(src)];embedded_object=[REF(I)];embedded_limb=[REF(LB)]' class='warning'>There is \a [I] stuck to your [LB.name]!</a>")
to_chat(src, "\t <a href='byond://?src=[REF(src)];embedded_object=[REF(I)];embedded_limb=[REF(LB)]' class='warning'>[capitalize(I.declent_ru(NOMINATIVE))] застревает у вас на [LB.declent_ru(PREPOSITIONAL)]!</a>")
else
to_chat(src, "\t <a href='byond://?src=[REF(src)];embedded_object=[REF(I)];embedded_limb=[REF(LB)]' class='warning'>There is \a [I] embedded in your [LB.name]!</a>")
to_chat(src, "\t <a href='byond://?src=[REF(src)];embedded_object=[REF(I)];embedded_limb=[REF(LB)]' class='warning'>[capitalize(I.declent_ru(NOMINATIVE))] впивается у вас в [LB.declent_ru(PREPOSITIONAL)]!</a>")

return embeds

Expand Down Expand Up @@ -663,7 +663,7 @@
return FALSE

if (run_armor_check(attack_flag = BIO, silent = TRUE) >= 100)
to_chat(src, span_warning("Your armor shields you from [scramble_source]!"))
to_chat(src, span_warning("Ваша броня поглощает воздействие от [scramble_source]!"))
return FALSE

if (!length(GLOB.bioscrambler_valid_organs) || !length(GLOB.bioscrambler_valid_parts))
Expand Down
30 changes: 15 additions & 15 deletions code/modules/mob/living/carbon/examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@
if(wear_id && !(wear_id.item_flags & EXAMINE_SKIP))
var/obj/item/card/id/id = wear_id.GetID()
if(id && get_dist(user, src) <= ID_EXAMINE_DISTANCE)
var/id_href = "<a href='byond://?src=[REF(src)];see_id=1;id_ref=[REF(id)];id_name=[id.registered_name];examine_time=[world.time]'>[wear_id.examine_title(user)]</a>"
. += "[t_He] [t_is] wearing [id_href]."
var/id_href = "<a href='byond://?src=[REF(src)];see_id=1;id_ref=[REF(id)];id_name=[id.registered_name];examine_time=[world.time]'>[wear_id.examine_title(user, declent = ACCUSATIVE)]</a>"
. += "[t_He] носит [id_href]."

else
. += "[t_He] носит [wear_id.examine_title(user, declent = ACCUSATIVE)]."
Expand Down Expand Up @@ -494,8 +494,8 @@
if(perpname && (HAS_TRAIT(user, TRAIT_SECURITY_HUD) || HAS_TRAIT(user, TRAIT_MEDICAL_HUD)) && (user.stat == CONSCIOUS || isobserver(user)) && user != src)
var/datum/record/crew/target_record = find_record(perpname)
if(target_record)
. += "Rank: [target_record.rank]"
. += "<a href='byond://?src=[REF(src)];hud=1;photo_front=1;examine_time=[world.time]'>\[Front photo\]</a><a href='byond://?src=[REF(src)];hud=1;photo_side=1;examine_time=[world.time]'>\[Side photo\]</a>"
. += "Должность: [target_record.rank]"
. += "<a href='byond://?src=[REF(src)];hud=1;photo_front=1;examine_time=[world.time]'>\[Фото спереди\]</a><a href='?src=[REF(src)];hud=1;photo_side=1;examine_time=[world.time]'>\[Фото сбоку\]</a>"
if(HAS_TRAIT(user, TRAIT_MEDICAL_HUD) && HAS_TRAIT(user, TRAIT_SECURITY_HUD))
title = separator_hr("Медицинский и безопасности анализы")
. += get_medhud_examine_info(user, target_record)
Expand Down Expand Up @@ -529,10 +529,10 @@
. += "<a href='byond://?src=[REF(src)];hud=m;physical_status=1;examine_time=[world.time]'>\[[target_record.physical_status]\]</a>"
. += "<a href='byond://?src=[REF(src)];hud=m;mental_status=1;examine_time=[world.time]'>\[[target_record.mental_status]\]</a>"
else
. += "\[Record Missing\]"
. += "\[Record Missing\]"
. += "<a href='byond://?src=[REF(src)];hud=m;evaluation=1;examine_time=[world.time]'>\[Medical evaluation\]</a>"
. += "<a href='byond://?src=[REF(src)];hud=m;quirk=1;examine_time=[world.time]'>\[See quirks\]</a>"
. += "\[Запись отсутствует\]"
. += "\[Запись отсутствует\]"
. += "<a href='byond://?src=[REF(src)];hud=m;evaluation=1;examine_time=[world.time]'>\[Медицинское обследование\]</a>"
. += "<a href='byond://?src=[REF(src)];hud=m;quirk=1;examine_time=[world.time]'>\[Показать черты\]</a>"

/// Collects information displayed about src when examined by a user with a security HUD.
/mob/living/carbon/proc/get_sechud_examine_info(mob/living/user, datum/record/crew/target_record)
Expand All @@ -546,15 +546,15 @@
if(target_record.security_note)
security_note = target_record.security_note
if(ishuman(user))
. += "Criminal status: <a href='byond://?src=[REF(src)];hud=s;status=1;examine_time=[world.time]'>\[[wanted_status]\]</a>"
. += "Криминальный статус: <a href='byond://?src=[REF(src)];hud=s;status=1;examine_time=[world.time]'>\[[wanted_status]\]</a>"
else
. += "Criminal status: [wanted_status]"
. += "Important Notes: [security_note]"
. += "Security record: <a href='byond://?src=[REF(src)];hud=s;view=1;examine_time=[world.time]'>\[View\]</a>"
. += "Криминальный статус: [wanted_status]"
. += "Важные заметки: [security_note]"
. += "Записи охраны: <a href='byond://?src=[REF(src)];hud=s;view=1;examine_time=[world.time]'>\[Показать\]</a>"
if(ishuman(user))
. += "<a href='byond://?src=[REF(src)];hud=s;add_citation=1;examine_time=[world.time]'>\[Add citation\]</a>\
<a href='byond://?src=[REF(src)];hud=s;add_crime=1;examine_time=[world.time]'>\[Add crime\]</a>\
<a href='byond://?src=[REF(src)];hud=s;add_note=1;examine_time=[world.time]'>\[Add note\]</a>"
. += "<a href='byond://?src=[REF(src)];hud=s;add_citation=1;examine_time=[world.time]'>\[Добавить штраф\]</a>\
<a href='byond://?src=[REF(src)];hud=s;add_crime=1;examine_time=[world.time]'>\[Добавить преступление\]</a>\
<a href='byond://?src=[REF(src)];hud=s;add_note=1;examine_time=[world.time]'>\[Добавить примечание\]</a>"

/mob/living/carbon/human/examine_more(mob/user)
. = ..()
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,9 @@
sec_record_message += span_notice("\n-- РЕДАКТИРОВАНО --")
continue

sec_record_message += "\n<b>Crime:</b> [crime.name]"
sec_record_message += "\n<b>Details:</b> [crime.details]"
sec_record_message += "\nAdded by [crime.author] at [crime.time]"
sec_record_message += "\n<b>Преступление:</b> [crime.name]"
sec_record_message += "\n<b>Описание:</b> [crime.details]"
sec_record_message += "\n[crime.author] добавляет в [crime.time]"
to_chat(human_or_ghost_user, boxed_message(sec_record_message))
return
if(ishuman(human_or_ghost_user))
Expand Down
12 changes: 6 additions & 6 deletions code/modules/mob/living/navigation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
destination_list[destination_name] = destination

if(can_go_down)
destination_list["Nearest Way Down"] = DOWN
destination_list["Близлежащий путь вниз"] = DOWN
if(can_go_up)
destination_list["Nearest Way Up"] = UP
destination_list["Близлежащий путь вверх"] = UP

if(!length(destination_list))
balloon_alert(src, "нет сигнала для навигации!")
return

var/platform_code = tgui_input_list(src, "Select a location", "Navigate", sort_list(destination_list))
var/platform_code = tgui_input_list(src, "Выберите локацию", "Навигация", sort_list(destination_list))
var/atom/navigate_target = destination_list[platform_code]

if(isnull(navigate_target) || incapacitated)
Expand All @@ -58,12 +58,12 @@
// lowering the cooldown to 5 seconds if we're navigating to a ladder or staircase instead of a proper destination
// (so we can decide to move to another destination right off the bat, rather than needing to wait)
COOLDOWN_START(src, navigate_cooldown, 5 SECONDS)
var/direction_name = isatom(navigate_target) ? "there" : (navigate_target == UP ? "up" : "down")
var/direction_name = isatom(navigate_target) ? "туда" : (navigate_target == UP ? "вверх" : "вниз")
var/nav_dir = isatom(navigate_target) ? (get_dir_multiz(src, navigate_target) & (UP|DOWN)) : navigate_target
var/atom/new_target = find_nearest_stair_or_ladder(nav_dir)

if(!new_target)
balloon_alert(src, "can't find ladder or staircase going [direction_name]!")
balloon_alert(src, "не удалось найти ступеньки или лестницу ведущую [direction_name]!")
return

navigate_target = new_target
Expand Down Expand Up @@ -104,7 +104,7 @@
RegisterSignal(src, COMSIG_LIVING_DEATH, PROC_REF(cut_navigation))
if(finding_zchange)
RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(cut_navigation))
balloon_alert(src, "navigation path created")
balloon_alert(src, "путь к месту назначания построен")

/mob/living/proc/shine_navigation()
for(var/i in 1 to length(client.navigation_images))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@
if(examine_time && (world.time - examine_time < EXAMINE_MORE_WINDOW))
var/list/result = examinify.examine_more(src)
if(!length(result))
result += span_notice("<i>You examine [examinify] closer, but find nothing of interest...</i>")
result += span_notice("<i>Вы осматриваете [examinify.declent_ru(ACCUSATIVE)] подробнее, но не находите ничего интересного...</i>")
result_combined = boxed_message(jointext(result, "<br>"))

else
Expand Down
4 changes: 2 additions & 2 deletions code/modules/surgery/bodyparts/_bodyparts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@
check_list += "\t [span_boldwarning("Ваша [declent_ru(NOMINATIVE)] страдает от: [LOWER_TEXT(wound.name)]!!!")]"

for(var/obj/item/embedded_thing in embedded_objects)
var/stuck_word = embedded_thing.is_embed_harmless() ? "stuck" : "embedded"
check_list += "\t <a href='byond://?src=[REF(examiner)];embedded_object=[REF(embedded_thing)];embedded_limb=[REF(src)]' class='warning'>There is \a [embedded_thing] [stuck_word] in your [name]!</a>"
var/stuck_word = embedded_thing.is_embed_harmless() ? "прилип" : "застрял"
check_list += "\t <a href='byond://?src=[REF(examiner)];embedded_object=[REF(embedded_thing)];embedded_limb=[REF(src)]' class='warning'>[capitalize(embedded_thing.declent_ru(NOMINATIVE))] [stuck_word] [stuck_word == "застрял" ? "в" : "к"] вашей [declent_ru(DATIVE)]!</a>"

/obj/item/bodypart/blob_act()
receive_damage(max_damage, wound_bonus = CANT_WOUND)
Expand Down
Loading