Merge branch 'Mario/less_stats' into 'master'

Merge branch Mario/less_stats (S merge request)

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 01c17c1da2fec147244ca3d89244f2e68e1c2fbe..f61783799b00b59d7eb405b5a870c62117c33500 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun 13 07:24:54 CEST 2021
+Tue Jun 15 07:23:51 CEST 2021

diff --git a/common.ast.po b/common.ast.po
index 6f1dd305d6d2e86a843c26e451452c4e23e6b96f..79136daa461926bdf6311d1d2679ff67ffde351d 100644 (file)
--- a/common.ast.po
+++ b/common.ast.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-06 07:23+0200\n"
-"PO-Revision-Date: 2021-06-06 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2021-06-15 02:07+0000\n"
+"Last-Translator: Tornes Ḷḷume <tornes.llume@openmailbox.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/team-xonotic/xonotic/"
 "language/ast/)\n"
 "Language: ast\n"
@@ -46,7 +46,7 @@ msgid ""
 "^1Multiline message at time %s that\n"
 "^1lasts longer than normal"
 msgstr ""
-"^1Mensaxe de varies llines en %s que\n"
+"^1Mensaxe de delles llines en %s que\n"
 "^1dura más de lo normal"
 
 #: qcsrc/client/hud/panel/centerprint.qc:177
@@ -124,7 +124,7 @@ msgstr "Disparu secundariu"
 #: qcsrc/client/hud/panel/infomessages.qc:116
 #, c-format
 msgid "^1Press ^3%s^1 for gamemode info"
-msgstr "^1Primi ^3%s^1 pa la información del mou de xuegu"
+msgstr "^1Primi ^3%s^1 pa ver la información del mou de xuegu"
 
 #: qcsrc/client/hud/panel/infomessages.qc:116
 #: qcsrc/menu/xonotic/keybinder.qc:103
@@ -963,7 +963,7 @@ msgstr "Monstruos mataos:"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:1557
 msgid "Secrets found:"
-msgstr "Secretos alcontraos:"
+msgstr "Secretos atopaos:"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:1751
 #, c-format
@@ -1026,7 +1026,7 @@ msgstr "Morriesti, primi ^2%s^7 pa remanecer"
 
 #: qcsrc/client/hud/panel/strafehud.qc:908
 msgid "qu"
-msgstr ""
+msgstr "qu"
 
 #: qcsrc/client/hud/panel/strafehud.qc:909
 msgid "m"
@@ -1112,7 +1112,7 @@ msgstr ""
 
 #: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51
 msgid "qu/s"
-msgstr ""
+msgstr "qu/s"
 
 #: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52
 msgid "m/s"
@@ -1171,7 +1171,7 @@ msgstr ""
 
 #: qcsrc/client/mapvoting.qc:532
 msgid "Requesting preview..."
-msgstr ""
+msgstr "Solicitando la previsualización..."
 
 #: qcsrc/client/view.qc:959
 msgid "Nade timer"
@@ -1355,11 +1355,12 @@ msgstr "Vides:"
 
 #: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:11
 msgid "Nexball"
-msgstr "Nexball"
+msgstr "Néxbol"
 
 #: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:11
 msgid "Shoot and kick the ball into the enemies goal, keep your goal clean"
 msgstr ""
+"Xuta la pelota hasta la portería enemiga y fai por que nun te metan goles"
 
 #: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:25
 msgid "Goals:"
@@ -2482,7 +2483,7 @@ msgstr "^BG%s^K1 morrió%s%s"
 #: qcsrc/common/notifications/all.inc:301
 #, c-format
 msgid "^BG%s^K1 found a hot place%s%s"
-msgstr "^BG%s^K1 alcontró un sitiu caliente%s%s"
+msgstr "^BG%s^K1 atopó un sitiu caliente%s%s"
 
 #: qcsrc/common/notifications/all.inc:301
 #, c-format
@@ -2765,7 +2766,7 @@ msgstr "^BG%s^BG ganó la ronda"
 #: qcsrc/common/notifications/all.inc:359
 #: qcsrc/common/notifications/all.inc:534
 msgid "^BGRound tied"
-msgstr ""
+msgstr "^BGLa ronda quedó n'empate"
 
 #: qcsrc/common/notifications/all.inc:360
 #: qcsrc/common/notifications/all.inc:535
@@ -2803,7 +2804,7 @@ msgstr "^BGPañesti l'ameyora %s^BG!"
 #: qcsrc/common/notifications/all.inc:683
 #, c-format
 msgid "^BGYou do not have the ^F1%s"
-msgstr ""
+msgstr "^BGNun tienes ^F1%s"
 
 #: qcsrc/common/notifications/all.inc:370
 #: qcsrc/common/notifications/all.inc:684
@@ -2938,7 +2939,7 @@ msgstr "^BGEl puntu de control del equipu ^TC^TT^BG destruyólu %s"
 
 #: qcsrc/common/notifications/all.inc:402
 msgid "^TC^TT^BG generator has been destroyed"
-msgstr ""
+msgstr "^BGDestruyóse'l xenerador del equipu ^TC^TT"
 
 #: qcsrc/common/notifications/all.inc:403
 msgid "^TC^TT^BG generator spontaneously combusted due to overtime!"
@@ -3482,7 +3483,7 @@ msgid ""
 "^BGif you think you will succeed."
 msgstr ""
 "^BGAgora yes llibre.\n"
-"^F2Tenta de capturar^BG la bandera de nueves\n"
+"^F2Tenta de volver capturar^BG la bandera\n"
 "^BGsi cuides que vas consiguilo."
 
 #: qcsrc/common/notifications/all.inc:542
@@ -3755,11 +3756,11 @@ msgstr ""
 
 #: qcsrc/common/notifications/all.inc:623
 msgid "^K1You fragged yourself!"
-msgstr ""
+msgstr "^K1¡Suicidéstite!"
 
 #: qcsrc/common/notifications/all.inc:623
 msgid "^K1You need to be more careful!"
-msgstr "^K1¡Precises tener más curiáu!"
+msgstr "^K1¡Has tener más curiáu!"
 
 #: qcsrc/common/notifications/all.inc:624
 msgid "^K1You couldn't stand the heat!"
@@ -3767,7 +3768,7 @@ msgstr "^K1¡Nun pudiesti aguantar la calor!"
 
 #: qcsrc/common/notifications/all.inc:625
 msgid "^K1You need to watch out for monsters!"
-msgstr "^K1¡Precises tener curiáu colos monstruos!"
+msgstr "^K1¡Has tener curiáu colos monstruos!"
 
 #: qcsrc/common/notifications/all.inc:625
 msgid "^K1You were killed by a monster!"
@@ -3811,7 +3812,7 @@ msgstr ""
 
 #: qcsrc/common/notifications/all.inc:631
 msgid "^K1You need to preserve your health"
-msgstr "^K1Precises caltener la salú"
+msgstr "^K1Tienes de caltener la salú"
 
 #: qcsrc/common/notifications/all.inc:632
 msgid "^K1You became a shooting star!"
@@ -3905,22 +3906,22 @@ msgstr "^K1¡Anda pelo segao!"
 #: qcsrc/common/notifications/all.inc:651
 #, c-format
 msgid "^K1Traitor! You betrayed team mate ^BG%s"
-msgstr ""
+msgstr "^K1¡Traidor! Traicionesti al compañeru ^BG%s"
 
 #: qcsrc/common/notifications/all.inc:651
 #, c-format
 msgid "^K1Traitor! You team killed ^BG%s"
-msgstr ""
+msgstr "^K1¡Traidor! Matesti al compañeru ^BG%s"
 
 #: qcsrc/common/notifications/all.inc:652
 #, c-format
 msgid "^K1You were betrayed by team mate ^BG%s"
-msgstr ""
+msgstr "^K1Traicionóte'l compañeru ^BG%s"
 
 #: qcsrc/common/notifications/all.inc:652
 #, c-format
 msgid "^K1You were team killed by ^BG%s"
-msgstr ""
+msgstr "^K1Matóte'l compañeru ^BG%s"
 
 #: qcsrc/common/notifications/all.inc:654
 msgid ""
@@ -3935,6 +3936,8 @@ msgid ""
 "^K1Stop idling!\n"
 "^BGMoving to spectators in ^COUNT..."
 msgstr ""
+"^K1¡Dexa de tar ausente!\n"
+"^BGVas ser espectador en ^COUNT..."
 
 #: qcsrc/common/notifications/all.inc:657
 #, c-format
@@ -4094,7 +4097,7 @@ msgstr ""
 #: qcsrc/common/notifications/all.inc:713
 #, c-format
 msgid "^F2Extra lives remaining: ^K1%s"
-msgstr ""
+msgstr "^F2Vides adicionales que queden: ^K1%s"
 
 #: qcsrc/common/notifications/all.inc:715 qcsrc/menu/xonotic/campaign.qc:244
 #, c-format
@@ -4741,7 +4744,7 @@ msgstr "Nun sé"
 
 #: qcsrc/common/util.qc:1382
 msgid "<KEY NOT FOUND>"
-msgstr "<NUN S'ALCONTRÓ LA TECLA>"
+msgstr "<NUN S'ATOPÓ LA TECLA>"
 
 #: qcsrc/common/util.qc:1383
 msgid "<UNKNOWN KEYNUM>"
@@ -5590,7 +5593,7 @@ msgstr "Italia"
 
 #: qcsrc/menu/xonotic/credits.qc:227
 msgid "Japanese"
-msgstr ""
+msgstr "Xaponés"
 
 #: qcsrc/menu/xonotic/credits.qc:230
 msgid "Kazakh"
@@ -6562,6 +6565,8 @@ msgid ""
 "Play online, against your friends in LAN, view demos or change player "
 "settings"
 msgstr ""
+"Xuega en llinia o escontra collacios per LAN, mira les demostraciones o "
+"camuda los axustes de xugador"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:38
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:111
@@ -6746,7 +6751,7 @@ msgstr "Desanicia tolos mapes de la esbilla"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:206
 msgid "Start Multiplayer!"
-msgstr "¡Entamar!"
+msgstr "Entamar una partida"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qc:50
 msgid "Title:"
@@ -6824,7 +6829,7 @@ msgstr "Ensin armes iniciales"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:73
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:202
 msgid "Low gravity"
-msgstr ""
+msgstr "Poca gravedá"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:75
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:171
@@ -6973,7 +6978,7 @@ msgstr "Los xugadores van soltar toles armes que poseyan al morrer"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:240
 msgid "Weapons stay after they are picked up"
-msgstr ""
+msgstr "Les armes de la mano nun cambien darréu de pañar una"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:245
 msgid "Regular (no arena)"
@@ -7013,8 +7018,8 @@ msgid ""
 "does not inflict any damage but is good for doing trickjumps."
 msgstr ""
 "Los xugadores namás van recibir una arma que pue matar d'un tiru y nel intre "
-"a los oponentes. Si'l xugador escosa la munición va tener 10 segundos pa "
-"alcontrar dello mas si nun lo fai, va encarar la muerte. El mou de disparu "
+"a los oponentes. Si'l xugador escosa la munición va tener 10 segundos "
+"p'atopar dello mas si nun lo fai, va encarar la muerte. El mou de disparu "
 "secundariu nun fai dañu mas ye bonu pa facer saltos habilidosos."
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:289
@@ -7258,7 +7263,7 @@ msgstr "Amestar too"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:44
 msgid "Set as menu track"
-msgstr ""
+msgstr "Afitar como pista del menú"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc:48
 msgid "Reset default menu track"
@@ -7547,7 +7552,7 @@ msgstr "Camuda los axustes del xuegu"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:30
 msgid "Master:"
-msgstr ""
+msgstr "Volume principal:"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:36
 msgid "Music:"
@@ -7591,7 +7596,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:103
 msgid "Mute sounds when not active"
-msgstr ""
+msgstr "Desactivar los soníos al nun tar la ventana activa"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:106
 msgid "Frequency:"
@@ -7701,7 +7706,7 @@ msgstr "Reproduz un soníu d'impautu cuando-y das a un enemigu"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:149
 msgid "SND^Fixed"
-msgstr ""
+msgstr "Fixu"
 
 #: qcsrc/menu/xonotic/dialog_settings_audio.qc:152
 msgid "Decrease pitch with more damage"
@@ -8027,7 +8032,7 @@ msgstr "Les calcamoníes más lloñe d'esto nun van dibuxase"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:177
 msgid "Time:"
-msgstr ""
+msgstr "Tiempu:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:180
 msgid "Time in seconds before decals fade away"
@@ -8130,7 +8135,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:227
 msgid "Extra postprocessing effects"
-msgstr ""
+msgstr "Efeutos de posprocesamientu adicional"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:228
 msgid ""
@@ -8140,11 +8145,11 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:233
 msgid "Motion blur strength - 0.4 recommended"
-msgstr ""
+msgstr "La fuercia del desenfoque pol movimientu. Aconséyase'l valor 0,4"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:234
 msgid "Motion blur:"
-msgstr ""
+msgstr "Desenfoque pol movimientu:"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.qc:240
 msgid "Particles"
@@ -8274,7 +8279,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:64
 msgid "Waypoints"
-msgstr ""
+msgstr "Puntos de camín"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:66
 msgid "Display waypoint markers for objectives on the map"
@@ -8286,7 +8291,7 @@ msgstr ""
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:73
 msgid "Control transparency of the waypoints"
-msgstr ""
+msgstr "Controla la tresparencia de los puntos de camín"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:77
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:130
@@ -8307,7 +8312,7 @@ msgstr "Amosar nomes en cuentes d'iconos"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:100
 msgid "Damage"
-msgstr ""
+msgstr "Dañu"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:102
 msgid "Overlay:"
@@ -8331,7 +8336,7 @@ msgstr "Amosar los nomes enriba de los xugadores"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:136
 msgid "Max distance:"
-msgstr ""
+msgstr "Distancia máxima:"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_hud.qc:142
 msgid "Decolorize:"
@@ -8454,7 +8459,7 @@ msgstr "Amosar el nome de los lladrones de banderes en Captura la bandera"
 #: qcsrc/menu/xonotic/dialog_settings_input.qc:92
 #: qcsrc/menu/xonotic/dialog_settings_misc.qc:123
 msgid "Other"
-msgstr ""
+msgstr "Otros axustes"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.qc:78
 msgid "Display console messages in the top left corner"
@@ -9444,7 +9449,7 @@ msgstr "Difícil"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qc:170
 msgid "Start Singleplayer!"
-msgstr "¡Entamar!"
+msgstr "Entamar una partida"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.qh:6
 msgid "Singleplayer"
@@ -9507,7 +9512,7 @@ msgstr "xuegu n'equipu"
 
 #: qcsrc/menu/xonotic/gametypelist.qc:90
 msgid "free for all"
-msgstr ""
+msgstr "toos escontra toos"
 
 #: qcsrc/menu/xonotic/keybinder.qc:35
 msgid "Moving"
@@ -9689,7 +9694,7 @@ msgstr ""
 #: qcsrc/menu/xonotic/maplist.qc:296
 #, c-format
 msgid "%s's Xonotic Server"
-msgstr ""
+msgstr "El sirvidor de Xonotic de %s"
 
 #: qcsrc/menu/xonotic/maplist.qc:301
 msgid ""
@@ -9703,7 +9708,7 @@ msgstr "espectador"
 
 #: qcsrc/menu/xonotic/playermodel.qc:161
 msgid "<no model found>"
-msgstr "<nun s'alcontró'l modelu>"
+msgstr "<nun s'atopó'l modelu>"
 
 #: qcsrc/menu/xonotic/serverlist.qc:256
 msgid "SERVER^Remove favorite"
@@ -9722,7 +9727,7 @@ msgid ""
 "Bookmark the currently highlighted server so that it's faster to find in the "
 "future"
 msgstr ""
-"Amiesta'l sirvidor rescampláu a Favoritos p'alcontralu más rápido nel futuru"
+"Amiesta'l sirvidor rescampláu a Favoritos p'atopalu más rápido nel futuru"
 
 #: qcsrc/menu/xonotic/serverlist.qc:746
 msgid "Ping"

diff --git a/common.zh_CN.po b/common.zh_CN.po
index a197e1c6c8e62194b4abf5cc743b785bc6e1119b..d96e4620a545df17410a9ea654184542afd075d1 100644 (file)
--- a/common.zh_CN.po
+++ b/common.zh_CN.po
@@ -7,6 +7,7 @@
 # Antoni Das <Antonidas159@gmail.com>, 2015,2017
 # sapphireliu <balancedliu@gmail.com>, 2014
 # CodingJellyfish <dumaosen_main01@outlook.com>, 2018
+# gee Lar <hola0_o@qq.com>, 2021
 # kalawore <kalawore@outlook.com>, 2015
 # Liang Liu <dxkliu@126.com>, 2019
 # Losier Blackheath <losier.cc@gmail.com>, 2018
@@ -19,8 +20,8 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-06-06 07:23+0200\n"
-"PO-Revision-Date: 2021-06-06 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2021-06-14 00:21+0000\n"
+"Last-Translator: gee Lar <hola0_o@qq.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/team-xonotic/"
 "xonotic/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -37,12 +38,12 @@ msgstr "^2已导出至 %s！ （小贴士：它被保存到 data/data/）"
 #: qcsrc/client/hud/hud_config.qc:84
 #, c-format
 msgid "^1Couldn't write to %s"
-msgstr "无法将^1写入到 %s"
+msgstr "^1无法写入到 %s"
 
 #: qcsrc/client/hud/panel/centerprint.qc:173
 #, c-format
 msgid "^3Countdown message at time %s, seconds left: ^COUNT"
-msgstr "^3倒计时时间 %s, 剩余秒数: ^COUNT"
+msgstr "^3倒计时时间 %s, 剩余秒数：^COUNT"
 
 #: qcsrc/client/hud/panel/centerprint.qc:175
 #, c-format
@@ -50,6 +51,8 @@ msgid ""
 "^1Multiline message at time %s that\n"
 "^1lasts longer than normal"
 msgstr ""
+"^1时间 %s 的多行消息持续时间比正常\n"
+"时间长"
 
 #: qcsrc/client/hud/panel/centerprint.qc:177
 #, c-format
@@ -67,7 +70,7 @@ msgstr "^3玩家^7: 这里是聊天区."
 #: qcsrc/client/hud/panel/engineinfo.qc:75
 #, c-format
 msgid "FPS: %.*f"
-msgstr "FPS: %.*f"
+msgstr "FPS：%.*f"
 
 #: qcsrc/client/hud/panel/infomessages.qc:92
 msgid "^1Observing"
@@ -491,7 +494,7 @@ msgstr "QMCMD^随机组队"
 
 #: qcsrc/client/hud/panel/quickmenu.qc:879
 msgid "QMCMD^Spectate a player"
-msgstr ""
+msgstr "观察玩家"
 
 #: qcsrc/client/hud/panel/racetimer.qc:56
 #, c-format
@@ -527,15 +530,15 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174
 msgid "missing a checkpoint"
-msgstr ""
+msgstr "缺失一个检查点"
 
 #: qcsrc/client/hud/panel/radar.qc:349
 msgid "Click to select teleport destination"
-msgstr ""
+msgstr "点击选择传送目的地"
 
 #: qcsrc/client/hud/panel/radar.qc:353
 msgid "Click to select spawn location"
-msgstr ""
+msgstr "点击选择出生点"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:119
 msgid "Number of ball carrier kills"
@@ -551,7 +554,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:120
 msgid "Total amount of time holding the ball in Keepaway"
-msgstr ""
+msgstr "持球的总时间"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:121
 msgid "How often a flag (CTF) or a key (KeyHunt) was captured"
@@ -567,7 +570,7 @@ msgstr "SCO^captime"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:122
 msgid "Time of fastest capture (CTF)"
-msgstr ""
+msgstr "最快夺旗时间（CTF）"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:123
 msgid "Number of deaths"
@@ -591,7 +594,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:125
 msgid "The total damage done"
-msgstr ""
+msgstr "造成的总伤害"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:126
 msgid "SCO^dmgtaken"
@@ -599,7 +602,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:126
 msgid "The total damage taken"
-msgstr ""
+msgstr "受到的总伤害"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:127
 msgid "Number of flag drops"
@@ -627,7 +630,7 @@ msgstr ""
 
 #: qcsrc/client/hud/panel/scoreboard.qc:130
 msgid "Number of faults committed"
-msgstr ""
+msgstr "提交的错误数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:130
 msgid "SCO^faults"
@@ -693,7 +696,7 @@ msgstr "SCO^击杀/死亡比"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:139
 msgid "Number of kills"
-msgstr ""
+msgstr "击杀数"
 
 #: qcsrc/client/hud/panel/scoreboard.qc:139
 msgid "SCO^kills"

diff --git a/languages.txt b/languages.txt
index 3b5311c6c1c6ccc148726838f096c0f61d5917a9..9618df5c892555c213a081ac0e6b79af53eb1fb7 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -1,4 +1,4 @@
-ast   "Asturian" "Asturianu" 76%
+ast   "Asturian" "Asturianu" 77%
 de    "German" "Deutsch" 100%
 de_CH "German (Switzerland)" "Deutsch (Schweiz)" 100%
 en    "English" "English" 100%
@@ -22,7 +22,7 @@ bg    "Bulgarian" "Български" 62%
 ru    "Russian" "Русский" 100%
 sr    "Serbian" "Српски" 62%
 uk    "Ukrainian" "Українська" 49%
-zh_CN "Chinese (China)" "中文" 56%
+zh_CN "Chinese (China)" "中文" 57%
 zh_TW "Chinese (Taiwan)" "國語" 59%
 ja_JP "Japanese" "日本語" 99%
 ko    "Korean" "한국의" 28%

diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc
index b0f561d91efced1358ca4efc8a9155b70c484df9..71119adf121be93f98d50f1df273be17f3415c12 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qc
+++ b/qcsrc/menu/xonotic/serverlist.qc
@@ -398,6 +398,8 @@ void XonoticServerList_focusEnter(entity me)
 
 void XonoticServerList_draw(entity me)
 {
+       me.serversHeight = (autocvar_menu_slist_categories > 0 ? 1.0 : me.categoriesHeight);
+
        if(_Nex_ExtResponseSystem_BannedServersNeedsRefresh)
        {
                if(!me.needsRefresh)
@@ -775,8 +777,10 @@ void ServerList_Info_Click(entity btn, entity me)
        if (me.nItems != 0)
                main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
 
-       vector org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
-       vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
+       float thisPos = me.getItemStart(me, me.selectedItem); 
+       float thisHeight = me.getItemHeight(me, me.selectedItem); 
+       vector org = boxToGlobal(eY * (thisPos - me.scrollPos), me.origin, me.size);
+       vector sz = boxToGlobalSize(eY * thisHeight + eX * (1 - me.controlWidth), me.size);
        DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
 }
 void XonoticServerList_doubleClickListBoxItem(entity me, int i, vector where)
@@ -788,8 +792,8 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is
        vector oldscale = draw_scale;
        vector oldshift = draw_shift;
 #define SET_YRANGE(start,end) \
-       draw_scale = boxToGlobalSize(eX + eY * (end - start), oldscale); \
-       draw_shift = boxToGlobal(eY * start, oldshift, oldscale);
+       draw_scale = boxToGlobalSize(eX + eY * ((end) - (start)), oldscale); \
+       draw_shift = boxToGlobal(eY * (start), oldshift, oldscale);
 
        int c;
        for (c = 0; c < category_draw_count; ++c) {
@@ -826,6 +830,10 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is
                }
        }
 
+       // Now categories are done. Set the Y range in stone.
+       oldscale = draw_scale;
+       oldshift = draw_shift;
+
        if(isSelected && !me.lockedSelectedItem)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
        else if(isFocused)
@@ -972,7 +980,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is
        // --------------
        vector iconSize = '0 0 0';
        iconSize_y = me.realFontSize.y * me.iconsSizeFactor;
-       iconSize_x = me.realFontSize.x * me.iconsSizeFactor;
+       iconSize_x = me.realFontSize.x * me.iconsSizeFactor * me.serversHeight;
 
        vector iconPos = '0 0 0';
        iconPos_x = (me.columnIconsSize - 3 * iconSize.x) * 0.5;
@@ -1041,6 +1049,12 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is
        //  RENDER TEXT
        // --------------
 
+       // Center it in the row.
+       SET_YRANGE(
+               0.5 - 0.5 / me.serversHeight,
+               0.5 + 0.5 / me.serversHeight
+       );
+
        // ping
        s = ftos(ping);
        draw_Text(me.realUpperMargin * eY + (me.columnPingOrigin + me.columnPingSize - draw_TextWidth(s, 0, me.realFontSize)) * eX, s, me.realFontSize, theColor, theAlpha, 0);
@@ -1093,8 +1107,10 @@ bool XonoticServerList_keyDown(entity me, int scan, bool ascii, bool shift)
        {
                if(me.nItems != 0)
                {
-                       vector org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
-                       vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
+                       float thisPos = me.getItemStart(me, me.selectedItem); 
+                       float thisHeight = me.getItemHeight(me, me.selectedItem); 
+                       vector org = boxToGlobal(eY * (thisPos - me.scrollPos), me.origin, me.size);
+                       vector sz = boxToGlobalSize(eY * thisHeight + eX * (1 - me.controlWidth), me.size);
                        m_play_click_sound(MENU_SOUND_OPEN);
                        main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
                        DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
@@ -1124,34 +1140,34 @@ float XonoticServerList_getTotalHeight(entity me)
 {
        float num_normal_rows = me.nItems;
        int num_headers = category_draw_count;
-       return me.itemHeight * (num_normal_rows + me.categoriesHeight * num_headers);
+       return me.itemHeight * (me.serversHeight * num_normal_rows + me.categoriesHeight * num_headers);
 }
 int XonoticServerList_getItemAtPos(entity me, float pos)
 {
        pos = pos / me.itemHeight;
        for (int i = category_draw_count - 1; i >= 0; --i) {
                int itemidx = category_item[i];
-               float itempos = i * me.categoriesHeight + category_item[i];
-               if (pos >= itempos + me.categoriesHeight + 1)
-                       return itemidx + 1 + floor(pos - (itempos + me.categoriesHeight + 1));
+               float itempos = i * me.categoriesHeight + category_item[i] * me.serversHeight;
+               if (pos >= itempos + me.categoriesHeight + me.serversHeight)
+                       return itemidx + 1 + floor((pos - (itempos + me.categoriesHeight + me.serversHeight)) / me.serversHeight);
                if (pos >= itempos)
                        return itemidx;
        }
        // No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
-       return floor(pos);
+       return floor(pos / me.serversHeight);
 }
 float XonoticServerList_getItemStart(entity me, int item)
 {
        for (int i = category_draw_count - 1; i >= 0; --i) {
                int itemidx = category_item[i];
-               float itempos = i * me.categoriesHeight + category_item[i];
+               float itempos = i * me.categoriesHeight + category_item[i] * me.serversHeight;
                if (item >= itemidx + 1)
-                       return (itempos + me.categoriesHeight + 1 + item - (itemidx + 1)) * me.itemHeight;
+                       return (itempos + me.categoriesHeight + (1 + item - (itemidx + 1)) * me.serversHeight) * me.itemHeight;
                if (item >= itemidx)
                        return itempos * me.itemHeight;
        }
        // No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
-       return item * me.itemHeight;
+       return item * me.serversHeight * me.itemHeight;
 }
 float XonoticServerList_getItemHeight(entity me, int item)
 {
@@ -1160,5 +1176,5 @@ float XonoticServerList_getItemHeight(entity me, int item)
                if (item == category_item[i])
                        return me.itemHeight * (me.categoriesHeight + 1);
        }
-       return me.itemHeight;
+       return me.itemHeight * me.serversHeight;
 }

diff --git a/qcsrc/menu/xonotic/serverlist.qh b/qcsrc/menu/xonotic/serverlist.qh
index 77236e6d051d3590021ec1d35851e647053c850e..db74045986d7eb8b78bc06326639656a74addc4f 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qh
+++ b/qcsrc/menu/xonotic/serverlist.qh
@@ -63,6 +63,7 @@ CLASS(XonoticServerList, XonoticListBox)
        ATTRIB(XonoticServerList, seenIPv4, float, 0);
        ATTRIB(XonoticServerList, seenIPv6, float, 0);
        ATTRIB(XonoticServerList, categoriesHeight, float, 1.25);
+       ATTRIB(XonoticServerList, serversHeight, float, 1.0);
 
        METHOD(XonoticServerList, getTotalHeight, float(entity));
        METHOD(XonoticServerList, getItemAtPos, float(entity, float));

diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index c62cb55407beedd41fd03f9492cb1e78260d9a6b..5ccf96968d677c25ab8da2c774280b2e240cf1b4 100644 (file)
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -548,7 +548,7 @@ seta menu_slist_showlaggy 0 "show servers even if they are very high latency (se
 seta menu_slist_modfilter "" // set to either: !modname or modname. modname of = means "same as we are running now".
 
 // other serverlist cvars
-seta menu_slist_categories 1
+seta menu_slist_categories 0
 seta menu_slist_categories_onlyifmultiple 1
 seta menu_slist_purethreshold 0
 seta menu_slist_maxping 300