Merge branch 'drjaska/mayhem' into 'master'

Mayhem and Team Mayhem gamemodes

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1d33361165959bece4b695161ddfecc42d24ef70..94e777b3340a29ac3373ef6bd52fc539e914974e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun 19 Feb 2023 07:23:02 AM CET
+Sun 05 Mar 2023 07:22:58 AM CET

diff --git a/common.fr.po b/common.fr.po
index 1e9947385eb5a9bcdc3057bec8b1469cc5f30b18..e55bce5ae3ff72d5f2ab57b797efbfe2e7b574a3 100644 (file)
--- a/common.fr.po
+++ b/common.fr.po
@@ -3,11 +3,11 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# Gwlanbzh <aodren.legloanec@gmail.com>, 2020
+# Aodren Le Gloanec <aodren.legloanec@gmail.com>, 2020
 # Calinou, 2013-2014
 # Calinou <calinou9999@gmail.com>, 2012
 # Hugo Locurcio, 2014
-# Gwlanbzh <aodren.legloanec@gmail.com>, 2020
+# Aodren Le Gloanec <aodren.legloanec@gmail.com>, 2020
 # Hugo Locurcio, 2013-2014
 # Maxime Paradis <taximus.micro@gmail.com>, 2011
 # Mirio <opivy@hotmail.de>, 2017

diff --git a/common.la.po b/common.la.po
index 4e71212e1f533268f6f905cdd48c84b44b3eeb6e..fe1a8c4b515c440753faa02d460c3e45f7a26d73 100644 (file)
--- a/common.la.po
+++ b/common.la.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-02-03 12:41+0100\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: oblector o, 2022\n"
+"Last-Translator: oblector o, 2022-2023\n"
 "Language-Team: Latin (http://www.transifex.com/team-xonotic/xonotic/language/"
 "la/)\n"
 "Language: la\n"
@@ -238,7 +238,7 @@ msgstr "Ludens %dus"
 
 #: qcsrc/client/hud/panel/quickmenu.qc:202
 msgid "Standard quick menu"
-msgstr ""
+msgstr "Index celer ordinarius"
 
 #: qcsrc/client/hud/panel/quickmenu.qc:634
 #: qcsrc/client/hud/panel/quickmenu.qc:636
@@ -1127,7 +1127,7 @@ msgstr "Prorogatio %da"
 
 #: qcsrc/client/hud/panel/vote.qc:30
 msgid "^1You must answer before entering hud configure mode"
-msgstr ""
+msgstr "^1Respondere necesse est antequam notas superpositas mutes"
 
 #: qcsrc/client/hud/panel/vote.qc:33
 msgid "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
@@ -1143,7 +1143,7 @@ msgstr "Moderatra nomen tuum meminisse et nuntiare sinis?"
 
 #: qcsrc/client/hud/panel/vote.qc:125
 msgid "^1Configure the HUD"
-msgstr ""
+msgstr "^1Notas Superpositas Mutare"
 
 #: qcsrc/client/hud/panel/vote.qc:129 qcsrc/menu/xonotic/dialog_firstrun.qc:87
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18
@@ -1305,7 +1305,7 @@ msgstr "%d ludentes aut plures"
 
 #: qcsrc/client/main.qc:1466
 msgid "Active modifications:"
-msgstr ""
+msgstr "Mutationes praesentes:"
 
 #: qcsrc/client/main.qc:1469
 msgid "Special gameplay tips:"
@@ -1318,7 +1318,7 @@ msgstr "Moderatri nuntium"
 #: qcsrc/client/main.qc:1570
 #, c-format
 msgid "%s (not bound)"
-msgstr ""
+msgstr "%s (sine clavi)"
 
 #: qcsrc/client/mapvoting.qc:72
 msgid " (1 vote)"
@@ -1407,12 +1407,12 @@ msgstr "Omnes hostes interficite ut tempore vincetis"
 #: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:40
 #: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:43
 msgid "Round limit:"
-msgstr ""
+msgstr "Temporum numerus terminalis:"
 
 #: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:40
 #: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:43
 msgid "The amount of rounds won needed before the match will end"
-msgstr ""
+msgstr "Quot temporibus vincere necesse est ut ludus finiatur"
 
 #: qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc:202
 msgid "Capture time rankings"
@@ -1432,11 +1432,11 @@ msgstr ""
 
 #: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:30
 msgid "Capture limit:"
-msgstr ""
+msgstr "Captuum numerus terminalis:"
 
 #: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:30
 msgid "The amount of captures needed before the match will end"
-msgstr ""
+msgstr "Quotiens vexillum capere necesse est ut ludus finiatur"
 
 #: qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc:41
 #: qcsrc/common/gamemodes/gamemode/race/cl_race.qc:178
@@ -1595,20 +1595,20 @@ msgstr ""
 
 #: qcsrc/common/items/item/ammo.qh:92
 msgid "Bullets"
-msgstr ""
+msgstr "Glandes"
 
 #: qcsrc/common/items/item/ammo.qh:124
 msgid "Rockets"
-msgstr ""
+msgstr "Missilia Ignea"
 
 #: qcsrc/common/items/item/ammo.qh:156
 msgid "Cells"
-msgstr ""
+msgstr "Cellulae"
 
 #: qcsrc/common/items/item/ammo.qh:188
 #: qcsrc/common/turrets/turret/plasma_weapon.qh:7
 msgid "Plasma"
-msgstr ""
+msgstr "Plasma"
 
 #: qcsrc/common/items/item/armor.qh:42
 msgid "Small armor"
@@ -4634,100 +4634,100 @@ msgstr "granatam iacere"
 #: qcsrc/common/notifications/all.qh:466
 #, c-format
 msgid "%s^K1 made a TRIPLE FRAG! %s^BG"
-msgstr ""
+msgstr "%s^K1 MORTEM TRIPLICEM attulit! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:466
 #, c-format
 msgid "%s^K1 made a TRIPLE SCORE! %s^BG"
-msgstr ""
+msgstr "%s^K1 mortium rationi TER ADDIDIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:466
 msgid "TRIPLE FRAG! "
-msgstr ""
+msgstr "MORS TRIPLEX! "
 
 #: qcsrc/common/notifications/all.qh:467
 #, c-format
 msgid "%s^K1 made FIVE SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 QUINQUE MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:467
 #, c-format
 msgid "%s^K1 unlocked RAGE! %s^BG"
-msgstr ""
+msgstr "%s^K1 IRAM concepit! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:467
 msgid "RAGE! "
-msgstr ""
+msgstr "IRA! "
 
 #: qcsrc/common/notifications/all.qh:468
 #, c-format
 msgid "%s^K1 made TEN SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 DECEM MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:468
 #, c-format
 msgid "%s^K1 started a MASSACRE! %s^BG"
-msgstr ""
+msgstr "%s^K1 TRUCIDATIONEM coepit! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:468
 msgid "MASSACRE! "
-msgstr ""
+msgstr "TRUCIDATIO! "
 
 #: qcsrc/common/notifications/all.qh:469
 #, c-format
 msgid "%s^K1 executed MAYHEM! %s^BG"
-msgstr ""
+msgstr "%s^K1 MUTILATIONEM fecit! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:469
 #, c-format
 msgid "%s^K1 made FIFTEEN SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 QUINDECIM MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:469
 msgid "MAYHEM! "
-msgstr ""
+msgstr "MUTILATIO! "
 
 #: qcsrc/common/notifications/all.qh:470
 #, c-format
 msgid "%s^K1 is a BERSERKER! %s^BG"
-msgstr ""
+msgstr "%s^K1 FURIOSUS est! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:470
 #, c-format
 msgid "%s^K1 made TWENTY SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 VIGINTI MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:470
 msgid "BERSERKER! "
-msgstr ""
+msgstr "FURIOSUS! "
 
 #: qcsrc/common/notifications/all.qh:471
 #, c-format
 msgid "%s^K1 inflicts CARNAGE! %s^BG"
-msgstr ""
+msgstr "%s^K1 CARNIFEX est! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:471
 #, c-format
 msgid "%s^K1 made TWENTY FIVE SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 VIGINTI QUINQUE MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:471
 msgid "CARNAGE! "
-msgstr ""
+msgstr "CARNIFEX! "
 
 #: qcsrc/common/notifications/all.qh:472
 #, c-format
 msgid "%s^K1 made THIRTY SCORES IN A ROW! %s^BG"
-msgstr ""
+msgstr "%s^K1 TRIGINTA MORTES CONTINUAVIT! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:472
 #, c-format
 msgid "%s^K1 unleashes ARMAGEDDON! %s^BG"
-msgstr ""
+msgstr "%s^K1 HARMAGEDDON coepit! %s^BG"
 
 #: qcsrc/common/notifications/all.qh:472
 msgid "ARMAGEDDON! "
-msgstr ""
+msgstr "HARMAGEDDON! "
 
 #: qcsrc/common/notifications/all.qh:479
 #, c-format
@@ -6983,11 +6983,11 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer.qc:15
 msgid "Find servers to play on"
-msgstr ""
+msgstr "Moderatra quibus ludas quaerere"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer.qc:17
 msgid "Host your own game"
-msgstr ""
+msgstr "Ludi tui ipsius hospes esse"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer.qc:18
 msgid "Media"
@@ -7217,53 +7217,60 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:118
 msgid "Gameplay mutators:"
-msgstr ""
+msgstr "Ludi mutationes:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:122
 msgid ""
 "Enable dodging (quick acceleration in a given direction). Double-tap a "
 "directional key to dodge"
 msgstr ""
+"Vitare (statim ire quorsum velit) sinere. Clavem directionalem bis preme ut "
+"vites"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:126
 msgid "An explosion occurs when two players collide"
-msgstr ""
+msgstr "Fit eruptio cum alter ludens alterum tangit"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:130
 msgid "All players are almost invisible"
-msgstr ""
+msgstr "Omnes ludentes vix videntur"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:134
 msgid ""
 "Enable buff pickups (random bonuses like Medic, Invisible, etc.) on the maps "
 "that support it"
 msgstr ""
+"Firmamina (dona fortuita, e.g. Medicus, Invisibilitas etc.) apparent in "
+"harenis quae ea contineant"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:139
 msgid "Only possible to inflict damage on your enemy while they're airborne"
-msgstr ""
+msgstr "Quisque inimicus non vulneratur cum in solo stat"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:143
 msgid "Damage done to your enemy gets added to your own health"
-msgstr ""
+msgstr "Vulnus qui inimico infers, sanitati tuae addetur"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:148
 msgid ""
 "Amount of health below which players start bleeding out (health rots and "
 "they can't jump)"
 msgstr ""
+"Quanta sanitas quae, quisque ludens ea egens sanguinem mittet (sanitas "
+"putrescet neque salire poterit)"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:157
 msgid "Make things fall to the ground slower (percentage of normal gravity)"
-msgstr ""
+msgstr "Res tardius in solo cadunt (gravitatis communis fractio)"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:166
 msgid "Weapon & item mutators:"
-msgstr ""
+msgstr "Armorum & utilium mutationes:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:170
 msgid "Players spawn with the grappling hook. Press the 'hook' key to use it"
 msgstr ""
+"Ludentes cum unco scandendo nascuntur. Clavem 'uncum' preme ut eo utaris"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:174
 msgid ""
@@ -7276,6 +7283,8 @@ msgid ""
 "Projectiles can't be destroyed. However, you can still explode Electro orbs "
 "with the Electro primary fire"
 msgstr ""
+"Missilia missilia delere non possunt, nisi Electri orbes, qui Electri "
+"emissione primaria delentur"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:183
 msgid ""
@@ -7289,44 +7298,49 @@ msgid ""
 "delay). This allows players to fire and detonate a Devastator rocket while "
 "in the air for a strong mid-air boost even while moving fast"
 msgstr ""
+"Devastatri missilia ignea ab utente rumpi possunt statim (ne brevis mora "
+"quidem est). Itaque ludentes Devastatri missile emittere rumpereque possunt "
+"dum solo distant, ut eruptione iaciantur et celerius eant"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:193
 msgid "Players will drop all weapons they possessed when they are killed"
-msgstr ""
+msgstr "Ludentes omnia arma tenta demittent cum occiduntur"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:198
 msgid "Weapons stay after they are picked up"
-msgstr ""
+msgstr "Arma manent postquam capta sunt"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:203
 msgid "Regular (no arena)"
-msgstr ""
+msgstr "Communis (non armorum harena)"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:204
 msgid ""
 "Players will be given a set of weapons at spawn as well as unlimited ammo, "
 "without weapon pickups"
 msgstr ""
+"Ludentes cum nascentur quaedam arma habebunt, cum missilibus ad infinitum, "
+"sine aliis armis colligendis"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:206
 msgid "Weapon arenas:"
-msgstr ""
+msgstr "Armorum harenae:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:209
 msgid "Custom weapons"
-msgstr ""
+msgstr "Arma quae velis"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:231
 msgid "Most weapons"
-msgstr ""
+msgstr "Plurima arma"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:235
 msgid "All weapons"
-msgstr ""
+msgstr "Omnia arma"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:238
 msgid "Special arenas:"
-msgstr ""
+msgstr "Harenae insignes:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:242
 msgid ""
@@ -7335,6 +7349,10 @@ msgid ""
 "seconds to find some or if they fail to do so, face death. The secondary "
 "fire mode does not inflict any damage but is good for doing trickjumps."
 msgstr ""
+"Quisque ludens una arma tenebit, quibus inimici statim per singulas "
+"emissiones occiduntur. Si ludens missilibus exhauriet, in 10 secunda plura "
+"missilia invenire necesse erit, ne morietur. Ludens emissione secundaria non "
+"vulnerat tamen, atque per eam perniciter salire potest."
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:247
 msgid ""
@@ -7342,18 +7360,21 @@ msgid ""
 "weapon. After some time, a countdown will start, after which everyone will "
 "switch to another weapon."
 msgstr ""
+"Xonoticus sine utilibus - non sunt utilia colligenda, sed ludentes aequa "
+"arma habent. Post aliquod tempus, numeratio regredientis fiet, et postea pro "
+"eis armis alia arma aequa commutabuntur."
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:251
 msgid "with blaster"
-msgstr ""
+msgstr "cum flatro"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:252
 msgid "Always carry the blaster as an additional weapon in Nix"
-msgstr ""
+msgstr "Praeter altera arma, flatrum semper portare in Nix"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh:9
 msgid "Mutators"
-msgstr ""
+msgstr "Mutationes"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join.qc:32
 msgid "SRVS^Categories"

diff --git a/common.pt_BR.po b/common.pt_BR.po
index 6b3b8a808166ff1b496a1623b996e6ec489e3ca4..299c245ddd978feacad82bb2b690b809f51e0d88 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: 2023-02-03 12:41+0100\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: zerowhy . <anymailz@tutanota.com>, 2021\n"
+"Last-Translator: yy0zz, 2021-2023\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -2564,8 +2564,7 @@ msgstr "^BG%s%s^K1 foi morto pelo bônus de ^BG%s^K1 de ^BG%s^K1 ^K1%s%s"
 #: qcsrc/common/notifications/all.inc:272
 #, c-format
 msgid "^BG%s%s^K1 was scored against by ^BG%s^K1's ^BG%s^K1 buff ^K1%s%s"
-msgstr ""
-"^BG%s%s^K1 foi pontuado contra pelo bônus de ^BG%s^K1 de ^BG%s^K1 ^K1%s%s"
+msgstr "^BG%s^K1Contra ^BG%s^K1 o bônus de ^BG%s^K1, ^BG%s^K1, pontuou ^K1%s%s"
 
 #: qcsrc/common/notifications/all.inc:273
 #, c-format
@@ -3320,12 +3319,12 @@ msgstr "^BG%s^BG abandonou a corrida"
 #: qcsrc/common/notifications/all.inc:429
 #, c-format
 msgid "^BG%s^BG couldn't break their %s%s^BG place record of %s%s %s"
-msgstr "^BG%s^BG não puderam quebrar o recorde de lugar %s%s^BG de %s%s %s"
+msgstr "^BG%s^BG não pôde quebrar o recorde de lugar %s%s^BG de %s%s %s"
 
 #: qcsrc/common/notifications/all.inc:430
 #, c-format
 msgid "^BG%s^BG couldn't break the %s%s^BG place record of %s%s %s"
-msgstr "^BG%s^BG não pode quebrar o recorde de lugar %s%s^BG de %s%s %s"
+msgstr "^BG%s^BG não pôde quebrar o recorde de lugar %s%s^BG de %s%s %s"
 
 #: qcsrc/common/notifications/all.inc:431
 #, c-format
@@ -3342,7 +3341,7 @@ msgstr ""
 #: qcsrc/common/notifications/all.inc:433
 #, c-format
 msgid "^BG%s^BG improved their %s%s^BG place record with %s%s %s"
-msgstr "^BG%s^BG melhoraram seus %s%s^BG com %s%s %s"
+msgstr "^BG%s^BG melhorou seu recorde de lugar %s%s^BG com %s%s %s"
 
 #: qcsrc/common/notifications/all.inc:434
 #, c-format
@@ -4014,7 +4013,7 @@ msgstr "^K1%sVocê foi executado por ^BG%s"
 #: qcsrc/common/notifications/all.inc:614
 #, c-format
 msgid "^K1%sYou were scored against by ^BG%s"
-msgstr "^K1%sVocê foi pontuado contra por ^BG%s"
+msgstr "^K1%sContra você ^BG%s^K1 pontuou"
 
 #: qcsrc/common/notifications/all.inc:602
 #, c-format
@@ -4044,7 +4043,7 @@ msgstr "^K1%sVocê executou ^BG%s enquanto digitava"
 #: qcsrc/common/notifications/all.inc:621
 #, c-format
 msgid "^K1%sYou scored against ^BG%s^K1 while they were typing"
-msgstr "^K1%sVocê pontuou contra ^BG%s^K1 enquanto estavam digitando"
+msgstr "^K1%sVocê pontuou contra ^BG%s^K1 enquanto este digitava"
 
 #: qcsrc/common/notifications/all.inc:622
 #, c-format
@@ -4054,7 +4053,7 @@ msgstr "^K1%sVocê foi executado enquanto digitava por ^BG%s"
 #: qcsrc/common/notifications/all.inc:623
 #, c-format
 msgid "^K1%sYou were scored against by ^BG%s^K1 while typing"
-msgstr "^K1%sVocê foi pontuado contra enquanto digitava por ^BG%s^K1"
+msgstr "^K1%sContra você enquanto digitava ^BG%s^K1 pontuou"
 
 #: qcsrc/common/notifications/all.inc:629
 #, c-format

diff --git a/common.ru.po b/common.ru.po
index 9687659207dba98126b3641190eb8de99bdfcccd..1088b2cf5fe78563cb2c0a7e45eb3aa6d4a97665 100644 (file)
--- a/common.ru.po
+++ b/common.ru.po
@@ -182,7 +182,7 @@ msgstr "^2Идёт ^1разминка^2!"
 
 #: qcsrc/client/hud/panel/infomessages.qc:159
 msgid "^31^2 more player is needed for the match to start."
-msgstr "^3Требуется ещё 1^2 игрок для старта матча."
+msgstr "^3Требуется ещё 1^2 игрок для начала матча."
 
 #: qcsrc/client/hud/panel/infomessages.qc:161
 #, c-format
@@ -7132,7 +7132,7 @@ msgstr "%d минут"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:85
 msgid "TIMLIM^Default"
-msgstr "СÑ\82андаÑ\80Ñ\82но"
+msgstr "Ð\9fо Ñ\83молÑ\87аниÑ\8e"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:86
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:171
@@ -7253,11 +7253,11 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:190
 msgid "Add shown"
-msgstr "Ð\94обавить показанные"
+msgstr "Ð\92Ñ\8bбÑ\80ать показанные"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:191
 msgid "Add the maps shown in the list to your selection"
-msgstr "Ð\94обавить арены, показываемые в вашем списке"
+msgstr "Ð\92Ñ\8bбÑ\80ать арены, показываемые в вашем списке"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:194
 msgid "Remove shown"
@@ -7269,11 +7269,11 @@ msgstr "Удалить все арены, показываемые в вашем
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:200
 msgid "Add all"
-msgstr "Ð\94обавить все"
+msgstr "Ð\92Ñ\8bбÑ\80ать все"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:201
 msgid "Add every available map to your selection"
-msgstr "Ð\94обавиÑ\82Ñ\8c каждÑ\83Ñ\8e доÑ\81Ñ\82Ñ\83пнÑ\83Ñ\8e аÑ\80енÑ\83 к ваÑ\88 вÑ\8bбоÑ\80"
+msgstr "Ð\92Ñ\8bбÑ\80аÑ\82Ñ\8c каждÑ\83Ñ\8e доÑ\81Ñ\82Ñ\83пнÑ\83Ñ\8e аÑ\80енÑ\83"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:204
 msgid "Remove all"
@@ -8673,7 +8673,7 @@ msgstr "Отображать состояние оружия в кольце"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:93
 msgid "Enable center crosshair dot"
-msgstr "ТоÑ\87ка в Ñ\86енÑ\82Ñ\80е"
+msgstr "ТоÑ\87ка поÑ\81еÑ\80едине"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc:111
 msgid "Use normal crosshair color"
@@ -8837,7 +8837,7 @@ msgstr "Содрогание интерфейса при получении ур
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:173
 #: qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh:6
 msgid "Enter HUD editor"
-msgstr "Открыть редактор HUD"
+msgstr "Открыть редактор оболочки"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qh:7
 msgid "HUD"
@@ -9183,7 +9183,7 @@ msgstr "Вид"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:33
 msgid "Weapon Priority List (* = mutator weapon)"
-msgstr "Ð\9fÑ\80иоÑ\80иÑ\82еÑ\82 оружия (* = из мутатора)"
+msgstr "Ð\9eÑ\87еÑ\80Ñ\91дноÑ\81Ñ\82Ñ\8c оружия (* = из мутатора)"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:39
 msgid "Up"
@@ -9195,7 +9195,7 @@ msgstr "Вниз"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:49
 msgid "Use priority list for weapon cycling"
-msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c пÑ\80иоÑ\80иÑ\82еÑ\82 при переключении оружия"
+msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c оÑ\87еÑ\80Ñ\91дноÑ\81Ñ\82Ñ\8c при переключении оружия"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_weapons.qc:50
 msgid ""
@@ -9398,7 +9398,7 @@ msgstr "Показывать график размеров пакетов и д
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:36
 msgid "Packet loss compensation"
-msgstr "Ð\9aомпенÑ\81аÑ\86иÑ\8f потери пакетов (п/п)"
+msgstr "СмÑ\8fгÑ\87ение потери пакетов (п/п)"
 
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:37
 msgid "Each packet includes a copy of the previous message"

diff --git a/common.zh_CN.po b/common.zh_CN.po
index d176fbe3eb1fd742d133b9c1f3d96e9fa3ca0e8d..dc0e1cf89b677599ad6dce68f3e26dc2caec7f8f 100644 (file)
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -1079,12 +1079,12 @@ msgstr "地图："
 #: qcsrc/client/hud/panel/scoreboard.qc:2467
 #, c-format
 msgid "Speed award: %d%s ^7(%s^7)"
-msgstr "速度奖励：%d%s ^7(%s^7)"
+msgstr "速度领先：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2471
 #, c-format
 msgid "All-time fastest: %d%s ^7(%s^7)"
-msgstr "一直领先：%d%s ^7(%s^7)"
+msgstr "史上最快：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2505
 #, c-format
@@ -2178,7 +2178,7 @@ msgstr "隐身"
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:57
 msgid "Shield"
-msgstr "护盾"
+msgstr "神佑"
 
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:51
@@ -3221,17 +3221,17 @@ msgstr "^BG%s^K1 捡到了隐身"
 #: qcsrc/common/notifications/all.inc:417
 #, c-format
 msgid "^BG%s^K1 picked up Shield"
-msgstr "^BG%s^K1 æ\8d¡å\88°äº\86æ\8a¤ç\9b¾"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86ç¥\9eä½\91"
 
 #: qcsrc/common/notifications/all.inc:418
 #, c-format
 msgid "^BG%s^K1 picked up Speed"
-msgstr "^BG%s^K1 æ\8d¡到了加速"
+msgstr "^BG%s^K1 æ\8b¿到了加速"
 
 #: qcsrc/common/notifications/all.inc:419
 #, c-format
 msgid "^BG%s^K1 picked up Strength"
-msgstr "^BG%s^K1 æ\8d¡到了神力"
+msgstr "^BG%s^K1 æ\8b¿到了神力"
 
 #: qcsrc/common/notifications/all.inc:421
 #, c-format
@@ -4520,11 +4520,11 @@ msgstr "^F2神力已解除"
 
 #: qcsrc/common/notifications/all.inc:760
 msgid "^F2Shield surrounds you"
-msgstr "^F2护盾环绕着你"
+msgstr "^F2神佑盾环绕着你"
 
 #: qcsrc/common/notifications/all.inc:761
 msgid "^F2Shield has worn off"
-msgstr "^F2护盾已解除"
+msgstr "^F2神佑盾已解除"
 
 #: qcsrc/common/notifications/all.inc:763
 msgid "^F2You are on speed"
@@ -5884,7 +5884,7 @@ msgstr "动画"
 
 #: qcsrc/menu/xonotic/credits.qc:54
 msgid "Campaign"
-msgstr "任务"
+msgstr "战役"
 
 #: qcsrc/menu/xonotic/credits.qc:57
 msgid "Level Design"
@@ -9741,7 +9741,7 @@ msgstr "即刻行动！（与电脑玩家随机游戏）"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:169
 msgid "Campaign Difficulty:"
-msgstr "任务难度："
+msgstr "战役难度："
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:170
 msgid "CSKL^Easy"
@@ -9757,7 +9757,7 @@ msgstr "困难"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:177
 msgid "Play campaign!"
-msgstr "开始任务！"
+msgstr "开始战役！"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:6
 msgid "Singleplayer"
@@ -9765,7 +9765,7 @@ msgstr "单人游戏"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:7
 msgid "Play the singleplayer campaign or instant action matches against bots"
-msgstr "游玩单人任务，或者即刻行动对抗电脑玩家"
+msgstr "游玩单人战役，或者即刻行动对抗电脑玩家"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer_winner.qh:7
 msgid "Winner"
@@ -9826,11 +9826,11 @@ msgstr "如果回答“否”，你将会以“匿名玩家”的形式出现"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:88
 msgid "teamplay"
-msgstr "å\90\88ä½\9c模å¼\8f"
+msgstr "å\9b¢é\98\9fç«\9eæ\8a\80"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:90
 msgid "free for all"
-msgstr "自由战役"
+msgstr "自由竞技"
 
 #: qcsrc/menu/xonotic/keybinder.qc:35
 msgid "Moving"
@@ -9998,7 +9998,7 @@ msgstr "停止演示"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:16
 msgid "Leave campaign"
-msgstr "离开任务"
+msgstr "离开战役"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:18
 msgid "Leave singleplayer"
@@ -10010,7 +10010,7 @@ msgstr "离开多人游戏"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:28
 msgid "Leave current campaign level"
-msgstr "离开当前任务关卡"
+msgstr "离开当前战役关卡"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:30
 msgid "Leave current singleplayer match"
@@ -10022,7 +10022,7 @@ msgstr "离开当前多人竞赛 / 断开与服务器的连接"
 
 #: qcsrc/menu/xonotic/mainwindow.qc:76 qcsrc/menu/xonotic/mainwindow.qc:79
 msgid "Do not press this button again!"
-msgstr "不要再按这个按钮 ！"
+msgstr "不要再按这个按钮！"
 
 #: qcsrc/menu/xonotic/maplist.qc:294
 msgid ""
@@ -10054,7 +10054,7 @@ msgstr "取消收藏"
 
 #: qcsrc/menu/xonotic/serverlist.qc:263
 msgid "Remove the currently highlighted server from bookmarks"
-msgstr "ä»\8e书签中移é\99¤æ\89\80é\80\89æ\8b©ç\9a\84æ\9c\8då\8a¡å\99¨"
+msgstr "从书签中移除所选服务器"
 
 #: qcsrc/menu/xonotic/serverlist.qc:267
 msgid "SERVER^Favorite"
@@ -10064,7 +10064,7 @@ msgstr "收藏"
 msgid ""
 "Bookmark the currently highlighted server so that it's faster to find in the "
 "future"
-msgstr "收藏当前选择的服务器以便日后查找"
+msgstr "收藏所选服务器以便日后查找"
 
 #: qcsrc/menu/xonotic/serverlist.qc:754
 msgid "Ping"
@@ -10136,7 +10136,7 @@ msgstr "有修改的服务器"
 
 #: qcsrc/menu/xonotic/serverlist.qh:158
 msgid "SLCAT^Overkill"
-msgstr "绝灭模式"
+msgstr "Overkill（绝灭模式）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:159
 msgid "SLCAT^InstaGib"
@@ -10144,7 +10144,7 @@ msgstr "InstaGib（瞬杀）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:160
 msgid "SLCAT^Defrag Mode"
-msgstr "Defrag/无杀戮模式"
+msgstr "Defrag（无杀戮模式）"
 
 #: qcsrc/menu/xonotic/skinlist.qc:70
 msgid "<TITLE>"

diff --git a/common.zh_HK.po b/common.zh_HK.po
index fba2e3fe213e92860c0b427d671c381ea604c623..585d2fdf8b46d8c9fb5b7529d6e763e1af847b36 100644 (file)
--- a/common.zh_HK.po
+++ b/common.zh_HK.po
@@ -1073,12 +1073,12 @@ msgstr "地圖："
 #: qcsrc/client/hud/panel/scoreboard.qc:2467
 #, c-format
 msgid "Speed award: %d%s ^7(%s^7)"
-msgstr "速度獎勵：%d%s ^7(%s^7)"
+msgstr "速度領先：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2471
 #, c-format
 msgid "All-time fastest: %d%s ^7(%s^7)"
-msgstr "一直領先：%d%s ^7(%s^7)"
+msgstr "史上最快：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2505
 #, c-format
@@ -2172,7 +2172,7 @@ msgstr "隱身"
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:57
 msgid "Shield"
-msgstr "護盾"
+msgstr "神佑"
 
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:51
@@ -3215,17 +3215,17 @@ msgstr "^BG%s^K1 撿到了隱身"
 #: qcsrc/common/notifications/all.inc:417
 #, c-format
 msgid "^BG%s^K1 picked up Shield"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86è­·ç\9b¾"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86ç¥\9eä½\91"
 
 #: qcsrc/common/notifications/all.inc:418
 #, c-format
 msgid "^BG%s^K1 picked up Speed"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86å\8a é\80\9f"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86å\8a é\80\9f"
 
 #: qcsrc/common/notifications/all.inc:419
 #, c-format
 msgid "^BG%s^K1 picked up Strength"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86ç¥\9eå\8a\9b"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86ç¥\9eå\8a\9b"
 
 #: qcsrc/common/notifications/all.inc:421
 #, c-format
@@ -4514,11 +4514,11 @@ msgstr "^F2神力已解除"
 
 #: qcsrc/common/notifications/all.inc:760
 msgid "^F2Shield surrounds you"
-msgstr "^F2護盾環繞着你"
+msgstr "^F2神佑盾環繞着你"
 
 #: qcsrc/common/notifications/all.inc:761
 msgid "^F2Shield has worn off"
-msgstr "^F2護盾已解除"
+msgstr "^F2神佑盾已解除"
 
 #: qcsrc/common/notifications/all.inc:763
 msgid "^F2You are on speed"
@@ -5878,7 +5878,7 @@ msgstr "動畫"
 
 #: qcsrc/menu/xonotic/credits.qc:54
 msgid "Campaign"
-msgstr "任務"
+msgstr "戰役"
 
 #: qcsrc/menu/xonotic/credits.qc:57
 msgid "Level Design"
@@ -9735,7 +9735,7 @@ msgstr "即刻行動！（與電腦玩家隨機遊戲）"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:169
 msgid "Campaign Difficulty:"
-msgstr "任務難度："
+msgstr "戰役難度："
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:170
 msgid "CSKL^Easy"
@@ -9751,7 +9751,7 @@ msgstr "困難"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:177
 msgid "Play campaign!"
-msgstr "開始任務！"
+msgstr "開始戰役！"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:6
 msgid "Singleplayer"
@@ -9759,7 +9759,7 @@ msgstr "單人遊戲"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:7
 msgid "Play the singleplayer campaign or instant action matches against bots"
-msgstr "遊玩單人任務，或者即刻行動對抗電腦玩家"
+msgstr "遊玩單人戰役，或者即刻行動對抗電腦玩家"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer_winner.qh:7
 msgid "Winner"
@@ -9820,11 +9820,11 @@ msgstr "如果回答“否”，你將會以“匿名玩家”的形式出現"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:88
 msgid "teamplay"
-msgstr "å\90\88ä½\9c模å¼\8f"
+msgstr "å\9c\98é\9a\8a競æ\8a\80"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:90
 msgid "free for all"
-msgstr "自由戰役"
+msgstr "自由競技"
 
 #: qcsrc/menu/xonotic/keybinder.qc:35
 msgid "Moving"
@@ -9992,7 +9992,7 @@ msgstr "停止演示"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:16
 msgid "Leave campaign"
-msgstr "離開任務"
+msgstr "離開戰役"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:18
 msgid "Leave singleplayer"
@@ -10004,7 +10004,7 @@ msgstr "離開多人遊戲"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:28
 msgid "Leave current campaign level"
-msgstr "離開當前任務關卡"
+msgstr "離開當前戰役關卡"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:30
 msgid "Leave current singleplayer match"
@@ -10016,7 +10016,7 @@ msgstr "離開當前多人競賽 / 斷開與服務器的連接"
 
 #: qcsrc/menu/xonotic/mainwindow.qc:76 qcsrc/menu/xonotic/mainwindow.qc:79
 msgid "Do not press this button again!"
-msgstr "不要再按這個按鈕 ！"
+msgstr "不要再按這個按鈕！"
 
 #: qcsrc/menu/xonotic/maplist.qc:294
 msgid ""
@@ -10048,7 +10048,7 @@ msgstr "取消收藏"
 
 #: qcsrc/menu/xonotic/serverlist.qc:263
 msgid "Remove the currently highlighted server from bookmarks"
-msgstr "å¾\9eæ\9b¸ç±¤ä¸­ç§»é\99¤æ\89\80é\81¸æ\93\87ç\9a\84æ\9c\8då\8b\99å\99¨"
+msgstr "從書籤中移除所選服務器"
 
 #: qcsrc/menu/xonotic/serverlist.qc:267
 msgid "SERVER^Favorite"
@@ -10058,7 +10058,7 @@ msgstr "收藏"
 msgid ""
 "Bookmark the currently highlighted server so that it's faster to find in the "
 "future"
-msgstr "收藏當前選擇的服務器以便日後查找"
+msgstr "收藏所選服務器以便日後查找"
 
 #: qcsrc/menu/xonotic/serverlist.qc:754
 msgid "Ping"
@@ -10130,7 +10130,7 @@ msgstr "有修改的服務器"
 
 #: qcsrc/menu/xonotic/serverlist.qh:158
 msgid "SLCAT^Overkill"
-msgstr "絕滅模式"
+msgstr "Overkill（絕滅模式）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:159
 msgid "SLCAT^InstaGib"
@@ -10138,7 +10138,7 @@ msgstr "InstaGib（瞬殺）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:160
 msgid "SLCAT^Defrag Mode"
-msgstr "Defrag/無殺戮模式"
+msgstr "Defrag（無殺戮模式）"
 
 #: qcsrc/menu/xonotic/skinlist.qc:70
 msgid "<TITLE>"

diff --git a/common.zh_TW.po b/common.zh_TW.po
index 49fb763fc6fd1fe687244f7d6830e325fa460ebc..0fde3680a0db22273adf92a70c25d937b8b12f18 100644 (file)
--- a/common.zh_TW.po
+++ b/common.zh_TW.po
@@ -30,7 +30,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-02-03 12:41+0100\n"
 "PO-Revision-Date: 2013-09-12 16:53+0000\n"
-"Last-Translator: é»\83æ\9f\8f諺 <s8321414@gmail.com>, 2015\n"
+"Last-Translator: é\9f¬ å\88\98 <jiegushijia@gmail.com>, 2019\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/zh_TW/)\n"
 "Language: zh_TW\n"
@@ -1082,12 +1082,12 @@ msgstr "地圖："
 #: qcsrc/client/hud/panel/scoreboard.qc:2467
 #, c-format
 msgid "Speed award: %d%s ^7(%s^7)"
-msgstr "速度獎勵：%d%s ^7(%s^7)"
+msgstr "速度領先：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2471
 #, c-format
 msgid "All-time fastest: %d%s ^7(%s^7)"
-msgstr "一直領先：%d%s ^7(%s^7)"
+msgstr "史上最快：%d%s ^7(%s^7)"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:2505
 #, c-format
@@ -2181,7 +2181,7 @@ msgstr "隱身"
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/shield.qh:57
 msgid "Shield"
-msgstr "護盾"
+msgstr "神佑"
 
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:48
 #: qcsrc/common/mutators/mutator/powerups/powerup/speed.qh:51
@@ -3224,17 +3224,17 @@ msgstr "^BG%s^K1 撿到了隱身"
 #: qcsrc/common/notifications/all.inc:417
 #, c-format
 msgid "^BG%s^K1 picked up Shield"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86è­·ç\9b¾"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86ç¥\9eä½\91"
 
 #: qcsrc/common/notifications/all.inc:418
 #, c-format
 msgid "^BG%s^K1 picked up Speed"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86å\8a é\80\9f"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86å\8a é\80\9f"
 
 #: qcsrc/common/notifications/all.inc:419
 #, c-format
 msgid "^BG%s^K1 picked up Strength"
-msgstr "^BG%s^K1 æ\92¿å\88°äº\86ç¥\9eå\8a\9b"
+msgstr "^BG%s^K1 æ\8b¿å\88°äº\86ç¥\9eå\8a\9b"
 
 #: qcsrc/common/notifications/all.inc:421
 #, c-format
@@ -4523,11 +4523,11 @@ msgstr "^F2神力已解除"
 
 #: qcsrc/common/notifications/all.inc:760
 msgid "^F2Shield surrounds you"
-msgstr "^F2護盾環繞著你"
+msgstr "^F2神佑盾環繞著你"
 
 #: qcsrc/common/notifications/all.inc:761
 msgid "^F2Shield has worn off"
-msgstr "^F2護盾已解除"
+msgstr "^F2神佑盾已解除"
 
 #: qcsrc/common/notifications/all.inc:763
 msgid "^F2You are on speed"
@@ -5887,7 +5887,7 @@ msgstr "動畫"
 
 #: qcsrc/menu/xonotic/credits.qc:54
 msgid "Campaign"
-msgstr "任務"
+msgstr "戰役"
 
 #: qcsrc/menu/xonotic/credits.qc:57
 msgid "Level Design"
@@ -9744,7 +9744,7 @@ msgstr "即刻行動！（與電腦玩家隨機遊戲）"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:169
 msgid "Campaign Difficulty:"
-msgstr "任務難度："
+msgstr "戰役難度："
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:170
 msgid "CSKL^Easy"
@@ -9760,7 +9760,7 @@ msgstr "困難"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:177
 msgid "Play campaign!"
-msgstr "開始任務！"
+msgstr "開始戰役！"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:6
 msgid "Singleplayer"
@@ -9768,7 +9768,7 @@ msgstr "單人遊戲"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:7
 msgid "Play the singleplayer campaign or instant action matches against bots"
-msgstr "遊玩單人任務，或者即刻行動對抗電腦玩家"
+msgstr "遊玩單人戰役，或者即刻行動對抗電腦玩家"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer_winner.qh:7
 msgid "Winner"
@@ -9829,11 +9829,11 @@ msgstr "如果回答「否」，你將會以「匿名玩家」的形式出現"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:88
 msgid "teamplay"
-msgstr "å\90\88ä½\9c模å¼\8f"
+msgstr "å\9c\98é\9a\8a競æ\8a\80"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:90
 msgid "free for all"
-msgstr "自由戰役"
+msgstr "自由競技"
 
 #: qcsrc/menu/xonotic/keybinder.qc:35
 msgid "Moving"
@@ -10001,7 +10001,7 @@ msgstr "停止演示"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:16
 msgid "Leave campaign"
-msgstr "離開任務"
+msgstr "離開戰役"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:18
 msgid "Leave singleplayer"
@@ -10013,7 +10013,7 @@ msgstr "離開多人遊戲"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:28
 msgid "Leave current campaign level"
-msgstr "離開當前任務關卡"
+msgstr "離開當前戰役關卡"
 
 #: qcsrc/menu/xonotic/leavematchbutton.qc:30
 msgid "Leave current singleplayer match"
@@ -10025,7 +10025,7 @@ msgstr "離開當前多人競賽 / 斷開與伺服器的連線"
 
 #: qcsrc/menu/xonotic/mainwindow.qc:76 qcsrc/menu/xonotic/mainwindow.qc:79
 msgid "Do not press this button again!"
-msgstr "不要再按這個按鈕 ！"
+msgstr "不要再按這個按鈕！"
 
 #: qcsrc/menu/xonotic/maplist.qc:294
 msgid ""
@@ -10057,7 +10057,7 @@ msgstr "取消收藏"
 
 #: qcsrc/menu/xonotic/serverlist.qc:263
 msgid "Remove the currently highlighted server from bookmarks"
-msgstr "從書籤中移除所選擇的伺服器"
+msgstr "從書籤中移除所選伺服器"
 
 #: qcsrc/menu/xonotic/serverlist.qc:267
 msgid "SERVER^Favorite"
@@ -10067,7 +10067,7 @@ msgstr "收藏"
 msgid ""
 "Bookmark the currently highlighted server so that it's faster to find in the "
 "future"
-msgstr "收藏當前選擇的伺服器以便日後查詢"
+msgstr "收藏所選伺服器以便日後查詢"
 
 #: qcsrc/menu/xonotic/serverlist.qc:754
 msgid "Ping"
@@ -10139,7 +10139,7 @@ msgstr "有修改的伺服器"
 
 #: qcsrc/menu/xonotic/serverlist.qh:158
 msgid "SLCAT^Overkill"
-msgstr "絕滅模式"
+msgstr "Overkill（絕滅模式）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:159
 msgid "SLCAT^InstaGib"
@@ -10147,7 +10147,7 @@ msgstr "InstaGib（瞬殺）"
 
 #: qcsrc/menu/xonotic/serverlist.qh:160
 msgid "SLCAT^Defrag Mode"
-msgstr "Defrag/無殺戮模式"
+msgstr "Defrag（無殺戮模式）"
 
 #: qcsrc/menu/xonotic/skinlist.qc:70
 msgid "<TITLE>"

diff --git a/languages.txt b/languages.txt
index c8c82e7d7785a87d194aceef8c14b24728bb58d9..1d65b715712dd20cb700d6faaaaca5c430a3f731 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -1,4 +1,5 @@
 ast   "Asturian" "Asturianu" 74%
+id_ID "Indonesian" "Bahasa Indonesia" 40%
 de    "German" "Deutsch" 99%
 de_CH "German (Switzerland)" "Deutsch (Schweiz)" 99%
 en    "English" "English" 100%
@@ -7,6 +8,7 @@ es    "Spanish" "Español" 99%
 fr    "French" "Français" 100%
 ga    "Irish" "Irish" 29%
 it    "Italian" "Italiano" 99%
+la    "Latin" "Lingua Latina" 48%
 hu    "Hungarian" "Magyar" 43%
 nl    "Dutch" "Nederlands" 62%
 pl    "Polish" "Polski" 80%
@@ -16,8 +18,6 @@ ro    "Romanian" "Romana" 68%
 fi    "Finnish" "Suomi" 99%
 sv    "Swedish" "Svenska" 99%
 tr    "Turkish" "Türkçe" 50%
-id_ID "id_ID" "id_ID" 40%
-la "la" "la" 45%
 cs    "Czech" "Čeština" 31%
 el    "Greek" "Ελληνική" 44%
 be    "Belarusian" "Беларуская" 49%

diff --git a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qh b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qh
index bb75feced505f553d56303dc598f825b9f506f0e..101242af700fced3413ade0e0e29b235fc81e467 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qh
+++ b/qcsrc/common/gamemodes/gamemode/domination/sv_domination.qh
@@ -11,16 +11,16 @@ void dom_Initialize();
 
 REGISTER_MUTATOR(dom, false)
 {
-    MUTATOR_STATIC();
+       MUTATOR_STATIC();
        MUTATOR_ONADD
        {
-               int fraglimit_override = autocvar_g_domination_point_limit;
+               int point_limit = autocvar_g_domination_point_limit;
                if (autocvar_g_domination_roundbased && autocvar_g_domination_roundbased_point_limit)
-                       fraglimit_override = autocvar_g_domination_roundbased_point_limit;
+                       point_limit = autocvar_g_domination_roundbased_point_limit;
 
                GameRules_teams(true);
-        GameRules_limit_score(fraglimit_override);
-        GameRules_limit_lead(autocvar_g_domination_point_leadlimit);
+               GameRules_limit_score(point_limit);
+               GameRules_limit_lead(autocvar_g_domination_point_leadlimit);
 
                dom_Initialize();
        }

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index a207b226b67a6a3259c049d0c15a948d96345f45..28fa7e7c056dae29e0675fce7c1eeb467fa4d469 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -335,7 +335,7 @@ void VoteThink()
 // =======================
 
 // Resets the state of all clients, items, weapons, waypoints, ... of the map.
-void reset_map(bool dorespawn, bool is_fake_round_start)
+void reset_map(bool is_fake_round_start)
 {
        if (time <= game_starttime)
        {
@@ -396,21 +396,18 @@ void reset_map(bool dorespawn, bool is_fake_round_start)
 
        // Moving the player reset code here since the player-reset depends
        // on spawnpoint entities which have to be reset first --blub
-       if (dorespawn)
+       if (!MUTATOR_CALLHOOK(reset_map_players))
        {
-               if (!MUTATOR_CALLHOOK(reset_map_players))
+               FOREACH_CLIENT(IS_PLAYER(it),
                {
-                       FOREACH_CLIENT(IS_PLAYER(it),
-                       {
-                               // PlayerScore_Clear(it);
-                               CS(it).killcount = 0;
-                               // stop the player from moving so that they stand still once they get respawned
-                               it.velocity = '0 0 0';
-                               it.avelocity = '0 0 0';
-                               CS(it).movement = '0 0 0';
-                               PutClientInServer(it);
-                       });
-               }
+                       // PlayerScore_Clear(it);
+                       CS(it).killcount = 0;
+                       // stop the player from moving so that they stand still once they get respawned
+                       it.velocity = '0 0 0';
+                       it.avelocity = '0 0 0';
+                       CS(it).movement = '0 0 0';
+                       PutClientInServer(it);
+               });
        }
 }
 
@@ -418,7 +415,7 @@ void reset_map(bool dorespawn, bool is_fake_round_start)
 void ReadyRestart_think(entity this)
 {
        if (!warmup_stage) // if the countdown was not aborted
-               reset_map(true, false);
+               reset_map(false);
        delete(this);
 }
 
@@ -478,7 +475,7 @@ void ReadyRestart_force(bool is_fake_round_start)
        }
 
        if (!sv_ready_restart_after_countdown || warmup_stage)
-               reset_map(true, is_fake_round_start);
+               reset_map(is_fake_round_start);
 
        if (autocvar_sv_eventlog) GameLogEcho(":restart");
 }

diff --git a/qcsrc/server/command/vote.qh b/qcsrc/server/command/vote.qh
index 184e502e55e6287f783c0febbb0ed47c6f818e03..3e8aaa33f3b1e7f4dc50d822f579c72d452123fa 100644 (file)
--- a/qcsrc/server/command/vote.qh
+++ b/qcsrc/server/command/vote.qh
@@ -67,7 +67,7 @@ int readycount;                    // amount of players who are ready
 .int team_saved;                   // team number to restore upon map reset
 .void(entity this) reset;          // if set, an entity is reset using this
 .void(entity this) reset2;         // if set, an entity is reset using this (after calling ALL the reset functions for other entities)
-void reset_map(float dorespawn, bool is_fake_round_start);
+void reset_map(bool is_fake_round_start);
 void ReadyCount();
 void ReadyRestart_force(bool is_fake_round_start);
 void VoteCount(float first_count);

diff --git a/qcsrc/server/items/spawning.qc b/qcsrc/server/items/spawning.qc
index 2085521424941e6643d6be6491f4b2cfef18a503..561a5673a08011856e26d68cd28ecf8d9786add7 100644 (file)
--- a/qcsrc/server/items/spawning.qc
+++ b/qcsrc/server/items/spawning.qc
@@ -148,15 +148,9 @@ void Item_SetExpiring(entity item, bool expiring)
 
 // in Quake this is green armor, in Xonotic maps it is an armor shard
 SPAWNFUNC_ITEM_COND(item_armor1, autocvar_sv_mapformat_is_quake3, ITEM_ArmorSmall, ITEM_ArmorMedium)
-
-SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega)
-
-SPAWNFUNC_ITEM(item_armor_large, ITEM_ArmorMega)
-
+SPAWNFUNC_ITEM(item_armor25, ITEM_ArmorMega) // Nexuiz used item_armor25 to spawn a Mega Armor
 SPAWNFUNC_ITEM(item_health1, ITEM_HealthSmall)
-
 SPAWNFUNC_ITEM(item_health25, ITEM_HealthMedium)
-
-SPAWNFUNC_ITEM(item_health_large, ITEM_HealthBig)
-
 SPAWNFUNC_ITEM(item_health100, ITEM_HealthMega)
+SPAWNFUNC_ITEM(item_armor_large, ITEM_ArmorMega)
+SPAWNFUNC_ITEM(item_health_large, ITEM_HealthBig)

diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc
index 6c9342b80e30bcb64ec2759cc4a67c245d3bc95f..b22ba178d61d0c2ecbcb3f398a7868a25b595b0b 100644 (file)
--- a/qcsrc/server/round_handler.qc
+++ b/qcsrc/server/round_handler.qc
@@ -28,7 +28,7 @@ void round_handler_Think(entity this)
                this.wait = false;
                this.cnt = this.count + 1;  // init countdown
                round_starttime = time + this.count;
-               reset_map(true, false);
+               reset_map(false);
        }
 
        if (this.cnt > 0)  // countdown running