-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstream1107
- Loading branch information
Showing
26 changed files
with
95 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
cmd-colornetwork-desc = Paints the atmos devices in the specified color | ||
cmd-colornetwork-desc = Окрашивает атмос-устройства в заданный цвет | ||
cmd-colornetwork-help = colornetwork <uid> Pipe <HexColor> | ||
cmd-colornetwork-no-access = You are not currently able to use mapping commands. | ||
cmd-colornetwork-no-access = В настоящее время вы не можете использовать команды маппинга. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
cmd-zoom-desc = Sets the zoom of the main eye. | ||
cmd-zoom-help = zoom ( <scale> | <X-scale> <Y-scale> ) | ||
cmd-zoom-desc = Sets the zoom of the main eye. Optionally also changes the eye's PVS range. | ||
cmd-zoom-help = zoom ( <scale> | <X-scale> <Y-scale> [bool]) | ||
cmd-zoom-error = scale has to be greater than 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/medical/components/healing-component.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
medical-item-finished-using = Вы закончили лечить при помощи { $item } | ||
medical-item-cant-use = Нет повреждений, которые можно вылечить при помощи { $item } | ||
medical-item-stop-bleeding = Кровотечение было остановлено. | ||
medical-item-popup-target = { CAPITALIZE(THE($user)) } is trying to heal you with the { $item }! | ||
medical-item-popup-target = { CAPITALIZE($user) } пытается лечить вас при помощи { $item }! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 32 additions & 32 deletions
64
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_dress.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,32 @@ | ||
ent-ClothingUniformJumpskirtBlackElegantDress = black elegant dress | ||
.desc = Elegant dress with a beautiful bow. | ||
ent-ClothingUniformJumpskirtRedElegantDress = red elegant dress | ||
.desc = Elegant dress with a beautiful bow. | ||
ent-ClothingUniformJumpskirtGreenElegantDress = green elegant dress | ||
.desc = Elegant dress with a beautiful bow. | ||
ent-ClothingUniformJumpskirtBlueElegantDress = blue elegant dress | ||
.desc = Elegant dress with a beautiful bow. | ||
ent-ClothingUniformJumpskirtPurpleElegantDress = purple elegant dress | ||
.desc = Elegant dress with a beautiful bow. | ||
ent-ClothingUniformJumpskirtCyanStripedDress = cyan striped dress | ||
.desc = Cute striped dress. | ||
ent-ClothingUniformJumpskirtRedStripedDress = red striped dress | ||
.desc = Cute striped dress. | ||
ent-ClothingUniformJumpskirtGreenStripedDress = green striped dress | ||
.desc = Cute striped dress. | ||
ent-ClothingUniformJumpskirtPinkStripedDress = pink striped dress | ||
.desc = Cute striped dress. | ||
ent-ClothingUniformJumpskirtOrangeStripedDress = orange striped dress | ||
.desc = Cute striped dress. | ||
ent-ClothingUniformJumpskirtPurpleTurtleneckDress = purple turtleneck dress | ||
.desc = Turtleneck dress with a unique design. | ||
ent-ClothingUniformJumpskirtRedTurtleneckDress = red turtleneck dress | ||
.desc = Turtleneck dress with a unique design. | ||
ent-ClothingUniformJumpskirtGreenTurtleneckDress = green turtleneck dress | ||
.desc = Turtleneck dress with a unique design. | ||
ent-ClothingUniformJumpskirtBlueTurtleneckDress = blue turtleneck dress | ||
.desc = Turtleneck dress with a unique design. | ||
ent-ClothingUniformJumpskirtYellowTurtleneckDress = yellow turtleneck dress | ||
.desc = Turtleneck dress with a unique design. | ||
ent-ClothingUniformJumpskirtYellowOldDress = yellow old dress | ||
.desc = Classic western dress. | ||
ent-ClothingUniformJumpskirtBlackElegantDress = элегантное чёрное платье | ||
.desc = Элегантное платье с красивым бантом. | ||
ent-ClothingUniformJumpskirtRedElegantDress = элегантное красное платье | ||
.desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } | ||
ent-ClothingUniformJumpskirtGreenElegantDress = элегантное зелёное платье | ||
.desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } | ||
ent-ClothingUniformJumpskirtBlueElegantDress = элегантное синее платье | ||
.desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } | ||
ent-ClothingUniformJumpskirtPurpleElegantDress = элегантное фиолетовое платье | ||
.desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } | ||
ent-ClothingUniformJumpskirtCyanStripedDress = полосатое голубое платье | ||
.desc = Милое полосатое платье. | ||
ent-ClothingUniformJumpskirtRedStripedDress = полосатое красное платье | ||
.desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } | ||
ent-ClothingUniformJumpskirtGreenStripedDress = полосатое зелёное платье | ||
.desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } | ||
ent-ClothingUniformJumpskirtPinkStripedDress = полосатое розовое платье | ||
.desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } | ||
ent-ClothingUniformJumpskirtOrangeStripedDress = полосатое оранжевое платье | ||
.desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } | ||
ent-ClothingUniformJumpskirtPurpleTurtleneckDress = фиолетовое платье-водолазка | ||
.desc = Платье-водолазка с уникальным дизайном. | ||
ent-ClothingUniformJumpskirtRedTurtleneckDress = красное платье-водолазка | ||
.desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } | ||
ent-ClothingUniformJumpskirtGreenTurtleneckDress = зелёное платье-водолазка | ||
.desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } | ||
ent-ClothingUniformJumpskirtBlueTurtleneckDress = синее платье-водолазка | ||
.desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } | ||
ent-ClothingUniformJumpskirtYellowTurtleneckDress = жёлтое платье-водолазка | ||
.desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } | ||
ent-ClothingUniformJumpskirtYellowOldDress = старое жёлтое платье | ||
.desc = Классическое платье в стиле вестерн. |
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/effects/shuttle.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
ent-FtlVisualizerEntity = { "" } | ||
.desc = Visualizer for shuttles arriving. You shouldn't see this! | ||
.desc = Визуализатор прибывающих шаттлов. Вы не должны этого видеть! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.