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

Purge translate preparations #1108

Merged
merged 3 commits into from
Jan 31, 2025
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
- head-branch: 'merge-upstream'

':pencil: Перевод':
- base-branch: 'translate'
- head-branch: ['^translate', 'translate', '^translation', 'translation']

':wrench: Фикс':
- head-branch: ['^fix', 'fix']
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,16 @@ on:
push:
branches:
- master
- translate
- 'project/**'
- 'gh-readonly-queue/master/**'
- 'gh-readonly-queue/project/**'
pull_request:
branches:
- master
- translate
- 'project/**'
merge_group:
branches:
- master
- translate

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
83 changes: 0 additions & 83 deletions .github/workflows/detect_translate_conflicts.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/translate_branch_update.yml

This file was deleted.

6 changes: 3 additions & 3 deletions code/__DEFINES/anomaly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_MEDIUM_TIME (2 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "long range scanners. Expected location:"
#define ANOMALY_ANNOUNCE_MEDIUM_TEXT "сканерах дальнего действия. Предполагаемая локация:"

/**
* Chaotic but not harmful anomalies. Give the station a chance to find it on their own.
Expand All @@ -26,7 +26,7 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_HARMFUL_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "localized scanners. Detected location:"
#define ANOMALY_ANNOUNCE_HARMFUL_TEXT "локальных сканерах. Зафиксированная локация:"

/**
* Anomalies that can fuck you up. Give them a bit of warning.
Expand All @@ -37,4 +37,4 @@
///Time in seconds before anomaly is announced
#define ANOMALY_ANNOUNCE_DANGEROUS_TIME (30 EVENT_SECONDS)
///Let them know how far away the anomaly is
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "localized scanners. Detected location:"
#define ANOMALY_ANNOUNCE_DANGEROUS_TEXT "локальных сканерах. Зафиксированная локация:"
20 changes: 10 additions & 10 deletions code/__DEFINES/antagonists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@


// Heretic path defines.
#define PATH_START "Start Path"
#define PATH_SIDE "Side Path"
#define PATH_ASH "Ash Path"
#define PATH_RUST "Rust Path"
#define PATH_FLESH "Flesh Path"
#define PATH_VOID "Void Path"
#define PATH_BLADE "Blade Path"
#define PATH_COSMIC "Cosmic Path"
#define PATH_LOCK "Lock Path"
#define PATH_MOON "Moon Path"
#define PATH_START "Стартовый путь"
#define PATH_SIDE "Вторичный путь"
#define PATH_ASH "Путь пепла"
#define PATH_RUST "Путь ржавчины"
#define PATH_FLESH "Путь плоти"
#define PATH_VOID "Путь пустоты"
#define PATH_BLADE "Путь клинка"
#define PATH_COSMIC "Путь космоса"
#define PATH_LOCK "Путь замка"
#define PATH_MOON "Путь луны"

//Heretic knowledge tree defines
#define HKT_NEXT "next"
Expand Down
16 changes: 8 additions & 8 deletions code/__DEFINES/diseases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ DEFINE_BITFIELD(spread_flags, list(

//Severity Defines
/// Diseases that buff, heal, or at least do nothing at all
#define DISEASE_SEVERITY_POSITIVE "Positive"
#define DISEASE_SEVERITY_POSITIVE "Положительная"
/// Diseases that may have annoying effects, but nothing disruptive (sneezing)
#define DISEASE_SEVERITY_NONTHREAT "Harmless"
#define DISEASE_SEVERITY_NONTHREAT "Безопасная"
/// Diseases that can annoy in concrete ways (dizziness)
#define DISEASE_SEVERITY_MINOR "Minor"
#define DISEASE_SEVERITY_MINOR "Незначительная"
/// Diseases that can do minor harm, or severe annoyance (vomit)
#define DISEASE_SEVERITY_MEDIUM "Medium"
#define DISEASE_SEVERITY_MEDIUM "Средняя"
/// Diseases that can do significant harm, or severe disruption (brainrot)
#define DISEASE_SEVERITY_HARMFUL "Harmful"
#define DISEASE_SEVERITY_HARMFUL "Вредоносная"
/// Diseases that can kill or maim if left untreated (flesh eating, blindness)
#define DISEASE_SEVERITY_DANGEROUS "Dangerous"
#define DISEASE_SEVERITY_DANGEROUS "Опасная"
/// Diseases that can quickly kill an unprepared victim (fungal tb, gbs)
#define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD"
#define DISEASE_SEVERITY_BIOHAZARD "БИООПАСНОСТЬ"
/// Diseases that are uncurable (hms)
#define DISEASE_SEVERITY_UNCURABLE "Uncurable"
#define DISEASE_SEVERITY_UNCURABLE "Неизлечимая"

//Severity Guaranteed Cycles or how long before a disease can potentially self-cure
/// Positive diseases should not self-cure by themselves, but if they do, they cure fast
Expand Down
58 changes: 29 additions & 29 deletions code/__DEFINES/food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,29 +69,29 @@ DEFINE_BITFIELD(foodtypes, list(
"STONE", \
)

/// IC meaning (more or less) for food flags
/// IC meaning (more or less) for food flags // BANDASTATION EDIT - сверяйте с tgui\packages\tgui\interfaces\PersonalCrafting.tsx
#define FOOD_FLAGS_IC list( \
"Meat", \
"Vegetables", \
"Raw food", \
"Junk food", \
"Grain", \
"Fruits", \
"Dairy products", \
"Fried food", \
"Alcohol", \
"Sugary food", \
"Gross food", \
"Toxic food", \
"Pineapples", \
"Breakfast food", \
"Clothing", \
"Nuts", \
"Seafood", \
"Oranges", \
"Bugs", \
"Gore", \
"Rocks", \
"Мясное", \
"Овощи", \
"Сырое", \
"Фастфуд", \
"Зерновое", \
"Фрукты", \
"Молочное", \
"Жареное", \
"Алкоголь", \
"Сахарное", \
"Ужасное", \
"Токсичное", \
"Ананасы", \
"Завтраки", \
"Из одежды", \
"Орехи", \
"Морепродукты", \
"Апельсины", \
"Из жуков", \
"Месиво", \
"Каменное", \
)

#define DRINK_REVOLTING 1
Expand Down Expand Up @@ -119,13 +119,13 @@ DEFINE_BITFIELD(foodtypes, list(

/// Labels for food quality
GLOBAL_LIST_INIT(food_quality_description, list(
FOOD_QUALITY_NORMAL = "okay",
FOOD_QUALITY_NICE = "nice",
FOOD_QUALITY_GOOD = "good",
FOOD_QUALITY_VERYGOOD = "very good",
FOOD_QUALITY_FANTASTIC = "fantastic",
FOOD_QUALITY_AMAZING = "amazing",
FOOD_QUALITY_TOP = "godlike",
FOOD_QUALITY_NORMAL = "неплохая",
FOOD_QUALITY_NICE = "хорошая",
FOOD_QUALITY_GOOD = "вкусная",
FOOD_QUALITY_VERYGOOD = "очень вкусная",
FOOD_QUALITY_FANTASTIC = "фантастическая",
FOOD_QUALITY_AMAZING = "превосходная",
FOOD_QUALITY_TOP = "богоподобная",
))

/// Mood events for food quality
Expand Down
12 changes: 6 additions & 6 deletions code/__DEFINES/ghost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

//Ghost showing preferences:
/// The main player's ghost will display as a simple white ghost
#define GHOST_ACCS_NONE "Default sprites"
#define GHOST_ACCS_NONE "Стандартные спрайты"
/// The main player's ghost will display as a transparent mob
#define GHOST_ACCS_DIR "Only directional sprites"
#define GHOST_ACCS_DIR "Только направленные спрайты"
/// The main player's ghost will display as a transparent mob with clothing
#define GHOST_ACCS_FULL "Full accessories"
#define GHOST_ACCS_FULL "Полностью с аксессуарами"

/// The default ghost display selection for the main player
#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL

/// The other players ghosts will display as a simple white ghost
#define GHOST_OTHERS_SIMPLE "White ghosts"
#define GHOST_OTHERS_SIMPLE "Белые призраки"
/// The other players ghosts will display as transparent mobs
#define GHOST_OTHERS_DEFAULT_SPRITE "Default sprites"
#define GHOST_OTHERS_DEFAULT_SPRITE "Стандартные спрайты"
/// The other players ghosts will display as transparent mobs with clothing
#define GHOST_OTHERS_THEIR_SETTING "Their sprites"
#define GHOST_OTHERS_THEIR_SETTING "Их спрайты"

/// The default ghost display selection when viewing other players
#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING
Expand Down
16 changes: 8 additions & 8 deletions code/__DEFINES/inventory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,18 @@ GLOBAL_LIST_INIT(tool_items, list(
))

/// String for items placed into the left pocket.
#define LOCATION_LPOCKET "in your left pocket"
#define LOCATION_LPOCKET "в левом кармане"
/// String for items placed into the right pocket
#define LOCATION_RPOCKET "in your right pocket"
#define LOCATION_RPOCKET "в правом кармане"
/// String for items placed into the backpack.
#define LOCATION_BACKPACK "in your backpack"
#define LOCATION_BACKPACK "в сумке"
/// String for items placed into the hands.
#define LOCATION_HANDS "in your hands"
#define LOCATION_HANDS "в руках"
/// String for items placed in the glove slot.
#define LOCATION_GLOVES "on your hands"
#define LOCATION_GLOVES "на руках"
/// String for items placed in the eye/glasses slot.
#define LOCATION_EYES "covering your eyes"
#define LOCATION_EYES "на глазах"
/// String for items placed on the head/hat slot.
#define LOCATION_HEAD "on your head"
#define LOCATION_HEAD "на голове"
/// String for items placed in the neck slot.
#define LOCATION_NECK "around your neck"
#define LOCATION_NECK "на шее"
16 changes: 8 additions & 8 deletions code/__DEFINES/medical.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/// Physical statuses
#define PHYSICAL_ACTIVE "Active"
#define PHYSICAL_DEBILITATED "Debilitated"
#define PHYSICAL_UNCONSCIOUS "Unconscious"
#define PHYSICAL_DECEASED "Deceased"
#define PHYSICAL_ACTIVE "Активен"
#define PHYSICAL_DEBILITATED "Болезнь"
#define PHYSICAL_UNCONSCIOUS "Бессознательность"
#define PHYSICAL_DECEASED "Мертв"

/// List of available physical statuses
#define PHYSICAL_STATUSES list(\
Expand All @@ -13,10 +13,10 @@
)

/// Mental statuses
#define MENTAL_STABLE "Stable"
#define MENTAL_WATCH "Watch"
#define MENTAL_UNSTABLE "Unstable"
#define MENTAL_INSANE "Insane"
#define MENTAL_STABLE "Стабильно"
#define MENTAL_WATCH "Наблюдение"
#define MENTAL_UNSTABLE "Нестабильно"
#define MENTAL_INSANE "Безумство"

/// List of available mental statuses
#define MENTAL_STATUSES list(\
Expand Down
Loading
Loading