Merge branch 'drjaska/frozenarcfix' into 'master'

Add a frozen status check to arc

See merge request xonotic/xonotic-data.pk3dir!1029

diff --git a/.tx/merge-base b/.tx/merge-base
index 897d0a59b62f948e587ec01ebc4511c0b94d6c20..46114ef1a2be578865d2b2c29b929695ab86f8c6 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jun  6 07:23:17 CEST 2022
+Wed Jun  8 07:23:14 CEST 2022

diff --git a/common.es.po b/common.es.po
index 49342c0b584ce3a099dd73e06da79a425e97f3df..c5561b6aa436be40a10d18d66352d57d54c40e14 100644 (file)
--- a/common.es.po
+++ b/common.es.po
@@ -33,7 +33,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-06-05 07:22+0200\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: LegendGuard, 2020-2022\n"
+"Last-Translator: Yllelder, 2016\n"
 "Language-Team: Spanish (http://www.transifex.com/team-xonotic/xonotic/"
 "language/es/)\n"
 "Language: es\n"

diff --git a/common.fr.po b/common.fr.po
index 5e30e8ef0469c00235582d72d0d4e06b444ecc9c..8e978033893ba3dd1e17e761b356ac12cf0d8d00 100644 (file)
--- a/common.fr.po
+++ b/common.fr.po
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-06-05 07:22+0200\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>, 2013-2022\n"
+"Last-Translator: Hugo Locurcio, 2013-2014\n"
 "Language-Team: French (http://www.transifex.com/team-xonotic/xonotic/"
 "language/fr/)\n"
 "Language: fr\n"

diff --git a/common.ja_JP.po b/common.ja_JP.po
index 028198e08da5d52a0980050bd29b9057b2adf3f4..c900e81c1e25d05febab831bda8d47405fd474f4 100644 (file)
--- a/common.ja_JP.po
+++ b/common.ja_JP.po
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-06-05 07:22+0200\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: LegendGuard, 2020-2022\n"
+"Last-Translator: RYU N. <ryusho2523@yahoo.co.jp>, 2021\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/ja_JP/)\n"
 "Language: ja_JP\n"

diff --git a/common.pt_BR.po b/common.pt_BR.po
index a5140be5f1c21a2f7d641e9e0ae949348e3ed048..863475ad541f2894c8d33443d16095b8a475b110 100644 (file)
--- a/common.pt_BR.po
+++ b/common.pt_BR.po
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-06-05 07:22+0200\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: yy0zz, 2021-2022\n"
+"Last-Translator: zerowhy . <anymailz@tutanota.com>, 2021\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -3477,8 +3477,7 @@ msgstr ""
 #: qcsrc/common/notifications/all.inc:469
 #, c-format
 msgid "^BG%s^K1 hurt their own ears with the @!#%%'n Klein Bottle%s%s"
-msgstr ""
-"^BG%s^K1 machucaram seus próprios ouvidos com a @!#%%'n Klein Bottle%s%s"
+msgstr "^BG%s^K1 feriu seus próprios ouvidos com a @!#%%'n Klein Bottle%s%s"
 
 #: qcsrc/common/notifications/all.inc:470
 #, c-format
@@ -3530,14 +3529,15 @@ msgstr "^BG%s^K1 se explodiu com o seu próprio Mortar%s%s"
 #: qcsrc/common/notifications/all.inc:479
 #, c-format
 msgid "^BG%s%s^K1 was sniped by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"
-msgstr "^BG%s^K1%s%s atingiu ^BG%s%s^K1 com sua Metralhadora Pesada Suprema"
+msgstr ""
+"^BG%s%s^K1 foi atingido pela Metralhadora Pesada Suprema de ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:480
 #, c-format
 msgid ""
 "^BG%s%s^K1 was torn to bits by ^BG%s^K1's Overkill Heavy Machine Gun%s%s"
 msgstr ""
-"A ^BG%sMetralhadora Pesada Suprema de ^K1%s%s deixou ^BG%s%s^K1 em pedacinhos"
+"^BG%s%s^K1 despedaçou-se pela Metralhadora Pesada Suprema de ^BG%s^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:481
 #, c-format

diff --git a/common.ru.po b/common.ru.po
index 917db7400556b5d24b0121f3371bb230911cf526..974495fffb5f13ebc8dc3b302e6f8d65e997fff1 100644 (file)
--- a/common.ru.po
+++ b/common.ru.po
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-06-05 07:22+0200\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: Andrei Stepanov, 2014-2022\n"
+"Last-Translator: Simple88, 2016\n"
 "Language-Team: Russian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ru/)\n"
 "Language: ru\n"

diff --git a/models/weapons/g_electro.md3 b/models/weapons/g_electro.md3
index 022891a97e4ce6ac5724f51eb3392ed490b47993..cff910cbb427c17577ef9b456962d983abadae12 100644 (file)
Binary files a/models/weapons/g_electro.md3 and b/models/weapons/g_electro.md3 differ

diff --git a/models/weapons/v_electro.md3 b/models/weapons/v_electro.md3
index 2e45a678665fe15200078d3533e2b1bf6d8783b2..d9bab8a8a0dd9a42503bc5748916ab604e0e2c93 100644 (file)
Binary files a/models/weapons/v_electro.md3 and b/models/weapons/v_electro.md3 differ

diff --git a/models/weapons/v_laser.md3 b/models/weapons/v_laser.md3
index 73c5febaf1617b9caeebcf1a6fab4a058ce12384..18b802347bd3139c6af7f1148d7b9febfd73aa62 100644 (file)
Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ