ss220club / Bandastation

SS220 TG repository
https://discord.gg/ss220
GNU Affero General Public License v3.0
30 stars 34 forks source link

Merge upstream 10.05.2024 #258

Closed Gaxeer closed 5 months ago

Gaxeer commented 5 months ago

About The Pull Request

Merge upstream

github-actions[bot] commented 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
github-actions[bot] commented 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