Merge remote-tracking branch 'origin/master' into morosophos/server-current4

diff --git a/.tx/merge-base b/.tx/merge-base
index 8a1b9e3914852fe572ceb0d97fd61153edf196db..d924d4334c37498374be7341e9e1b42d38a30a41 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 25 07:23:31 CET 2023
+Fri Jan 27 07:23:29 CET 2023

diff --git a/common.ru.po b/common.ru.po
index 94abad72e4a949e30ac655c5883e1b687d7fce8b..2cdc8902b507ad66822f1a08decf360c37e20b0f 100644 (file)
--- a/common.ru.po
+++ b/common.ru.po
@@ -26,7 +26,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-01-08 07:22+0100\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: Andrei Stepanov, 2014-2023\n"
+"Last-Translator: Артём Котлубай, 2022\n"
 "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ru/)\n"
 "Language: ru\n"
@@ -2513,7 +2513,7 @@ msgstr "^BG%s^BG вернул ^TC^TT^BG флаг"
 #: qcsrc/common/notifications/all.inc:552
 #, c-format
 msgid "^F2Throwing coin... Result: %s^F2!"
-msgstr "^F2Ð\91Ñ\80оÑ\81аем монеÑ\82кÑ\83â\80¦ РезÑ\83лÑ\8cÑ\82аÑ\82: %s^F2!"
+msgstr "^F2Ð\91Ñ\80оÑ\81аем монеÑ\82кÑ\83â\80¦ Ð\98Ñ\81Ñ\85од: %s^F2!"
 
 #: qcsrc/common/notifications/all.inc:262
 msgid "^BGYou don't have any fuel for the ^F1Jetpack"