From: LegendaryGuard Date: Thu, 9 Jun 2022 17:09:23 +0000 (+0000) Subject: Merge branch 'drjaska/frozenarcfix' into 'master' X-Git-Tag: xonotic-v0.8.5~13 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=71eb8f743b4e5cb924087f07995a6ef3f2180861;hp=0a0e38fd8cf925664fd78e8744dddd18b0242b44;p=xonotic%2Fxonotic-data.pk3dir.git 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 897d0a59b..46114ef1a 100644 --- 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 49342c0b5..c5561b6aa 100644 --- 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 5e30e8ef0..8e9780338 100644 --- 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 , 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 028198e08..c900e81c1 100644 --- 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. , 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 a5140be5f..863475ad5 100644 --- 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 . , 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 917db7400..974495fff 100644 --- 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 022891a97..cff910cbb 100644 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 2e45a6786..d9bab8a8a 100644 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 73c5febaf..18b802347 100644 Binary files a/models/weapons/v_laser.md3 and b/models/weapons/v_laser.md3 differ