Closed Gaxeer closed 5 months ago
This pr causes following conflicts on translate branch:
++<<<<<<< HEAD
+ span_warning("You screw up, bruising [target_human]'s chest!"),
+ span_warning("[user] screws up, brusing [target_human]'s chest!"),
+ span_warning("[user] screws up!"),
++=======
+ span_warning("Вы ошибаетесь, оставив ушиб на груди [target_human]!"),
+ span_warning("[user] ошибается, оставив ушиб на груди [target_human]!"),
+ span_warning("[user] ошибается!"),
++>>>>>>> origin/translate
This pr causes following conflicts on translate branch:
++<<<<<<< HEAD
+ span_warning("You screw up, bruising [target_human]'s chest!"),
+ span_warning("[user] screws up, brusing [target_human]'s chest!"),
+ span_warning("[user] screws up!"),
++=======
+ span_warning("Вы ошибаетесь, оставив ушиб на груди [target_human]!"),
+ span_warning("[user] ошибается, оставив ушиб на груди [target_human]!"),
+ span_warning("[user] ошибается!"),
++>>>>>>> origin/translate
About The Pull Request
Merge upstream