Merge branch 'master' into terencehill/lms_updates

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/lms/sv_lms.qc

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4906ab601a6a87bd61b8136e2cd2aad84ffa65c2..aa03c51a92113b594180be6aba311e7f97252994 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,81 +1,90 @@
-before_script:
-  - ln -s $PWD data/xonotic-data.pk3dir
-
-  - git clone --depth=1 --branch=master https://gitlab.com/xonotic/gmqcc.git gmqcc
-  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"
-  - cd ..
-
-report_cloc:
-  stage: test
-  script:
-    - cloc --force-lang-def=qcsrc/tools/cloc.txt --sql 1 --sql-project xonotic qcsrc | sqlite3 code.db
-    - sqlite3 code.db 'select file,nCode from t where nCode > 1000 order by nBlank+nComment+nCode desc'
-
-test_compilation_units:
-  stage: test
-  script:
-    - ./qcsrc/tools/compilationunits.sh
-
-test_sv_game:
-  stage: test
-  script:
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-    - cd ..
-
-    - mkdir -p data/maps
-    - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
-    - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-    - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-    - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
-    - make
-    - EXPECT=a98e5e5ee0cc3d2e80ee0ad812786703
-    - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
-      | tee /dev/stderr
-      | grep '^:'
-      | grep -v '^:gamestart:'
-      | grep -v '^:anticheat:'
-      | md5sum | awk '{ print $1 }')
-    - echo 'expected:' $EXPECT
-    - echo '  actual:' $HASH
-    - test "$HASH" == "$EXPECT"
-    - exit $?
-
-test_sv_unit:
-  stage: test
-  script:
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"
-    - cd ..
-
-    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
-    - make
-    - while read line; do
-        echo $line;
-        if [[ $line == "All tests OK" ]]; then exit 0; fi;
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)
-    - exit 1
-
-# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.
-# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then
-# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.
-doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB
-  stage: deploy
-  script:
-    - cd qcsrc && doxygen
-    - mv html ../public
-    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done
-    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
-    - chmod 600 ~/.ssh/id_rsa
-    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config
-    - git config --global user.name "Gitlab CI"
-    - git config --global user.email "<>"
-    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_
-    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_
-    - cp -r ../public/* ~/deploy
-    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
+workflow:\r
+  rules:\r
+    - if: $CI_COMMIT_MESSAGE =~ /Transifex autosync/\r
+      when: never\r
+    - when: always\r
+\r
+before_script:\r
+  - ln -s $PWD data/xonotic-data.pk3dir\r
+\r
+  - git clone --depth=1 --branch=main https://gitlab.com/xonotic/gmqcc.git gmqcc\r
+  - cd gmqcc && make -j $(nproc) && export QCC="$PWD/gmqcc"\r
+  - cd ..\r
+\r
+test_compilation_units:\r
+  rules:\r
+    - changes:\r
+      - qcsrc/**/*\r
+  stage: test\r
+  script:\r
+    - ./qcsrc/tools/compilationunits.sh\r
+\r
+test_sv_game:\r
+  stage: test\r
+  script:\r
+    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
+    - cd ..\r
+\r
+    - mkdir -p data/maps\r
+    - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
+    - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
+    - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
+    - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
+    - make\r
+    - EXPECT=081ecefbcad92adf350377334733c1d5\r
+    - HASH=$(${ENGINE} -noconfig -nohome +timestamps 1 +exec serverbench.cfg\r
+      | tee /dev/stderr\r
+      | sed -e 's,^\[[^]]*\] ,,'\r
+      | grep '^:'\r
+      | grep -v '^:gamestart:'\r
+      | grep -v '^:anticheat:'\r
+      | md5sum | awk '{ print $1 }')\r
+    - echo 'expected:' $EXPECT\r
+    - echo '  actual:' $HASH\r
+    - test "$HASH" == "$EXPECT"\r
+    - exit $?\r
+\r
+test_sv_unit:\r
+  stage: test\r
+  script:\r
+    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
+    - cd darkplaces && make sv-debug -j $(nproc) && export ENGINE="$PWD/darkplaces-dedicated -xonotic"\r
+    - cd ..\r
+\r
+    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
+    - make\r
+    - while read line; do\r
+        echo $line;\r
+        if [[ $line == "All tests OK" ]]; then exit 0; fi;\r
+      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)\r
+    - exit 1\r
+\r
+# NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.\r
+# With them added to PREDEFINED, it would take over half an hour to generate the docs and even then\r
+# they might not be complete. Doxygen doesn't handle #elif and might not understand some QC definitions.\r
+doxygen:  # rename to 'pages' when gitlab.com allows pages to exceed 100MiB\r
+  before_script:\r
+    - ln -s $PWD data/xonotic-data.pk3dir # is this needed?\r
+    - apt-get update\r
+    - apt-get -y install doxygen graphviz\r
+  stage: deploy\r
+  script:\r
+    - cd qcsrc && doxygen\r
+    - mv html ../public\r
+    - mkdir -p ~/.ssh\r
+    - for i in {0..0}; do eval $(printf "echo \$id_rsa_%02d\n" $i) >> ~/.ssh/id_rsa_base64; done\r
+    - base64 --decode ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa\r
+    - chmod 600 ~/.ssh/id_rsa\r
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\tLogLevel ERROR\n" >> ~/.ssh/config\r
+    - git config --global user.name "Gitlab CI"\r
+    - git config --global user.email "<>"\r
+    - git clone --single-branch --depth 1 ${DEPLOY_HOST}:${DEPLOY_REPO} ~/deploy_\r
+    - mkdir ~/deploy && mv ~/deploy_/.git ~/deploy && rm -r ~/deploy_\r
+    - cp -r ../public/* ~/deploy\r
+    - cd ~/deploy && git add -A . && git commit -m "Deploy ${CI_BUILD_REF}" && git push origin gh-pages\r
+  artifacts:\r
+    paths:\r
+      - public\r
+  only:\r
+    - master\r

diff --git a/.tx/merge-base b/.tx/merge-base
index 15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14..f61783799b00b59d7eb405b5a870c62117c33500 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  8 07:24:18 CEST 2020
+Tue Jun 15 07:23:51 CEST 2021

diff --git a/Makefile b/Makefile
index bdac716b79444e302668067c6f62c5b8b8b86c71..ab7fa6c1b79fb076e17a833941af341c0d009d08 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,9 @@ DIFF ?= diff
 # xonotic build system overrides this by command line argument to turn off the check-cvars step
 XON_BUILDSYSTEM =
 
-all: qc
+.PHONY: all
+all: check-cvars
+       $(MAKE) -C qcsrc all
 
 .PHONY: check-cvars
 check-cvars:
@@ -16,7 +18,7 @@ check-cvars:
 
 .PHONY: qc
 qc: check-cvars
-       $(MAKE) -C qcsrc
+       $(MAKE) -C qcsrc qc
 
 .PHONY: skin
 skin: gfx/menu/default/skinvalues.txt
@@ -27,3 +29,11 @@ clean:
 
 gfx/menu/default/skinvalues.txt: qcsrc/menu/skin-customizables.inc
        $(PERL) qcsrc/menu/skin-customizables.inc > gfx/menu/default/skinvalues.txt
+
+.PHONY: sv
+sv:
+       $(MAKE) -C qcsrc sv
+
+.PHONY: pk3
+pk3:
+       $(MAKE) -C qcsrc pk3

diff --git a/_hud_common.cfg b/_hud_common.cfg
index 0479f389bed5449b3e827971b9b3470b938febb8..7d697464a76097d608c1c316892cbd7e1cb0620b 100644 (file)
--- a/_hud_common.cfg
+++ b/_hud_common.cfg
@@ -45,8 +45,10 @@ seta hud_panel_centerprint      1 "enable this panel"
 seta hud_panel_itemstime        2 "enable this panel, 1 = show when spectating, 2 = even playing in warmup stage"
 //seta hud_panel_quickmenu        1 "enable this panel"
 //seta hud_panel_scoreboard       1 "enable this panel"
-seta hud_panel_scoreboard_accuracy 1 "show weapon accuracy stats panel on scoreboard; colors can be configured with accuracy_color* cvars"
+seta hud_panel_scoreboard_accuracy 1 "show weapon accuracy stats panel in the scoreboard; colors can be configured with accuracy_color* cvars"
 seta hud_panel_scoreboard_ctf_leaderboard 1 "show a capture time rankings leaderboard in the scoreboard if allowed by the server"
+seta hud_panel_scoreboard_itemstats 1 "show item stats panel in the scoreboard"
+seta hud_panel_strafehud        3 "enable this panel, 1 = show if not observing, 2 = show always, 3 = show only in race/cts if not observing"
 
 seta hud_panel_weapons_dynamichud          1 "apply the dynamic hud effects to this panel"
 seta hud_panel_ammo_dynamichud             1 "apply the dynamic hud effects to this panel"
@@ -66,6 +68,7 @@ seta hud_panel_physics_dynamichud          1 "apply the dynamic hud effects to t
 seta hud_panel_centerprint_dynamichud      1 "apply the dynamic hud effects to this panel"
 seta hud_panel_itemstime_dynamichud        1 "apply the dynamic hud effects to this panel"
 seta hud_panel_scoreboard_dynamichud       0 "apply the dynamic hud effects to this panel"
+seta hud_panel_strafehud_dynamichud        1 "apply the dynamic hud effects to this panel"
 
 seta hud_panel_weapons_ammo_full_shells 60 "show 100% of the status bar at this ammo count"
 seta hud_panel_weapons_ammo_full_nails 320 "show 100% of the status bar at this ammo count"
@@ -81,6 +84,7 @@ seta hud_panel_ammo_hide_ondeath 0 "hide this panel when dead"
 
 seta hud_panel_powerups_hide_ondeath 0 "hide this panel when dead"
 
+seta hud_panel_healtharmor_oxygenbar_startalpha "0.2" "start alpha of the oxygen bar"
 seta hud_panel_healtharmor_maxhealth "200" "when you have this much health, the health status bar is full"
 seta hud_panel_healtharmor_maxarmor "200" "when you have this much armor, the armor status bar is full"
 seta hud_panel_healtharmor_progressbar_gfx_damage 5 "show damage effect when damaged at least by this amount; 0 disables the effect"
@@ -92,6 +96,8 @@ seta hud_panel_timer_increment "0" "show elapsed time instead of remaining time"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
+seta hud_panel_engineinfo_framecounter_decimals "0" "amount of decimals to show"
+seta hud_panel_engineinfo_framecounter_time "0.1" "time between framerate display updates"
 
 seta hud_panel_physics_acceleration_movingaverage 1 "use an averaging method for calculating acceleration instead of the real value"
 seta hud_panel_physics_update_interval 0.016 "how often (in seconds) numeric values get updated on screen"
@@ -114,11 +120,67 @@ seta hud_panel_scoreboard_maxheight 0.6 "max height of the scoreboard; a few pla
 seta hud_panel_scoreboard_others_showscore 1 "show scores of players listed in the last row when the scoreboard reaches the max height"
 seta hud_panel_scoreboard_spectators_showping 1 "show ping of spectators"
 seta hud_panel_scoreboard_spectators_aligned 0 "align spectators in columns"
+seta hud_panel_scoreboard_spectators_position 1 "align spectators panel on scoreboard screen (0 = before accuracy and itemstats, 1 = before rankings, 2 = after rankings, 3 = after map stats)"
 seta hud_panel_scoreboard_minwidth 0.6 "minimum width of the scoreboard"
+seta hud_panel_scoreboard_team_size_position 0 "where to show the team size (0 = do not show, 1 = left of scoreboard, 2 = right of scoreboard), will move team scores to the other side if necessary"
+seta hud_panel_scoreboard_playerid 0 "show player id (server entity number) next to player's name"
+seta hud_panel_scoreboard_playerid_prefix "#" "player id prefix"
+seta hud_panel_scoreboard_playerid_suffix " " "player id suffix"
 
 seta hud_panel_scoreboard_accuracy_showdelay 2 "how long to delay displaying accuracy below the scoreboard if it's too far down"
 seta hud_panel_scoreboard_accuracy_showdelay_minpos 0.75 "delay displaying the accuracy panel only if its position is lower than this percentage of the screen height from the top"
-seta hud_panel_scoreboard_team_size_position 0 "where to show the team size (0 = do not show, 1 = left of scoreboard, 2 = right of scoreboard), will move team scores to the other side if necessary"
+
+seta hud_panel_scoreboard_itemstats_filter 1 "filter out less interesting items (according to hud_panel_scoreboard_itemstats_filter_mask)"
+seta hud_panel_scoreboard_itemstats_filter_mask 12 "[0-1][0-4]: the tens digit filters out all ammo items if set to 1, the units digit filters out health/armor items (1 small, 2 medium too, 3 big too, 4 mega too)"
+seta hud_panel_scoreboard_itemstats_showdelay 2.2 "how long to delay displaying item stats below the scoreboard if it's too far down"
+seta hud_panel_scoreboard_itemstats_showdelay_minpos 0.75 "delay displaying the item stats panel only if its position is lower than this percentage of the screen height from the top"
+
+seta _hud_panel_strafehud_demo "0" "strafehud changes angle during configure"
+seta hud_panel_strafehud_mode "0" "strafehud mode which controls whether the strafehud is centered at \"0\" = view angle, \"1\" = velocity angle"
+seta hud_panel_strafehud_range "0" "the angle range up to 360 degrees displayed on the strafehud, \"0\" = dynamic (chooses the minimum range required to still see the whole area needed for accelerating at once)"
+seta hud_panel_strafehud_style "1" "\"0\" = no styling, \"1\" = progress bar style for the strafe bar, \"2\" = gradient for the strafe bar"
+seta hud_panel_strafehud_unit "1" "speed unit (1 = qu/s, 2 = m/s, 3 = km/h, 4 = mph, 5 = knots), length unit (1 = qu, 2 = m, 3 = km, 4 = mi, 5 = nmi)"
+seta hud_panel_strafehud_unit_show "1" "show units"
+seta hud_panel_strafehud_bar_neutral_color "1 1 1" "color of the strafe meter neutral zone"
+seta hud_panel_strafehud_bar_neutral_alpha "0.3" "opacity of the strafe meter neutral zone"
+seta hud_panel_strafehud_bar_accel_color "0 1 0" "color of the strafe meter acceleration zone"
+seta hud_panel_strafehud_bar_accel_alpha "0.3" "opacity of the strafe meter acceleration zone"
+seta hud_panel_strafehud_bar_overturn_color "1 0 1" "color of the strafe meter overturn zone"
+seta hud_panel_strafehud_bar_overturn_alpha "0.3" "opacity of the strafe meter overturn zone"
+seta hud_panel_strafehud_angle_alpha "0.8" "opacity of the indicator showing the player's current angle"
+seta hud_panel_strafehud_angle_height "1.5" "height of the indicator showing the player's current angle (relative to the panel height)"
+seta hud_panel_strafehud_angle_width "0.005" "width of the indicator showing the player's current angle (relative to the panel width)"
+seta hud_panel_strafehud_angle_neutral_color "1 1 0" "color of the indicator showing the player's current angle if the player's angle is within the neutral zone"
+seta hud_panel_strafehud_angle_accel_color "0 1 1" "color of the indicator showing the player's current angle if the player's angle is within the acceleration zone"
+seta hud_panel_strafehud_angle_overturn_color "1 0 1" "color of the indicator showing the player's current angle if the player's angle is within the overturn zone"
+seta hud_panel_strafehud_switch_minspeed "-1" "minimum speed in qu/s at which switch indicators which are used to aid changing strafe direction will be shown (uses physics maxspeed + antiflicker speed if negative)"
+seta hud_panel_strafehud_switch_active_color "0 1 0" "color of the switch indicator on the current side"
+seta hud_panel_strafehud_switch_active_alpha "1" "opacity of the switch indicator on the current side"
+seta hud_panel_strafehud_switch_inactive_color "1 1 0" "color of the switch indicator on the opposite side"
+seta hud_panel_strafehud_switch_inactive_alpha "1" "opacity of the switch indicator on the opposite side"
+seta hud_panel_strafehud_switch_width "0.0075" "width of the strafe angle indicators (relative to the strafe bar width)"
+seta hud_panel_strafehud_direction_color "0 0.5 1" "color of the direction caps which indicate the direction the player is currently strafing towards"
+seta hud_panel_strafehud_direction_alpha "1" "opacity of the direction caps which indicate the direction the player is currently strafing towards"
+seta hud_panel_strafehud_direction_width "0.25" "stroke width of the direction caps which indicate the direction the player is currently strafing towards (relative to the panel height)"
+seta hud_panel_strafehud_direction_length "0.02" "length of the horizontal component of the direction caps which indicate the direction the player is currently strafing towards (relative to the panel width)"
+seta hud_panel_strafehud_slickdetector_range "0" "range of the slick detector in qu, \"0\" to disable"
+seta hud_panel_strafehud_slickdetector_granularity "2" "value from 0 to 4 which defines how exact the search for slick should be, higher values may yield better results but require more computation"
+seta hud_panel_strafehud_slickdetector_color "0 1 1" "color of the slick detector indicator"
+seta hud_panel_strafehud_slickdetector_alpha "0.5" "opacity of the slick detector indicator"
+seta hud_panel_strafehud_slickdetector_height "0.125" "height of the slick detector indicator (relative to the panel height)"
+seta hud_panel_strafehud_startspeed_fade "0" "fade time (in seconds) of the start speed text or \"0\" to disable"
+seta hud_panel_strafehud_startspeed_color "1 0.75 0" "color of the start speed text"
+seta hud_panel_strafehud_startspeed_size "1.5" "size of the start speed text (relative to the panel height)"
+seta hud_panel_strafehud_jumpheight_fade "0" "fade time (in seconds) of the jump height text or \"0\" to disable"
+seta hud_panel_strafehud_jumpheight_min "50" "minimum jump height to display in the selected unit"
+seta hud_panel_strafehud_jumpheight_color "0 1 0.75" "color of the jump height text"
+seta hud_panel_strafehud_jumpheight_size "1.5" "size of the jump height text (relative to the panel height)"
+seta hud_panel_strafehud_timeout_air "0.1" "time (in seconds) after take off before changing to air strafe physics when not jumping (visually more consistent hud while on slick downwards ramps)"
+seta hud_panel_strafehud_timeout_ground "0.03333333" "time (in seconds) after landing before changing to non-air strafe physics (visually more consistent hud while strafe turning when touching the floor after every hop)"
+seta hud_panel_strafehud_timeout_turn "0.1" "time (in seconds) after releasing the strafe keys before changing mode (visually more consistent hud while switching between left/right strafe turning)"
+seta hud_panel_strafehud_timeout_direction "0.5" "time (in seconds) it takes until direction changes (forward or backward movement) are applied (set to zero if you intend to sideways strafe)"
+seta hud_panel_strafehud_antiflicker_angle "0.01" "how many degrees from 0° to 180° the hud ignores if it could cause visual disturbances otherwise (and to counter rounding errors)"
+seta hud_panel_strafehud_antiflicker_speed "0.0001" "how many qu/s the hud ignores if it could cause visual disturbances otherwise (and to counter rounding errors)"
 
 // hud panel aliases
 alias quickmenu "cl_cmd hud quickmenu ${* ?}"
@@ -146,7 +208,7 @@ set _hud_showbinds_reload 0 "set it to 1 to reload binds if you changed any. It
 
 seta hud_colorflash_alpha 0.5 "starting alpha of the color flash"
 
-seta hud_damage 0.55 "an improved version of gl_polyblend for damage, draw an image instead when hurt"
+seta hud_damage 0.55 "draw a blood image when hurt (improved version of gl_polyblend)"
 seta hud_damage_blur 0 "Use postprocessing to blur the screen when you have taken damage. This can be paired with current hud damage or just used alone. Higher values = more blur"
 seta hud_damage_blur_alpha 0.5 "Amount of alpha to use when merging the blurred layers back into the render. Turning this up higher will remove bloom, so it's best to find a balance"
 seta hud_damage_gentle_alpha_multiplier 0.10 "how much to multiply alpha of flash when using the cl_gentle version, it's much more opaque than the non-gentle version"
@@ -196,6 +258,6 @@ seta hud_shownames_alpha 0.7 "alpha"
 seta hud_shownames_resize 1 "enable resizing of the names, then the size cvars will correspond to the maximum size"
 seta hud_shownames_mindistance 1000 "start fading alpha/size at this distance"
 seta hud_shownames_maxdistance 5000 "alpha/size is 0 at this distance"
-seta hud_shownames_antioverlap 1 "if two tags get too close to each other, fade out the one further away from you"
-seta hud_shownames_antioverlap_distance 50 "2d distance to other tag after which to fade out"
+seta hud_shownames_antioverlap 1 "if two tags overlap, fade out the one further away from you"
+seta hud_shownames_antioverlap_minalpha 0.4 "fade out overlapping tags to this alpha value"
 seta hud_shownames_offset 52 "offset (along z-axis) tag from player origin by this many units"

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 3f0355b5fd79cae5ecf2db48b96a386d38e4a36d..02d2d5a0f46adb114c507ccbc327b5dc57ed39c3 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -227,8 +227,6 @@ seta hud_panel_engineinfo_bg_color_team "" "override panel color with team color
 seta hud_panel_engineinfo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
 seta hud_panel_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
 seta hud_panel_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_panel_engineinfo_framecounter_decimals "" "amount of decimals to show"
-seta hud_panel_engineinfo_framecounter_time "" "time between framerate display updates"
 
 seta hud_panel_infomessages_pos "" "position of this base of the panel"
 seta hud_panel_infomessages_size "" "size of this panel"
@@ -377,6 +375,17 @@ seta hud_panel_scoreboard_table_fg_alpha_self "" "self foreground alpha of a sco
 seta hud_panel_scoreboard_table_highlight "" "enable highlighting for rows and columns in scoreboard tables"
 seta hud_panel_scoreboard_table_highlight_alpha "" "highlight alpha of a scoreboard table"
 seta hud_panel_scoreboard_table_highlight_alpha_self "" "self highlight alpha of a scoreboard table"
+seta hud_panel_scoreboard_table_highlight_alpha_eliminated "" "eliminated highlight alpha of a scoreboard table"
 seta hud_panel_scoreboard_bg_teams_color_team "" "override panel team color in team tables"
 seta hud_panel_scoreboard_accuracy_doublerows "" "use two rows instead of one"
 seta hud_panel_scoreboard_accuracy_nocolors "" "don't use colors displaying accuracy stats"
+seta hud_panel_scoreboard_itemstats_doublerows "" "use two rows instead of one"
+
+seta hud_panel_strafehud_pos "" "position of this base of the panel"
+seta hud_panel_strafehud_size "" "size of this panel"
+seta hud_panel_strafehud_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_strafehud_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_strafehud_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_strafehud_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_strafehud_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_strafehud_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 5cfa34882b2710471c8e0a44157dda9feff17eb5..1026700fc36ab0d026853d7b7442f4f3a0941070 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -216,6 +216,7 @@ set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
 set g_balance_electro_secondary_refire 0.2
 set g_balance_electro_secondary_refire2 1.6
@@ -557,6 +558,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -571,6 +573,7 @@ set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4
@@ -761,6 +764,10 @@ set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.6
 set g_balance_arc_bolt 1
 set g_balance_arc_bolt_ammo 1
+set g_balance_arc_bolt_bounce_count 0
+set g_balance_arc_bolt_bounce_explode 0
+set g_balance_arc_bolt_bounce_lifetime 0
+set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
 set g_balance_arc_bolt_edgedamage 12.5
@@ -769,6 +776,7 @@ set g_balance_arc_bolt_health 15
 set g_balance_arc_bolt_lifetime 5
 set g_balance_arc_bolt_radius 65
 set g_balance_arc_bolt_refire 0.16667
+set g_balance_arc_bolt_refire2 0.16667
 set g_balance_arc_bolt_speed 2300
 set g_balance_arc_bolt_spread 0
 set g_balance_arc_burst_ammo 15

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index f9659814b3ea91d425b172095dbc9c264a2e5418..d82db5a1545c761c6644db9ec564bd221374aef9 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -216,6 +216,7 @@ set g_balance_electro_secondary_edgedamage 0
 set g_balance_electro_secondary_force 200
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 5
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
 set g_balance_electro_secondary_refire 0.3
 set g_balance_electro_secondary_refire2 0
@@ -557,6 +558,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 1.25
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -571,6 +573,7 @@ set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0.1875
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4
@@ -761,6 +764,10 @@ set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.5
 set g_balance_arc_bolt 0
 set g_balance_arc_bolt_ammo 1
+set g_balance_arc_bolt_bounce_count 0
+set g_balance_arc_bolt_bounce_explode 0
+set g_balance_arc_bolt_bounce_lifetime 0
+set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
 set g_balance_arc_bolt_edgedamage 12.5
@@ -769,6 +776,7 @@ set g_balance_arc_bolt_health 15
 set g_balance_arc_bolt_lifetime 5
 set g_balance_arc_bolt_radius 65
 set g_balance_arc_bolt_refire 0.16667
+set g_balance_arc_bolt_refire2 0.16667
 set g_balance_arc_bolt_speed 2200
 set g_balance_arc_bolt_spread 0.03
 set g_balance_arc_burst_ammo 15

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index 6896f5f5e0be99131c379ea538b28a0ff7e3b252..8a1e40c299b03dbacc57616a1e912df55602b065 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -216,6 +216,7 @@ set g_balance_electro_secondary_edgedamage 20
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
 set g_balance_electro_secondary_refire 0.2
 set g_balance_electro_secondary_refire2 1.6
@@ -557,6 +558,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -570,6 +572,7 @@ set g_balance_rifle_secondary_animtime 0.3
 set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_force 50
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
@@ -761,6 +764,10 @@ set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.5
 set g_balance_arc_bolt 0
 set g_balance_arc_bolt_ammo 1
+set g_balance_arc_bolt_bounce_count 0
+set g_balance_arc_bolt_bounce_explode 0
+set g_balance_arc_bolt_bounce_lifetime 0
+set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
 set g_balance_arc_bolt_edgedamage 12.5
@@ -769,6 +776,7 @@ set g_balance_arc_bolt_health 15
 set g_balance_arc_bolt_lifetime 5
 set g_balance_arc_bolt_radius 65
 set g_balance_arc_bolt_refire 0.16667
+set g_balance_arc_bolt_refire2 0.16667
 set g_balance_arc_bolt_speed 2200
 set g_balance_arc_bolt_spread 0.03
 set g_balance_arc_burst_ammo 0

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index ec8029c74bf28647cae83bf57d806178f6120640..611f67bcebcf4da5bf997e3f956d048d62f1bd42 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -216,6 +216,7 @@ set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 200
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 3
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
 set g_balance_electro_secondary_refire 0.2
 set g_balance_electro_secondary_refire2 1.5
@@ -557,6 +558,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -571,6 +573,7 @@ set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4
@@ -761,6 +764,10 @@ set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.5
 set g_balance_arc_bolt 1
 set g_balance_arc_bolt_ammo 1
+set g_balance_arc_bolt_bounce_count 0
+set g_balance_arc_bolt_bounce_explode 0
+set g_balance_arc_bolt_bounce_lifetime 0
+set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
 set g_balance_arc_bolt_edgedamage 12.5
@@ -769,6 +776,7 @@ set g_balance_arc_bolt_health 15
 set g_balance_arc_bolt_lifetime 5
 set g_balance_arc_bolt_radius 65
 set g_balance_arc_bolt_refire 0.033333
+set g_balance_arc_bolt_refire2 0.03333
 set g_balance_arc_bolt_speed 2300
 set g_balance_arc_bolt_spread 0
 set g_balance_arc_burst_ammo 15

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index c38ea832f3e2c53576a9cd2d9c15538d81ca1633..cb7e71ce29e5674513c59366db4ce03dd4770374 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -107,7 +107,7 @@ set g_balance_mortar_primary_damageforcescale 0
 set g_balance_mortar_primary_edgedamage 25
 set g_balance_mortar_primary_force 250
 set g_balance_mortar_primary_health 15
-set g_balance_mortar_primary_lifetime 5
+set g_balance_mortar_primary_lifetime 20
 set g_balance_mortar_primary_lifetime_stick 0
 set g_balance_mortar_primary_radius 120
 set g_balance_mortar_primary_refire 0.8
@@ -126,7 +126,7 @@ set g_balance_mortar_secondary_damageforcescale 4
 set g_balance_mortar_secondary_edgedamage 30
 set g_balance_mortar_secondary_force 250
 set g_balance_mortar_secondary_health 30
-set g_balance_mortar_secondary_lifetime 5
+set g_balance_mortar_secondary_lifetime 20
 set g_balance_mortar_secondary_lifetime_bounce 0.5
 set g_balance_mortar_secondary_lifetime_stick 0
 set g_balance_mortar_secondary_radius 120
@@ -216,6 +216,7 @@ set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
 set g_balance_electro_secondary_refire 0.2
 set g_balance_electro_secondary_refire2 1.6
@@ -557,6 +558,7 @@ set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
+set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
 set g_balance_rifle_primary_solidpenetration 62.2
@@ -570,6 +572,7 @@ set g_balance_rifle_secondary_animtime 0.3
 set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
+set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_force 50
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
@@ -761,6 +764,10 @@ set g_balance_arc_beam_returnspeed 8
 set g_balance_arc_beam_tightness 0.6
 set g_balance_arc_bolt 1
 set g_balance_arc_bolt_ammo 1
+set g_balance_arc_bolt_bounce_count 0
+set g_balance_arc_bolt_bounce_explode 0
+set g_balance_arc_bolt_bounce_lifetime 0
+set g_balance_arc_bolt_count 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
 set g_balance_arc_bolt_edgedamage 12.5
@@ -769,6 +776,7 @@ set g_balance_arc_bolt_health 15
 set g_balance_arc_bolt_lifetime 5
 set g_balance_arc_bolt_radius 65
 set g_balance_arc_bolt_refire 0.16667
+set g_balance_arc_bolt_refire2 0.16667
 set g_balance_arc_bolt_speed 2300
 set g_balance_arc_bolt_spread 0
 set g_balance_arc_burst_ammo 15

diff --git a/balance-mario.cfg b/balance-mario.cfg
index ea4c4dbb600ff07ff440f8e4a84b708999e33af6..3ed931eb64f6b5cdbf12ccc171bbe9674a0b2acd 100644 (file)
--- a/balance-mario.cfg
+++ b/balance-mario.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index b3d856c054bb6493295fdd3f088c2c5819aa8926..b89f7caa5b3190af25d79059dd0c3cb923781e06 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 50 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 250
+set g_ca_start_armor 100
+set g_ca_start_ammo_shells 50
+set g_ca_start_ammo_nails 150
+set g_ca_start_ammo_rockets 50
+set g_ca_start_ammo_cells 50
+set g_ca_start_ammo_plasma 50
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 150
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 50
+set g_ft_start_ammo_nails 150
+set g_ft_start_ammo_rockets 50
+set g_ft_start_ammo_cells 50
+set g_ft_start_ammo_plasma 50
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 250
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 50

diff --git a/balance-overkill.cfg b/balance-overkill.cfg
index 7aea6f87f41d7d8db4ee79e8c022955d57af6baf..e3231dd0c3499b8634b479cb75d32d1edb169010 100644 (file)
--- a/balance-overkill.cfg
+++ b/balance-overkill.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 100
 set g_lms_start_ammo_shells 60

diff --git a/balance-samual.cfg b/balance-samual.cfg
index c177f30ff2502411b4da4886370fba5347f714f9..3481e191a179d9c1513f4826a8d7d50bb21069a2 100644 (file)
--- a/balance-samual.cfg
+++ b/balance-samual.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xdf.cfg b/balance-xdf.cfg
index 5ba025a88ba04c0c00718a83888c8ec267206a57..bb4c0252b3ba67f41ba01b1e62f5001d8fb7ef77 100644 (file)
--- a/balance-xdf.cfg
+++ b/balance-xdf.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg
index 8c36402ab5c49cce391eff869608b88b316ab132..823b42a748dafc9c9424146982f99bc310d4c491 100644 (file)
--- a/balance-xonotic.cfg
+++ b/balance-xonotic.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/balance-xpm.cfg b/balance-xpm.cfg
index 46e04a9504d5a55160dc20ce3e60f025e357a565..8173e38d37cbe69aedade753e9c2ca24de8a8cb4 100644 (file)
--- a/balance-xpm.cfg
+++ b/balance-xpm.cfg
@@ -25,6 +25,22 @@ set g_warmup_start_ammo_rockets 80 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_cells 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_plasma 90 "starting values when being in warmup-stage"
 set g_warmup_start_ammo_fuel 0 "starting values when being in warmup-stage"
+set g_ca_start_health 200
+set g_ca_start_armor 200
+set g_ca_start_ammo_shells 60
+set g_ca_start_ammo_nails 320
+set g_ca_start_ammo_rockets 160
+set g_ca_start_ammo_cells 180
+set g_ca_start_ammo_plasma 180
+set g_ca_start_ammo_fuel 0
+set g_ft_start_health 100
+set g_ft_start_armor 0 
+set g_ft_start_ammo_shells 60
+set g_ft_start_ammo_nails 320
+set g_ft_start_ammo_rockets 160
+set g_ft_start_ammo_cells 180
+set g_ft_start_ammo_plasma 180
+set g_ft_start_ammo_fuel 0
 set g_lms_start_health 200
 set g_lms_start_armor 200
 set g_lms_start_ammo_shells 60

diff --git a/binds-xonotic.cfg b/binds-xonotic.cfg
index 3046579ae4788b2524c51474aaf8b86590d10ead..2fa44700c0ab445368a95fa310abf4bfec5e7819 100644 (file)
--- a/binds-xonotic.cfg
+++ b/binds-xonotic.cfg
@@ -1,11 +1,11 @@
 // alias for switching the teamselect menu
-bind f5 menu_showteamselect
+bind F5 menu_showteamselect
 
-bind f6 team_auto
+bind F6 team_auto
 
-bind f7 menu_showsandboxtools
-bind f8 "quickmenu"
-bind f9 "cl_cmd hud minigame"
+bind F7 menu_showsandboxtools
+bind F8 "quickmenu"
+bind F9 "cl_cmd hud minigame"
 
 // movement
 bind w +forward
@@ -62,7 +62,7 @@ bind i +show_info
 bind PAUSE pause
 bind F9 "cl_cmd hud minigame"
 bind F10 menu_showquitdialog
-bind F11 disconnect
+bind F11 menu_showdisconnectdialog
 bind F12 screenshot
 bind F4 ready
 

diff --git a/check-translations.sh b/check-translations.sh
index 6a55b5ef732f3dff77418a4c06ead7660a8b2a6b..46ec3ec6c9121cb7bdf6bdc705a44f95545729c1 100755 (executable)
--- a/check-translations.sh
+++ b/check-translations.sh
@@ -57,7 +57,7 @@ if [ x"$mode" = x"pot" ]; then
                        echo "$name"
                done | sort -u
        } | xgettext -LC -k_ -f- --from-code utf-8 -F -o common.pot.new >&2
-       if msgcmp -N --use-untranslated common.pot common.pot.new; then
+       if msgcmp -N --use-untranslated common.pot common.pot.new && msgcmp -N --use-untranslated common.pot.new common.pot; then
                echo "No contentful changes to common.pot - OK."
                rm -f common.pot.new
        else

diff --git a/commands.cfg b/commands.cfg
index 1375a78871d11b51c9abb68ccbc2f801f46f1af5..60ffbced2ba90c275e2ea8b0ce0a1a673132d101 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -63,7 +63,7 @@ alias dumpnotifs           "qc_cmd_svmenu dumpnotifs           ${* ?}" // Dump a
 alias dumpitems            "qc_cmd_svmenu dumpitems            ${* ?}" // Dump all items to the console
 alias dumpturrets          "qc_cmd_svmenu dumpturrets          ${* ?}" // Dump all turrets into turrets_dump.txt
 alias dumpweapons          "qc_cmd_svmenu dumpweapons          ${* ?}" // Dump all weapons into weapons_dump.txt
-alias find                 "qc_cmd_svmenu find                 ${* ?}" // Search through entities for matching classname
+alias findent              "qc_cmd_svmenu findent              ${* ?}" // Search through entities for matching classname
 alias findat               "qc_cmd_svmenu findat               ${* ?}" // Search through entities for matching origin
 alias maplist              "qc_cmd_svmenu maplist              ${* ?}" // Automatic control of maplist
 alias mx                   "qc_cmd_svmenu mx                   ${* ?}" // Send a matrix command
@@ -116,6 +116,7 @@ alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 alias menu_showquitdialog "menu_cmd directmenu Quit"
+alias menu_showdisconnectdialog "menu_cmd directmenu Disconnect"
 alias menu_showmonstertools "menu_cmd directmenu MonsterTools"
 
 // command executed before loading a map by the menu
@@ -363,14 +364,14 @@ alias vstop     "qc_cmd_svcmd vote stop"
 // general
 alias vmap "vcall gotomap ${1 ?}"
 alias vnextmap "vcall nextmap ${1 ?}"
-alias vkick "vcall kick ${1 ?}"
-alias vkickban "vcall kickban ${1 ?}"
+alias vkick "vcall kick ${* ?}"
+alias vkickban "vcall kickban ${* ?}"
 alias vend "vcall endmatch"
+alias vext "vcall extendmatchtime"
 alias vdomap "vdo gotomap ${1 ?}"
 alias vdokick "vdo kick ${* ?}"
 alias vdokickban "vdo kickban ${* ?}"
 alias vdoend "vdo endmatch"
-alias vext "vcall extendmatchtime"
 
 // ======================
 //  rcon server commands

diff --git a/common.ast.po b/common.ast.po
index 2e397ca68a06e9e0fc2ac95dbf6b6754292d907d..79136daa461926bdf6311d1d2679ff67ffde351d 100644 (file)
--- a/common.ast.po
+++ b/common.ast.po
@@ -4,18 +4,19 @@
 #
 # Translators:
 # Ximielga <dorian@openmailbox.org>, 2014-2015
+# enolp <enolp@softastur.org>, 2020
 # Ḷḷumex03, 2014
 # Ḷḷumex03, 2014
 # Ḷḷumex03, 2014-2015
-# Tornes Ḷḷume <tornes.llume@openmailbox.org>, 2015-2017
+# Tornes Ḷḷume <tornes.llume@openmailbox.org>, 2015-2017,2020-2021
 # Ximielga <dorian@openmailbox.org>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-19 07:23+0200\n"
-"PO-Revision-Date: 2019-05-19 05:23+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"POT-Creation-Date: 2021-06-06 07:23+0200\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"
@@ -24,912 +25,884 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: qcsrc/client/hud/hud_config.qc:243
+#: qcsrc/client/hud/hud_config.qc:80
 #, c-format
 msgid "^2Successfully exported to %s! (Note: It's saved in data/data/)"
-msgstr ""
+msgstr "^2¡Esportóse con ésitu a %s! (Nota: Guardóse en data/data/)"
 
-#: qcsrc/client/hud/hud_config.qc:247
+#: qcsrc/client/hud/hud_config.qc:84
 #, c-format
 msgid "^1Couldn't write to %s"
-msgstr ""
+msgstr "^1Nun pudo escribise en %s"
 
-#: qcsrc/client/hud/panel/centerprint.qc:140
+#: qcsrc/client/hud/panel/centerprint.qc:173
 #, c-format
 msgid "^3Countdown message at time %s, seconds left: ^COUNT"
-msgstr ""
+msgstr "^3Mensaxe de cuenta atrás en %s, segundos que queden: ^COUNT"
 
-#: qcsrc/client/hud/panel/centerprint.qc:142
+#: qcsrc/client/hud/panel/centerprint.qc:175
 #, c-format
 msgid ""
 "^1Multiline message at time %s that\n"
 "^1lasts longer than normal"
 msgstr ""
+"^1Mensaxe de delles llines en %s que\n"
+"^1dura más de lo normal"
 
-#: qcsrc/client/hud/panel/centerprint.qc:144
+#: qcsrc/client/hud/panel/centerprint.qc:177
 #, c-format
 msgid "Message at time %s"
 msgstr ""
 
-#: qcsrc/client/hud/panel/centerprint.qc:149
+#: qcsrc/client/hud/panel/centerprint.qc:182
 msgid "Generic message"
-msgstr ""
+msgstr "Mensaxe xenéricu"
 
-#: qcsrc/client/hud/panel/chat.qc:84
+#: qcsrc/client/hud/panel/chat.qc:95
 msgid "^3Player^7: This is the chat area."
-msgstr "^3Xugador^7: Esti ye l'área de charra."
+msgstr "^3Xugador^7: Esto ye l'área pa charrar."
 
-#: qcsrc/client/hud/panel/engineinfo.qc:72
+#: qcsrc/client/hud/panel/engineinfo.qc:75
 #, c-format
 msgid "FPS: %.*f"
 msgstr "FPS: %.*f"
 
-#: qcsrc/client/hud/panel/infomessages.qc:89
+#: qcsrc/client/hud/panel/infomessages.qc:92
 msgid "^1Observing"
-msgstr "^1Agüeyando"
+msgstr "^1Mirando"
 
-#: qcsrc/client/hud/panel/infomessages.qc:91
+#: qcsrc/client/hud/panel/infomessages.qc:94
 #, c-format
 msgid "^1Spectating: ^7%s"
-msgstr ""
+msgstr "^1Yes l'espectador de ^7%s"
 
-#: qcsrc/client/hud/panel/infomessages.qc:102
+#: qcsrc/client/hud/panel/infomessages.qc:105
 #, c-format
 msgid "^1Press ^3%s^1 to spectate"
-msgstr "^1Primi ^3%s^1 pa ser espeutador"
+msgstr "^1Primi ^3%s^1 pa ser espectador"
 
-#: qcsrc/client/hud/panel/infomessages.qc:102
+#: qcsrc/client/hud/panel/infomessages.qc:105
 #: qcsrc/menu/xonotic/keybinder.qc:47
 msgid "primary fire"
-msgstr "fueu primariu"
+msgstr "Disparu primariu"
 
-#: qcsrc/client/hud/panel/infomessages.qc:104
+#: qcsrc/client/hud/panel/infomessages.qc:107
 #, c-format
 msgid "^1Press ^3%s^1 or ^3%s^1 for next or previous player"
-msgstr "^1Primi ^3%s^1 o ^3%s^1 pal xugador siguiente o postreru"
+msgstr "^1Primi ^3%s^1 o ^3%s^1 pa dir al xugador anterior o siguiente"
 
-#: qcsrc/client/hud/panel/infomessages.qc:104
-#: qcsrc/client/hud/panel/infomessages.qc:108
+#: qcsrc/client/hud/panel/infomessages.qc:107
+#: qcsrc/client/hud/panel/infomessages.qc:111
 msgid "next weapon"
 msgstr "arma siguiente"
 
-#: qcsrc/client/hud/panel/infomessages.qc:104
-#: qcsrc/client/hud/panel/infomessages.qc:108
+#: qcsrc/client/hud/panel/infomessages.qc:107
+#: qcsrc/client/hud/panel/infomessages.qc:111
 msgid "previous weapon"
-msgstr "arma previa"
+msgstr "arma anterior"
 
-#: qcsrc/client/hud/panel/infomessages.qc:108
+#: qcsrc/client/hud/panel/infomessages.qc:111
 #, c-format
 msgid "^1Use ^3%s^1 or ^3%s^1 to change the speed"
 msgstr "^1Usa ^3%s^1 o ^3%s^1 pa camudar la velocidá"
 
-#: qcsrc/client/hud/panel/infomessages.qc:110
+#: qcsrc/client/hud/panel/infomessages.qc:113
 #, c-format
 msgid "^1Press ^3%s^1 to observe, ^3%s^1 to change camera mode"
-msgstr ""
+msgstr "^1Primi ^3%s^1 pa mirar y ^3%s^1 pa camudar el mou de la cámara"
 
-#: qcsrc/client/hud/panel/infomessages.qc:110
-#: qcsrc/common/vehicles/cl_vehicles.qc:190
+#: qcsrc/client/hud/panel/infomessages.qc:113
+#: qcsrc/common/vehicles/cl_vehicles.qc:171
 msgid "drop weapon"
-msgstr "soltar arma"
+msgstr ""
 
-#: qcsrc/client/hud/panel/infomessages.qc:110
+#: qcsrc/client/hud/panel/infomessages.qc:113
 #: qcsrc/menu/xonotic/keybinder.qc:48
 msgid "secondary fire"
-msgstr "fueu secundariu"
+msgstr "Disparu secundariu"
 
-#: qcsrc/client/hud/panel/infomessages.qc:113
+#: 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:113
-#: qcsrc/menu/xonotic/keybinder.qc:105
+#: qcsrc/client/hud/panel/infomessages.qc:116
+#: qcsrc/menu/xonotic/keybinder.qc:103
 msgid "server info"
-msgstr "información del sirvidor"
-
-#: qcsrc/client/hud/panel/infomessages.qc:126
-msgid "^1Match has already begun"
-msgstr "^1L'alcuentru yá entamó"
+msgstr "Información d'un sirvidor"
 
 #: qcsrc/client/hud/panel/infomessages.qc:128
-msgid "^1You have no more lives left"
-msgstr "^1Nun tienes más vides"
-
-#: qcsrc/client/hud/panel/infomessages.qc:130
-#: qcsrc/client/hud/panel/infomessages.qc:133
 #, c-format
 msgid "^1Press ^3%s^1 to join"
 msgstr "^1Primi ^3%s^1 pa xunite"
 
-#: qcsrc/client/hud/panel/infomessages.qc:130
-#: qcsrc/client/hud/panel/infomessages.qc:133
+#: qcsrc/client/hud/panel/infomessages.qc:128
+#: qcsrc/common/notifications/all.qh:430
 msgid "jump"
-msgstr "saltar"
+msgstr ""
 
-#: qcsrc/client/hud/panel/infomessages.qc:141
+#: qcsrc/client/hud/panel/infomessages.qc:137
 #, c-format
 msgid "^1Game starts in ^3%d^1 seconds"
-msgstr "^1El xuegu entama en ^3%d^1 segundos"
+msgstr "^1La partida comienza en ^3%d^1 s"
 
-#: qcsrc/client/hud/panel/infomessages.qc:147
+#: qcsrc/client/hud/panel/infomessages.qc:143
 msgid "^2Currently in ^1warmup^2 stage!"
-msgstr "^2¡Anguaño tas na etapa ^1calentamientu^2!"
+msgstr "^2¡Tas na etapa de ^1calentamientu^2!"
 
-#: qcsrc/client/hud/panel/infomessages.qc:162
+#: qcsrc/client/hud/panel/infomessages.qc:158
 #, c-format
 msgid "%sPress ^3%s%s to end warmup"
 msgstr "%sPrimi ^3%s%s pa finar el calentamientu"
 
-#: qcsrc/client/hud/panel/infomessages.qc:162
-#: qcsrc/client/hud/panel/infomessages.qc:164
-#: qcsrc/client/hud/panel/infomessages.qc:177
-#: qcsrc/menu/xonotic/keybinder.qc:101
+#: qcsrc/client/hud/panel/infomessages.qc:158
+#: qcsrc/client/hud/panel/infomessages.qc:160
+#: qcsrc/client/hud/panel/infomessages.qc:173
+#: qcsrc/menu/xonotic/keybinder.qc:99
 msgid "ready"
-msgstr "tar preparáu"
+msgstr "Preparase"
 
-#: qcsrc/client/hud/panel/infomessages.qc:164
+#: qcsrc/client/hud/panel/infomessages.qc:160
 #, c-format
 msgid "%sPress ^3%s%s once you are ready"
-msgstr "%sPrimi ^3%s%s cuando teas llistu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/infomessages.qc:169
+#: qcsrc/client/hud/panel/infomessages.qc:165
 msgid "^2Waiting for others to ready up to end warmup..."
-msgstr "^2Esperando que tean llistos los demás pa finar el calentamientu..."
+msgstr "^2Esperando a que los demás finen el calentamientu..."
 
-#: qcsrc/client/hud/panel/infomessages.qc:171
+#: qcsrc/client/hud/panel/infomessages.qc:167
 msgid "^2Waiting for others to ready up..."
-msgstr "^2Esperando que tean llistos los demás..."
+msgstr "^2Esperando a que los demás tean preparaos..."
 
-#: qcsrc/client/hud/panel/infomessages.qc:177
+#: qcsrc/client/hud/panel/infomessages.qc:173
 #, c-format
 msgid "^2Press ^3%s^2 to end warmup"
 msgstr "^2Primi ^3%s^2 pa finar el calentamientu"
 
-#: qcsrc/client/hud/panel/infomessages.qc:198
+#: qcsrc/client/hud/panel/infomessages.qc:194
 msgid "Teamnumbers are unbalanced!"
-msgstr "!Los equipos nun tán apré!"
+msgstr "¡Los equipos tán desequilibraos!"
 
-#: qcsrc/client/hud/panel/infomessages.qc:201
+#: qcsrc/client/hud/panel/infomessages.qc:197
 #, c-format
 msgid " Press ^3%s%s to adjust"
-msgstr " Primi ^3%s%s p'axustar"
+msgstr " Primi ^3%s%s p'axustalos"
 
-#: qcsrc/client/hud/panel/infomessages.qc:201
-#: qcsrc/menu/xonotic/keybinder.qc:117
+#: qcsrc/client/hud/panel/infomessages.qc:197
+#: qcsrc/menu/xonotic/keybinder.qc:115
 msgid "team menu"
-msgstr "menú d'equipu"
+msgstr "Menú d'equipos"
 
-#: qcsrc/client/hud/panel/infomessages.qc:211
+#: qcsrc/client/hud/panel/infomessages.qc:207
 msgid "^1Spectating this player:"
-msgstr ""
+msgstr "^1Yes l'espectador del xugador:"
 
-#: qcsrc/client/hud/panel/infomessages.qc:211
+#: qcsrc/client/hud/panel/infomessages.qc:207
 msgid "^1Spectating you:"
-msgstr ""
+msgstr "^1Espectadores de to:"
 
-#: qcsrc/client/hud/panel/infomessages.qc:227
+#: qcsrc/client/hud/panel/infomessages.qc:223
 msgid "^7Press ^3ESC ^7to show HUD options."
-msgstr "^7Primi ^3ESC ^7p'amosar les opciones del HUD."
+msgstr "^7Primi ^3ESC ^7p'amosar les opciones de la interfaz."
 
-#: qcsrc/client/hud/panel/infomessages.qc:228
+#: qcsrc/client/hud/panel/infomessages.qc:224
 msgid "^3Doubleclick ^7a panel for panel-specific options."
-msgstr "^3Clic doblu ^7pa un panel d'opciones específiques."
+msgstr "^3Calca dos vegaes ^7nun panel pa ver les sos opciones espcífiques."
 
-#: qcsrc/client/hud/panel/infomessages.qc:229
+#: qcsrc/client/hud/panel/infomessages.qc:225
 msgid "^3CTRL ^7to disable collision testing, ^3SHIFT ^7and"
-msgstr "^3CTRL ^7pa deshabilitar comprobación de colisión, ^3SHIFT ^7y"
+msgstr ""
 
-#: qcsrc/client/hud/panel/infomessages.qc:230
+#: qcsrc/client/hud/panel/infomessages.qc:226
 msgid "^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments."
-msgstr "^3ALT ^7+ ^3TECLES DIREICIONALES ^7p'axustes finos."
-
-#: qcsrc/client/hud/panel/modicons.qc:576
-msgid "Personal best"
-msgstr "El meyor personal"
-
-#: qcsrc/client/hud/panel/modicons.qc:586
-msgid "Server best"
-msgstr "El meyor del sirvidor"
+msgstr "^3ALT^7 + ^3FLECHES^7 pa los axustes finos."
 
-#: qcsrc/client/hud/panel/notify.qc:117 qcsrc/client/hud/panel/notify.qc:118
-#: qcsrc/client/hud/panel/score.qc:63
+#: qcsrc/client/hud/panel/notify.qc:145 qcsrc/client/hud/panel/notify.qc:146
+#: qcsrc/client/hud/panel/score.qc:66
 #, c-format
 msgid "Player %d"
-msgstr "Xugador %d"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:591
-#: qcsrc/client/hud/panel/quickmenu.qc:593
+#: qcsrc/client/hud/panel/quickmenu.qc:611
+#: qcsrc/client/hud/panel/quickmenu.qc:613
 #, c-format
 msgid "Submenu%d"
 msgstr "Somenú%d"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:598
+#: qcsrc/client/hud/panel/quickmenu.qc:618
 #, c-format
 msgid "Command%d"
 msgstr "Comandu%d"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:624
+#: qcsrc/client/hud/panel/quickmenu.qc:644
 msgid "Continue..."
 msgstr "Siguir..."
 
-#: qcsrc/client/hud/panel/quickmenu.qc:781
-#: qcsrc/client/hud/panel/quickmenu.qc:788
+#: qcsrc/client/hud/panel/quickmenu.qc:801
+#: qcsrc/client/hud/panel/quickmenu.qc:808
 msgid "Chat"
-msgstr ""
+msgstr "Charra"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:782
+#: qcsrc/client/hud/panel/quickmenu.qc:802
 msgid "QMCMD^Send public message to"
-msgstr ""
+msgstr "Unviar un mensaxe públicu a"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:783
+#: qcsrc/client/hud/panel/quickmenu.qc:803
 msgid "QMCMD^:-) / nice one"
-msgstr "QMCMD^:-) / esa foi bona"
+msgstr "bona xugada :-)"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:783
+#: qcsrc/client/hud/panel/quickmenu.qc:803
 msgid "QMCMD^nice one"
-msgstr "QMCMD^esa foi bona"
+msgstr "bona xugada"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:784
+#: qcsrc/client/hud/panel/quickmenu.qc:804
 msgid "QMCMD^good game"
-msgstr "QMCMD^bona partida"
+msgstr "bona partida"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:785
+#: qcsrc/client/hud/panel/quickmenu.qc:805
 msgid "QMCMD^hi / good luck"
-msgstr "QMCMD^hola / bona suerte"
+msgstr "hola y bona suerte"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:785
+#: qcsrc/client/hud/panel/quickmenu.qc:805
 msgid "QMCMD^hi / good luck and have fun"
-msgstr "QMCMD^hola / bona suerte y esfrutái"
+msgstr "hola, bona suerte y pasá-ylo podre"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:787
+#: qcsrc/client/hud/panel/quickmenu.qc:807
 msgid "QMCMD^Send in English"
-msgstr ""
+msgstr "Unviar n'inglés"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:792
-#: qcsrc/client/hud/panel/quickmenu.qc:808
+#: qcsrc/client/hud/panel/quickmenu.qc:812
+#: qcsrc/client/hud/panel/quickmenu.qc:828
 msgid "QMCMD^Team chat"
-msgstr "QMCMD^Charra d'equipu"
+msgstr "Charra del equipu"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:793
-msgid "QMCMD^quad soon"
+#: qcsrc/client/hud/panel/quickmenu.qc:813
+msgid "QMCMD^strength soon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:794
+#: qcsrc/client/hud/panel/quickmenu.qc:814
 msgid "QMCMD^free item %x^7 (l:%y^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:794
+#: qcsrc/client/hud/panel/quickmenu.qc:814
 msgid "QMCMD^free item, icon"
-msgstr "QMCMD^oxetu llibre, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:795
+#: qcsrc/client/hud/panel/quickmenu.qc:815
 msgid "QMCMD^took item (l:%l^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:795
+#: qcsrc/client/hud/panel/quickmenu.qc:815
 msgid "QMCMD^took item, icon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:796
+#: qcsrc/client/hud/panel/quickmenu.qc:816
 msgid "QMCMD^negative"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:797
+#: qcsrc/client/hud/panel/quickmenu.qc:817
 msgid "QMCMD^positive"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:798
+#: qcsrc/client/hud/panel/quickmenu.qc:818
 msgid "QMCMD^need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:798
+#: qcsrc/client/hud/panel/quickmenu.qc:818
 msgid "QMCMD^need help, icon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:799
+#: qcsrc/client/hud/panel/quickmenu.qc:819
 msgid "QMCMD^enemy seen (l:%y^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:799
+#: qcsrc/client/hud/panel/quickmenu.qc:819
 msgid "QMCMD^enemy seen, icon"
-msgstr "QMCMD^enemigu vistu, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:800
+#: qcsrc/client/hud/panel/quickmenu.qc:820
 msgid "QMCMD^flag seen (l:%y^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:800
+#: qcsrc/client/hud/panel/quickmenu.qc:820
 msgid "QMCMD^flag seen, icon"
-msgstr "QMCMD^bandera vista, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:801
+#: qcsrc/client/hud/panel/quickmenu.qc:821
 msgid "QMCMD^defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:801
+#: qcsrc/client/hud/panel/quickmenu.qc:821
 msgid "QMCMD^defending, icon"
-msgstr "QMCMD^defendiendo, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:802
+#: qcsrc/client/hud/panel/quickmenu.qc:822
 msgid "QMCMD^roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:802
+#: qcsrc/client/hud/panel/quickmenu.qc:822
 msgid "QMCMD^roaming, icon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:803
+#: qcsrc/client/hud/panel/quickmenu.qc:823
 msgid "QMCMD^attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:803
+#: qcsrc/client/hud/panel/quickmenu.qc:823
 msgid "QMCMD^attacking, icon"
-msgstr "QMCMD^atacando, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:804
+#: qcsrc/client/hud/panel/quickmenu.qc:824
 msgid "QMCMD^killed flagcarrier (l:%y^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:804
+#: qcsrc/client/hud/panel/quickmenu.qc:824
 msgid "QMCMD^killed flagcarrier, icon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:805
+#: qcsrc/client/hud/panel/quickmenu.qc:825
 #, c-format
 msgid "QMCMD^dropped flag (l:%d^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:805
+#: qcsrc/client/hud/panel/quickmenu.qc:825
 msgid "QMCMD^dropped flag, icon"
-msgstr "QMCMD^bandera soltada, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:806
+#: qcsrc/client/hud/panel/quickmenu.qc:826
 msgid "QMCMD^drop weapon, icon"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:806
+#: qcsrc/client/hud/panel/quickmenu.qc:826
 msgid "QMCMD^dropped weapon %w^7 (l:%l^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:807
+#: qcsrc/client/hud/panel/quickmenu.qc:827
 msgid "QMCMD^drop flag/key, icon"
-msgstr "QMCMD^bandera/llave soltada, iconu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:807
+#: qcsrc/client/hud/panel/quickmenu.qc:827
 msgid "QMCMD^dropped flag/key %w^7 (l:%l^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:811
+#: qcsrc/client/hud/panel/quickmenu.qc:831
 msgid "QMCMD^Send private message to"
-msgstr "QMCMD^Unviar mensaxe priváu a"
+msgstr "Unviar un mensaxe priváu a"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:813
-#: qcsrc/client/hud/panel/quickmenu.qc:848
+#: qcsrc/client/hud/panel/quickmenu.qc:833
+#: qcsrc/client/hud/panel/quickmenu.qc:863
 msgid "QMCMD^Settings"
-msgstr "QMCMD^Axustes"
+msgstr "Axustes"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:814
-#: qcsrc/client/hud/panel/quickmenu.qc:821
+#: qcsrc/client/hud/panel/quickmenu.qc:834
+#: qcsrc/client/hud/panel/quickmenu.qc:841
 msgid "QMCMD^View/HUD settings"
-msgstr "QMCMD^Axustes de vista/HUD"
+msgstr "Axustes de la vista/interfaz"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:815
+#: qcsrc/client/hud/panel/quickmenu.qc:835
 msgid "QMCMD^3rd person view"
-msgstr "QMCMD^Vista en 3er persona"
+msgstr "Vista en 3ᵉʳ persona"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:816
+#: qcsrc/client/hud/panel/quickmenu.qc:836
 msgid "QMCMD^Player models like mine"
-msgstr "QMCMD^Modelos de xugador como'l de mio"
+msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:817
+#: qcsrc/client/hud/panel/quickmenu.qc:837
 msgid "QMCMD^Names above players"
-msgstr "QMCMD^Nomes enriba de xugadores"
+msgstr "Nomes enriba de los xugadores"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:818
+#: qcsrc/client/hud/panel/quickmenu.qc:838
 msgid "QMCMD^Crosshair per weapon"
-msgstr "QMCMD^Mira per arma"
+msgstr "Mira per arma"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:819
+#: qcsrc/client/hud/panel/quickmenu.qc:839
 msgid "QMCMD^FPS"
-msgstr "QMCMD^FPS"
+msgstr "FPS"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:820
+#: qcsrc/client/hud/panel/quickmenu.qc:840
 msgid "QMCMD^Net graph"
-msgstr "QMCMD^Gráficu de rede"
+msgstr "Graficu de rede"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:823
-#: qcsrc/client/hud/panel/quickmenu.qc:826
+#: qcsrc/client/hud/panel/quickmenu.qc:843
+#: qcsrc/client/hud/panel/quickmenu.qc:846
 msgid "QMCMD^Sound settings"
-msgstr "QMCMD^Axustes de soníu"
+msgstr "Axustes del soníu"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:824
+#: qcsrc/client/hud/panel/quickmenu.qc:844
 msgid "QMCMD^Hit sound"
-msgstr "QMCMD^Soníu de güelpe"
+msgstr "Soníu d'impautos"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:825
+#: qcsrc/client/hud/panel/quickmenu.qc:845
 msgid "QMCMD^Chat sound"
-msgstr "QMCMD^Soníu de charra"
-
-#: qcsrc/client/hud/panel/quickmenu.qc:830
-#: qcsrc/client/hud/panel/quickmenu.qc:834
-msgid "QMCMD^Spectator camera"
-msgstr "QMCMD^Cámara d'espeutador"
-
-#: qcsrc/client/hud/panel/quickmenu.qc:831
-msgid "QMCMD^1st person"
-msgstr "QMCMD^1er persona"
-
-#: qcsrc/client/hud/panel/quickmenu.qc:832
-msgid "QMCMD^3rd person around player"
-msgstr ""
+msgstr "Soníu de la charra"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:833
-msgid "QMCMD^3rd person behind"
-msgstr ""
+#: qcsrc/client/hud/panel/quickmenu.qc:850
+msgid "QMCMD^Change spectator camera"
+msgstr "Camudar la cámara del espectador"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:839
-#: qcsrc/client/hud/panel/quickmenu.qc:844
+#: qcsrc/client/hud/panel/quickmenu.qc:855
+#: qcsrc/client/hud/panel/quickmenu.qc:859
 msgid "QMCMD^Observer camera"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:840
+#: qcsrc/client/hud/panel/quickmenu.qc:856
 msgid "QMCMD^Increase speed"
-msgstr "QMCMD^Aumentar velocidá"
+msgstr "Aumentar la velocidá"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:841
+#: qcsrc/client/hud/panel/quickmenu.qc:857
 msgid "QMCMD^Decrease speed"
-msgstr "QMCMD^Amenorgar velocidá"
-
-#: qcsrc/client/hud/panel/quickmenu.qc:842
-msgid "QMCMD^Wall collision off"
-msgstr ""
+msgstr "Amenorgar la velocidá"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:843
-msgid "QMCMD^Wall collision on"
+#: qcsrc/client/hud/panel/quickmenu.qc:858
+msgid "QMCMD^Wall collision"
 msgstr ""
 
-#: qcsrc/client/hud/panel/quickmenu.qc:847
+#: qcsrc/client/hud/panel/quickmenu.qc:862
 msgid "QMCMD^Fullscreen"
-msgstr "QMCMD^Pantalla completa"
+msgstr "Pantalla completa"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:850
-#: qcsrc/client/hud/panel/quickmenu.qc:860
+#: qcsrc/client/hud/panel/quickmenu.qc:865
+#: qcsrc/client/hud/panel/quickmenu.qc:875
 msgid "QMCMD^Call a vote"
-msgstr "QMCMD^Llamar a votu"
+msgstr "Facer una votación"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:851
+#: qcsrc/client/hud/panel/quickmenu.qc:866
 msgid "QMCMD^Restart the map"
-msgstr "QMCMD^Reaniciar mapa"
+msgstr "Reaniciar el mapa"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:852
+#: qcsrc/client/hud/panel/quickmenu.qc:867
 msgid "QMCMD^End match"
-msgstr "QMCMD^Finar alcuentru"
+msgstr "Finar la partida"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:855
+#: qcsrc/client/hud/panel/quickmenu.qc:870
 msgid "QMCMD^Reduce match time"
-msgstr "QMCMD^Amenorgar tiempu d'alcunetru"
+msgstr "Amenorgar el tiempu de la partida"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:856
+#: qcsrc/client/hud/panel/quickmenu.qc:871
 msgid "QMCMD^Extend match time"
-msgstr "QMCMD^Superar tiempu d'alcunetru"
+msgstr "Aumentar el tiempu de la partida"
 
-#: qcsrc/client/hud/panel/quickmenu.qc:859
+#: qcsrc/client/hud/panel/quickmenu.qc:874
 msgid "QMCMD^Shuffle teams"
-msgstr "QMCMD^Equipos al debalu"
+msgstr ""
+
+#: qcsrc/client/hud/panel/quickmenu.qc:879
+msgid "QMCMD^Spectate a player"
+msgstr "Ser l'espectador d'un xugador"
 
-#: qcsrc/client/hud/panel/racetimer.qc:54
+#: qcsrc/client/hud/panel/racetimer.qc:56
 #, c-format
 msgid " (-%dL)"
-msgstr "(-%dL)"
+msgstr ""
 
-#: qcsrc/client/hud/panel/racetimer.qc:59
+#: qcsrc/client/hud/panel/racetimer.qc:61
 #, c-format
 msgid " (+%dL)"
-msgstr "(+%dL)"
+msgstr ""
 
-#: qcsrc/client/hud/panel/racetimer.qc:78
+#: qcsrc/client/hud/panel/racetimer.qc:80
 msgid "Start line"
-msgstr "Llinia d'entamu"
+msgstr "Llinia d'aniciu"
 
-#: qcsrc/client/hud/panel/racetimer.qc:80
-#: qcsrc/client/hud/panel/racetimer.qc:84
+#: qcsrc/client/hud/panel/racetimer.qc:82
+#: qcsrc/client/hud/panel/racetimer.qc:86
 msgid "Finish line"
-msgstr "Llinia de fin"
+msgstr "Llinia de meta"
 
-#: qcsrc/client/hud/panel/racetimer.qc:82
-#: qcsrc/client/hud/panel/racetimer.qc:151
+#: qcsrc/client/hud/panel/racetimer.qc:84
+#: qcsrc/client/hud/panel/racetimer.qc:153
 #, c-format
 msgid "Intermediate %d"
-msgstr "Intermediu %d"
+msgstr "Sector %d"
 
-#: qcsrc/client/hud/panel/racetimer.qc:154
-#: qcsrc/client/hud/panel/racetimer.qc:201
-#: qcsrc/client/hud/panel/racetimer.qc:262
+#: qcsrc/client/hud/panel/racetimer.qc:156
+#: qcsrc/client/hud/panel/racetimer.qc:203
+#: qcsrc/client/hud/panel/racetimer.qc:264
 #, c-format
 msgid "PENALTY: %.1f (%s)"
-msgstr ""
+msgstr "PENALIZACIÓN: %.1f (%s)"
 
-#: qcsrc/client/hud/panel/racetimer.qc:154 qcsrc/client/main.qc:1129
+#: qcsrc/client/hud/panel/racetimer.qc:156 qcsrc/client/main.qc:1174
 msgid "missing a checkpoint"
-msgstr ""
+msgstr "puntu de control saltáu"
 
-#: qcsrc/client/hud/panel/radar.qc:373
+#: qcsrc/client/hud/panel/radar.qc:349
 msgid "Click to select teleport destination"
-msgstr ""
+msgstr "Calca pa esbillar el destín del teletresporte"
 
-#: qcsrc/client/hud/panel/radar.qc:377
+#: qcsrc/client/hud/panel/radar.qc:353
 msgid "Click to select spawn location"
-msgstr ""
+msgstr "Calca pa esbillar l'allugamientu d'aprucida"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:87
+#: qcsrc/client/hud/panel/scoreboard.qc:119
 msgid "Number of ball carrier kills"
-msgstr ""
+msgstr "El númberu d'asesinatos como llevador"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:87
+#: qcsrc/client/hud/panel/scoreboard.qc:119
 msgid "SCO^bckills"
-msgstr ""
+msgstr "Ases. como llev."
 
-#: qcsrc/client/hud/panel/scoreboard.qc:88
+#: qcsrc/client/hud/panel/scoreboard.qc:120
 msgid "SCO^bctime"
-msgstr ""
+msgstr "Tmp. como llev."
 
-#: qcsrc/client/hud/panel/scoreboard.qc:88
+#: qcsrc/client/hud/panel/scoreboard.qc:120
 msgid "Total amount of time holding the ball in Keepaway"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:89
+#: qcsrc/client/hud/panel/scoreboard.qc:121
 msgid "How often a flag (CTF) or a key (KeyHunt) was captured"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:89
+#: qcsrc/client/hud/panel/scoreboard.qc:121
 msgid "SCO^caps"
-msgstr "SCO^captures"
+msgstr "Captures"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:90
+#: qcsrc/client/hud/panel/scoreboard.qc:122
 msgid "SCO^captime"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:90
+#: qcsrc/client/hud/panel/scoreboard.qc:122
 msgid "Time of fastest capture (CTF)"
-msgstr ""
+msgstr "El tiempu más rápidu de captura"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:91
+#: qcsrc/client/hud/panel/scoreboard.qc:123
 msgid "Number of deaths"
-msgstr ""
+msgstr "El númberu de muertes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:91
+#: qcsrc/client/hud/panel/scoreboard.qc:123
 msgid "SCO^deaths"
-msgstr "SCO^muertes"
+msgstr "Muertes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:92
+#: qcsrc/client/hud/panel/scoreboard.qc:124
 msgid "Number of keys destroyed by pushing them into void"
-msgstr ""
+msgstr "El númberu de llaves destruyíes por tirales al vacíu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:92
+#: qcsrc/client/hud/panel/scoreboard.qc:124
 msgid "SCO^destroyed"
-msgstr "SCO^destruyíu"
+msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:93
+#: qcsrc/client/hud/panel/scoreboard.qc:125
 msgid "SCO^damage"
-msgstr ""
+msgstr "Dañu fechu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:93
+#: qcsrc/client/hud/panel/scoreboard.qc:125
 msgid "The total damage done"
-msgstr ""
+msgstr "El dañu fechu en total"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:94
+#: qcsrc/client/hud/panel/scoreboard.qc:126
 msgid "SCO^dmgtaken"
-msgstr ""
+msgstr "Dañu recibíu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:94
+#: qcsrc/client/hud/panel/scoreboard.qc:126
 msgid "The total damage taken"
-msgstr ""
+msgstr "El dañu recibíu en total"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:95
+#: qcsrc/client/hud/panel/scoreboard.qc:127
 msgid "Number of flag drops"
-msgstr ""
+msgstr "El númberu de banderes soltaes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:95
+#: qcsrc/client/hud/panel/scoreboard.qc:127
 msgid "SCO^drops"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:96
+#: qcsrc/client/hud/panel/scoreboard.qc:128
 msgid "Player ELO"
-msgstr ""
+msgstr "L'ELO de los xugadores"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:96
+#: qcsrc/client/hud/panel/scoreboard.qc:128
 msgid "SCO^elo"
-msgstr ""
+msgstr "ELO"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:97
+#: qcsrc/client/hud/panel/scoreboard.qc:129
 msgid "SCO^fastest"
-msgstr ""
+msgstr "T. más rápidu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:97
+#: qcsrc/client/hud/panel/scoreboard.qc:129
 msgid "Time of fastest lap (Race/CTS)"
-msgstr ""
+msgstr "El tiempu de la vuelta más rápida"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:98
+#: qcsrc/client/hud/panel/scoreboard.qc:130
 msgid "Number of faults committed"
-msgstr ""
+msgstr "El númberu de faltes cometíes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:98
+#: qcsrc/client/hud/panel/scoreboard.qc:130
 msgid "SCO^faults"
-msgstr "SCO^fallos"
+msgstr "Faltes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:99
+#: qcsrc/client/hud/panel/scoreboard.qc:131
 msgid "Number of flag carrier kills"
-msgstr ""
+msgstr "El númberu d'asesinatos como llevador"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:99
+#: qcsrc/client/hud/panel/scoreboard.qc:131
 msgid "SCO^fckills"
-msgstr ""
+msgstr "Ases. como llev."
 
-#: qcsrc/client/hud/panel/scoreboard.qc:100
+#: qcsrc/client/hud/panel/scoreboard.qc:132
 msgid "FPS"
-msgstr ""
+msgstr "FPS"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:100
+#: qcsrc/client/hud/panel/scoreboard.qc:132
 msgid "SCO^fps"
-msgstr ""
+msgstr "FPS"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:101
+#: qcsrc/client/hud/panel/scoreboard.qc:133
 msgid "Number of kills minus suicides"
-msgstr ""
+msgstr "El númberu d'asesinatos menos suicidios"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:101
+#: qcsrc/client/hud/panel/scoreboard.qc:133
 msgid "SCO^frags"
-msgstr ""
+msgstr "Asesinatos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:102
+#: qcsrc/client/hud/panel/scoreboard.qc:134
 msgid "Number of goals scored"
-msgstr ""
+msgstr "El númberu de goles marcaos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:102
+#: qcsrc/client/hud/panel/scoreboard.qc:134
 msgid "SCO^goals"
-msgstr "SCO^goles"
+msgstr "Goles"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:103
+#: qcsrc/client/hud/panel/scoreboard.qc:135
 msgid "Number of keys carrier kills"
-msgstr ""
+msgstr "El númberu d'asesinatos como llevador"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:103
+#: qcsrc/client/hud/panel/scoreboard.qc:135
 msgid "SCO^kckills"
-msgstr ""
+msgstr "Ases. como llev."
 
-#: qcsrc/client/hud/panel/scoreboard.qc:104
+#: qcsrc/client/hud/panel/scoreboard.qc:136
 msgid "SCO^k/d"
-msgstr "SCO^a/m"
+msgstr "A/M"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:104
-#: qcsrc/client/hud/panel/scoreboard.qc:105
-#: qcsrc/client/hud/panel/scoreboard.qc:106
+#: qcsrc/client/hud/panel/scoreboard.qc:136
+#: qcsrc/client/hud/panel/scoreboard.qc:137
+#: qcsrc/client/hud/panel/scoreboard.qc:138
 msgid "The kill-death ratio"
-msgstr ""
+msgstr "La rellación asesinatos/muertes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:105
+#: qcsrc/client/hud/panel/scoreboard.qc:137
 msgid "SCO^kdr"
-msgstr ""
+msgstr "Rellación A/M"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:106
+#: qcsrc/client/hud/panel/scoreboard.qc:138
 msgid "SCO^kdratio"
-msgstr "SCO^tasa a/m"
+msgstr "Rellación A/M"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:107
+#: qcsrc/client/hud/panel/scoreboard.qc:139
 msgid "Number of kills"
-msgstr ""
+msgstr "El númberu d'asesinatos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:107
+#: qcsrc/client/hud/panel/scoreboard.qc:139
 msgid "SCO^kills"
-msgstr "SCO^asesinatos"
+msgstr "Asesinatos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:108
+#: qcsrc/client/hud/panel/scoreboard.qc:140
 msgid "Number of laps finished (Race/CTS)"
-msgstr ""
+msgstr "El númberu de vueltes completaes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:108
+#: qcsrc/client/hud/panel/scoreboard.qc:140
 msgid "SCO^laps"
-msgstr "SCO^vueltes"
+msgstr "Vueltes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:109
+#: qcsrc/client/hud/panel/scoreboard.qc:141
 msgid "Number of lives (LMS)"
-msgstr ""
+msgstr "El númberu de vides"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:109
+#: qcsrc/client/hud/panel/scoreboard.qc:141
 msgid "SCO^lives"
-msgstr "SCO^vides"
+msgstr "Vides"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:110
+#: qcsrc/client/hud/panel/scoreboard.qc:142
 msgid "Number of times a key was lost"
-msgstr ""
+msgstr "El númberu de vegaes que se perdió una llave"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:110
+#: qcsrc/client/hud/panel/scoreboard.qc:142
 msgid "SCO^losses"
-msgstr "SCO^perdes"
+msgstr "Perdes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:111
-#: qcsrc/client/hud/panel/scoreboard.qc:112
+#: qcsrc/client/hud/panel/scoreboard.qc:143
+#: qcsrc/client/hud/panel/scoreboard.qc:144
 msgid "Player name"
-msgstr ""
+msgstr "El nome de los xugadores"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:111
+#: qcsrc/client/hud/panel/scoreboard.qc:143
 msgid "SCO^name"
-msgstr "SCO^nome"
+msgstr "Nome"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:112
+#: qcsrc/client/hud/panel/scoreboard.qc:144
 msgid "SCO^nick"
-msgstr "SCO^nomatu"
+msgstr "Nomatu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:113
+#: qcsrc/client/hud/panel/scoreboard.qc:145
 msgid "Number of objectives destroyed"
-msgstr ""
+msgstr "El númberu d'oxetivos destruyíos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:113
+#: qcsrc/client/hud/panel/scoreboard.qc:145
 msgid "SCO^objectives"
-msgstr "SCO^oxetivos"
+msgstr "Oxetivos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:114
+#: qcsrc/client/hud/panel/scoreboard.qc:146
 msgid ""
 "How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:114
+#: qcsrc/client/hud/panel/scoreboard.qc:146
 msgid "SCO^pickups"
-msgstr "SCO^coyíes"
+msgstr "Coyíes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:115
+#: qcsrc/client/hud/panel/scoreboard.qc:147
 msgid "Ping time"
-msgstr ""
+msgstr "El tiempu del ping"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:115
+#: qcsrc/client/hud/panel/scoreboard.qc:147
 msgid "SCO^ping"
-msgstr "SCO^ping"
+msgstr "Ping"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:116
+#: qcsrc/client/hud/panel/scoreboard.qc:148
 msgid "Packet loss"
-msgstr ""
+msgstr "La perda de paquetes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:116
+#: qcsrc/client/hud/panel/scoreboard.qc:148
 msgid "SCO^pl"
-msgstr ""
+msgstr "Perda de paquetes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:117
+#: qcsrc/client/hud/panel/scoreboard.qc:149
 msgid "Number of players pushed into void"
-msgstr ""
+msgstr "El númberu de xugadores tiraos al vacíu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:117
+#: qcsrc/client/hud/panel/scoreboard.qc:149
 msgid "SCO^pushes"
-msgstr "SCO^emburrios"
+msgstr "Emburrios"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:118
+#: qcsrc/client/hud/panel/scoreboard.qc:150
 msgid "Player rank"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:118
+#: qcsrc/client/hud/panel/scoreboard.qc:150
 msgid "SCO^rank"
-msgstr "SCO^clasificación"
+msgstr "Clasificación"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:119
+#: qcsrc/client/hud/panel/scoreboard.qc:151
 msgid "Number of flag returns"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:119
+#: qcsrc/client/hud/panel/scoreboard.qc:151
 msgid "SCO^returns"
-msgstr "SCO^devoluciones"
+msgstr "Devoluciones"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:120
+#: qcsrc/client/hud/panel/scoreboard.qc:152
 msgid "Number of revivals"
-msgstr ""
+msgstr "El númberu de resurreiciones"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:120
+#: qcsrc/client/hud/panel/scoreboard.qc:152
 msgid "SCO^revivals"
-msgstr ""
+msgstr "Resurreiciones"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:121
+#: qcsrc/client/hud/panel/scoreboard.qc:153
 msgid "Number of rounds won"
-msgstr ""
+msgstr "El númberu de rondes ganaes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:121
+#: qcsrc/client/hud/panel/scoreboard.qc:153
 msgid "SCO^rounds won"
-msgstr "SCO^rondes ganaes"
+msgstr "Rondes ganaes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:122
+#: qcsrc/client/hud/panel/scoreboard.qc:154
 msgid "SCO^score"
-msgstr "SCO^puntuación"
+msgstr "Puntuación"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:122
+#: qcsrc/client/hud/panel/scoreboard.qc:154
 msgid "Total score"
-msgstr ""
+msgstr "La puntuación total"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:123
+#: qcsrc/client/hud/panel/scoreboard.qc:155
 msgid "Number of suicides"
-msgstr ""
+msgstr "El númberu de suicidios"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:123
+#: qcsrc/client/hud/panel/scoreboard.qc:155
 msgid "SCO^suicides"
-msgstr "SCO^suicidios"
+msgstr "Suicidios"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:124
+#: qcsrc/client/hud/panel/scoreboard.qc:156
 msgid "Number of kills minus deaths"
-msgstr ""
+msgstr "El númberu d'asesinatos menos muertes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:124
+#: qcsrc/client/hud/panel/scoreboard.qc:156
 msgid "SCO^sum"
-msgstr ""
+msgstr "Suma"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:125
+#: qcsrc/client/hud/panel/scoreboard.qc:157
 msgid "Number of domination points taken (Domination)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:125
+#: qcsrc/client/hud/panel/scoreboard.qc:157
 msgid "SCO^takes"
-msgstr ""
+msgstr "Coyíes"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:126
+#: qcsrc/client/hud/panel/scoreboard.qc:158
 msgid "Number of teamkills"
-msgstr ""
+msgstr "El númberu de vegaes que matesti a compañeros"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:126
+#: qcsrc/client/hud/panel/scoreboard.qc:158
 msgid "SCO^teamkills"
-msgstr ""
+msgstr "Comp. mataos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:127
+#: qcsrc/client/hud/panel/scoreboard.qc:159
 msgid "Number of ticks (Domination)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:127
+#: qcsrc/client/hud/panel/scoreboard.qc:159
 msgid "SCO^ticks"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:128
+#: qcsrc/client/hud/panel/scoreboard.qc:160
 msgid "SCO^time"
-msgstr ""
+msgstr "Tiempu"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:128
+#: qcsrc/client/hud/panel/scoreboard.qc:160
 msgid "Total time raced (Race/CTS)"
-msgstr ""
+msgstr "El tiempu total en carrerra"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:312
+#: qcsrc/client/hud/panel/scoreboard.qc:358
 msgid ""
 "You can modify the scoreboard using the ^2scoreboard_columns_set command."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:313
+#: qcsrc/client/hud/panel/scoreboard.qc:359
 msgid "Usage:"
-msgstr ""
+msgstr "Usu:"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:315
+#: qcsrc/client/hud/panel/scoreboard.qc:361
 msgid "^2scoreboard_columns_set ^3field1 field2 ..."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:316
+#: qcsrc/client/hud/panel/scoreboard.qc:362
 msgid ""
 "^2scoreboard_columns_set ^7without arguments reads the arguments from the "
 "cvar scoreboard_columns"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:317
+#: qcsrc/client/hud/panel/scoreboard.qc:363
 msgid ""
 "  ^5Note: ^7scoreboard_columns_set without arguments is executed on every "
 "map start"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:318
+#: qcsrc/client/hud/panel/scoreboard.qc:364
 msgid ""
 "^2scoreboard_columns_set ^3expand_default ^7loads default layout and expands "
 "it into the cvar scoreboard_columns so you can edit it"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:319
+#: qcsrc/client/hud/panel/scoreboard.qc:365
 msgid "You can use a ^3|^7 to start the right-aligned fields."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:320
+#: qcsrc/client/hud/panel/scoreboard.qc:366
 msgid "The following field names are recognized (case insensitive):"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:326
+#: qcsrc/client/hud/panel/scoreboard.qc:372
 msgid ""
 "Before a field you can put a + or - sign, then a comma separated list\n"
 "of game types, then a slash, to make the field show up only in these\n"
@@ -937,156 +910,167 @@ msgid ""
 "field to show all fields available for the current game mode."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:332
+#: qcsrc/client/hud/panel/scoreboard.qc:378
 msgid ""
 "The special game type names 'teams' and 'noteams' can be used to\n"
 "include/exclude ALL teams/noteams game modes."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:336
+#: qcsrc/client/hud/panel/scoreboard.qc:382
 msgid "Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:337
+#: qcsrc/client/hud/panel/scoreboard.qc:383
 msgid ""
 "will display name, ping and pl aligned to the left, and the fields\n"
 "right of the vertical bar aligned to the right."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:339
+#: qcsrc/client/hud/panel/scoreboard.qc:385
 msgid ""
 "'field3' will only be shown in CTF, and 'field4' will be shown in all\n"
 "other gamemodes except DM."
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:603
-#: qcsrc/client/hud/panel/scoreboard.qc:610
-#: qcsrc/client/hud/panel/scoreboard.qc:662
-#: qcsrc/client/hud/panel/scoreboard.qc:673
+#: qcsrc/client/hud/panel/scoreboard.qc:664
+#: qcsrc/client/hud/panel/scoreboard.qc:671
+#: qcsrc/client/hud/panel/scoreboard.qc:726
+#: qcsrc/client/hud/panel/scoreboard.qc:737
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:46
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:47
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:121
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:164
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc:169
 msgid "N/A"
-msgstr "N/A"
+msgstr "N/D"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1188
+#: qcsrc/client/hud/panel/scoreboard.qc:1248
 #, c-format
 msgid "Accuracy stats (average %d%%)"
-msgstr "Estadístiques de precisión (promediu %d%%)"
+msgstr "Estadístiques de la precisión (promediu del %d%%)"
+
+#: qcsrc/client/hud/panel/scoreboard.qc:1409
+msgid "Item stats"
+msgstr "Estadístiques d'oxetos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1336
+#: qcsrc/client/hud/panel/scoreboard.qc:1520
 msgid "Map stats:"
 msgstr "Estadístiques del mapa:"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1366
+#: qcsrc/client/hud/panel/scoreboard.qc:1550
 msgid "Monsters killed:"
-msgstr "Monstruos amortiaos:"
+msgstr "Monstruos mataos:"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1373
+#: qcsrc/client/hud/panel/scoreboard.qc:1557
 msgid "Secrets found:"
-msgstr "Secretos alcontraos:"
-
-#: qcsrc/client/hud/panel/scoreboard.qc:1395
-msgid "Capture time rankings"
-msgstr ""
+msgstr "Secretos atopaos:"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1395
-msgid "Rankings"
-msgstr "Rangos"
+#: qcsrc/client/hud/panel/scoreboard.qc:1751
+#, c-format
+msgid "Spectators"
+msgstr "Espectadores"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1613
+#: qcsrc/client/hud/panel/scoreboard.qc:1865
 #, c-format
 msgid "^3%1.0f minutes"
-msgstr ""
+msgstr "^3%1.0f minutos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1622
-#: qcsrc/client/hud/panel/scoreboard.qc:1629
+#: qcsrc/client/hud/panel/scoreboard.qc:1874
+#: qcsrc/client/hud/panel/scoreboard.qc:1881
 #, c-format
 msgid "^5%s %s"
-msgstr ""
+msgstr "^5%s %s"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1623
-#: qcsrc/client/hud/panel/scoreboard.qc:1630
-#: qcsrc/client/hud/panel/scoreboard.qc:1642
-#: qcsrc/client/hud/panel/scoreboard.qc:1649
+#: qcsrc/client/hud/panel/scoreboard.qc:1875
+#: qcsrc/client/hud/panel/scoreboard.qc:1882
+#: qcsrc/client/hud/panel/scoreboard.qc:1901
+#: qcsrc/client/hud/panel/scoreboard.qc:1908
 msgid "SCO^points"
-msgstr "SCO^puntos"
-
-#: qcsrc/client/hud/panel/scoreboard.qc:1624
-#: qcsrc/client/hud/panel/scoreboard.qc:1631
-#: qcsrc/client/hud/panel/scoreboard.qc:1643
-#: qcsrc/client/hud/panel/scoreboard.qc:1650
-msgid "SCO^is beaten"
-msgstr ""
+msgstr "Puntos"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1641
-#: qcsrc/client/hud/panel/scoreboard.qc:1648
+#: qcsrc/client/hud/panel/scoreboard.qc:1900
+#: qcsrc/client/hud/panel/scoreboard.qc:1907
 #, c-format
 msgid "^2+%s %s"
-msgstr ""
+msgstr "^2+%s %s"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1659
+#: qcsrc/client/hud/panel/scoreboard.qc:1918
 #, c-format
 msgid "^7Map: ^2%s"
-msgstr ""
+msgstr "^7Mapa: ^2%s"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1798
+#: qcsrc/client/hud/panel/scoreboard.qc:2071
 #, c-format
 msgid "Speed award: %d%s ^7(%s^7)"
 msgstr ""
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1802
+#: qcsrc/client/hud/panel/scoreboard.qc:2075
 #, c-format
 msgid "All-time fastest: %d%s ^7(%s^7)"
-msgstr ""
-
-#: qcsrc/client/hud/panel/scoreboard.qc:1818
-#, c-format
-msgid "Spectators"
-msgstr "Espeutadores"
+msgstr "Récor absolutu de tiempu: %d%s ^7(%s^7)"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1845
+#: qcsrc/client/hud/panel/scoreboard.qc:2107
 #, c-format
 msgid "^1Respawning in ^3%s^1..."
 msgstr "^1Remaneciendo en ^3%s^1..."
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1855
+#: qcsrc/client/hud/panel/scoreboard.qc:2117
 #, c-format
 msgid "You are dead, wait ^3%s^7 before respawning"
-msgstr "Tas muertu, espera ^3%s^7 enantes de remanecer"
+msgstr "Morriesti, espera ^3%s^7 enantes de remanecer"
 
-#: qcsrc/client/hud/panel/scoreboard.qc:1864
+#: qcsrc/client/hud/panel/scoreboard.qc:2126
 #, c-format
 msgid "You are dead, press ^2%s^7 to respawn"
-msgstr "Tas muertu, primi ^2%s^7 pa remanecer"
+msgstr "Morriesti, primi ^2%s^7 pa remanecer"
 
-#: qcsrc/client/hud/panel/timer.qc:67
-msgid "WARMUP"
-msgstr ""
+#: qcsrc/client/hud/panel/strafehud.qc:908
+msgid "qu"
+msgstr "qu"
 
-#: qcsrc/client/hud/panel/vote.qc:27
-msgid "^1You must answer before entering hud configure mode"
-msgstr ""
+#: qcsrc/client/hud/panel/strafehud.qc:909
+msgid "m"
+msgstr "m"
+
+#: qcsrc/client/hud/panel/strafehud.qc:910
+msgid "km"
+msgstr "km"
+
+#: qcsrc/client/hud/panel/strafehud.qc:911
+msgid "mi"
+msgstr "mi"
+
+#: qcsrc/client/hud/panel/strafehud.qc:912
+msgid "nmi"
+msgstr "nmi"
+
+#: qcsrc/client/hud/panel/timer.qc:71
+msgid "WARMUP"
+msgstr "CALENTAMIENTU"
 
 #: qcsrc/client/hud/panel/vote.qc:30
+msgid "^1You must answer before entering hud configure mode"
+msgstr "^1Has responder enantes d'entrar na configuración de la interfaz"
+
+#: qcsrc/client/hud/panel/vote.qc:33
 msgid "^2Name ^7instead of \"^1Anonymous player^7\" in stats"
-msgstr "^2Nome ^7en cuantes de \"^1Xugador anónimu^7\" nes estadístiques"
+msgstr ""
 
-#: qcsrc/client/hud/panel/vote.qc:116
+#: qcsrc/client/hud/panel/vote.qc:119
 msgid "A vote has been called for:"
-msgstr "Fíxose una votación pa:"
+msgstr "Creóse una votación pa:"
 
-#: qcsrc/client/hud/panel/vote.qc:118
+#: qcsrc/client/hud/panel/vote.qc:121
 msgid "Allow servers to store and display your name?"
-msgstr "¿Almitir a los sirvidores atroxar y amosar el to nome?"
+msgstr "¿Permitir que los sirvidores atroxen y amuesen el to nome?"
 
-#: qcsrc/client/hud/panel/vote.qc:122
+#: qcsrc/client/hud/panel/vote.qc:125
 msgid "^1Configure the HUD"
-msgstr "^1Configurar el HUD"
+msgstr "^1Configurar la interfaz"
 
-#: qcsrc/client/hud/panel/vote.qc:126 qcsrc/menu/xonotic/dialog_firstrun.qc:82
+#: qcsrc/client/hud/panel/vote.qc:129
+#: qcsrc/menu/xonotic/dialog_disconnect.qc:19
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:82
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:18
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:18
 #: qcsrc/menu/xonotic/dialog_quit.qc:14
@@ -1097,7 +1081,9 @@ msgstr "^1Configurar el HUD"
 msgid "Yes"
 msgstr "Sí"
 
-#: qcsrc/client/hud/panel/vote.qc:128 qcsrc/menu/xonotic/dialog_firstrun.qc:83
+#: qcsrc/client/hud/panel/vote.qc:131
+#: qcsrc/menu/xonotic/dialog_disconnect.qc:22
+#: qcsrc/menu/xonotic/dialog_firstrun.qc:83
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc:21
 #: qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc:21
 #: qcsrc/menu/xonotic/dialog_quit.qc:16
@@ -1108,536 +1094,564 @@ msgstr "Sí"
 msgid "No"
 msgstr "Non"
 
-#: qcsrc/client/hud/panel/weapons.qc:546
+#: qcsrc/client/hud/panel/weapons.qc:630
 msgid "Out of ammo"
 msgstr "Ensin munición"
 
-#: qcsrc/client/hud/panel/weapons.qc:550
+#: qcsrc/client/hud/panel/weapons.qc:634
 msgid "Don't have"
 msgstr "Nun tienes"
 
-#: qcsrc/client/hud/panel/weapons.qc:554
+#: qcsrc/client/hud/panel/weapons.qc:638
 msgid "Unavailable"
-msgstr "Non disponible"
+msgstr ""
 
-#: qcsrc/client/main.qc:1027
-msgid " qu/s"
-msgstr " qu/s"
+#: qcsrc/client/main.qc:289
+msgid "Trying to remove a team which is not in the teamlist!"
+msgstr ""
 
-#: qcsrc/client/main.qc:1029
-msgid " m/s"
-msgstr " m/s"
+#: qcsrc/client/main.qc:1076 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:51
+msgid "qu/s"
+msgstr "qu/s"
 
-#: qcsrc/client/main.qc:1031
-msgid " km/h"
-msgstr " km/h"
+#: qcsrc/client/main.qc:1077 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:52
+msgid "m/s"
+msgstr "m/s"
 
-#: qcsrc/client/main.qc:1033
-msgid " mph"
-msgstr " mph"
+#: qcsrc/client/main.qc:1078 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:53
+msgid "km/h"
+msgstr "km/h"
+
+#: qcsrc/client/main.qc:1079 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:54
+msgid "mph"
+msgstr "mph"
 
-#: qcsrc/client/main.qc:1035
-msgid " knots"
-msgstr "ñuedos"
+#: qcsrc/client/main.qc:1080 qcsrc/menu/xonotic/dialog_hudpanel_physics.qc:55
+msgid "knots"
+msgstr "kt"
 
-#: qcsrc/client/main.qc:1282
+#: qcsrc/client/main.qc:1327
 #, c-format
 msgid "%s (not bound)"
 msgstr ""
 
-#: qcsrc/client/mapvoting.qc:52
+#: qcsrc/client/mapvoting.qc:70
 msgid " (1 vote)"
 msgstr " (1 votu)"
 
-#: qcsrc/client/mapvoting.qc:54
+#: qcsrc/client/mapvoting.qc:72
 #, c-format
 msgid " (%d votes)"
 msgstr " (%d votos)"
 
-#: qcsrc/client/mapvoting.qc:274
+#: qcsrc/client/mapvoting.qc:292
 msgid "Don't care"
-msgstr "Nun m'importa"
+msgstr "Dame igual"
 
-#: qcsrc/client/mapvoting.qc:375
+#: qcsrc/client/mapvoting.qc:383
 msgid "Decide the gametype"
-msgstr "Decidi'l mou de xuegu"
+msgstr "Votación d'un tipu de xuegu"
 
-#: qcsrc/client/mapvoting.qc:375
+#: qcsrc/client/mapvoting.qc:383
 msgid "Vote for a map"
-msgstr "Vota un mapa"
+msgstr "Votación d'un mapa"
 
-#: qcsrc/client/mapvoting.qc:392
+#: qcsrc/client/mapvoting.qc:400
 #, c-format
 msgid "%d seconds left"
-msgstr "Falten %d segundos"
+msgstr "Nᵘ de segundos que queden: %d"
 
-#: qcsrc/client/mapvoting.qc:505
+#: qcsrc/client/mapvoting.qc:513
 msgid "mv_mapdownload: ^3You're not supposed to use this command on your own!"
-msgstr ""
+msgstr "mv_mapdownload: ^3¡Supónse que tu nun pues usar esti comandu!"
 
-#: qcsrc/client/mapvoting.qc:515
+#: qcsrc/client/mapvoting.qc:523
 msgid "^1Error:^7 Couldn't find pak index."
 msgstr ""
 
-#: qcsrc/client/mapvoting.qc:524
+#: qcsrc/client/mapvoting.qc:532
 msgid "Requesting preview..."
-msgstr ""
+msgstr "Solicitando la previsualización..."
 
-#: qcsrc/client/miscfunctions.qc:111
-msgid "Trying to remove a team which is not in the teamlist!"
-msgstr "¡Intentando desaniciar un equipu que nun ta na llista d'equipos!"
-
-#: qcsrc/client/view.qc:1518
+#: qcsrc/client/view.qc:959
 msgid "Nade timer"
-msgstr "Temporizador de granada"
+msgstr ""
 
-#: qcsrc/client/view.qc:1523
+#: qcsrc/client/view.qc:964
 msgid "Capture progress"
-msgstr "Progresu de captura"
+msgstr ""
 
-#: qcsrc/client/view.qc:1528
+#: qcsrc/client/view.qc:969
 msgid "Revival progress"
-msgstr ""
+msgstr "Progresu de la resurreición"
 
 #: qcsrc/common/command/generic.qc:156
 msgid "error creating curl handle"
 msgstr ""
 
-#: qcsrc/common/command/generic.qc:412
-msgid "Notification restart command only works with cl_cmd and sv_cmd."
+#: qcsrc/common/gamemodes/gamemode/assault/assault.qh:8
+msgid "Assault"
+msgstr "Asaltu"
+
+#: qcsrc/common/gamemodes/gamemode/assault/assault.qh:8
+msgid ""
+"Destroy obstacles to find and destroy the enemy power core before time runs "
+"out"
 msgstr ""
 
-#: qcsrc/common/gamemodes/gamemode/nexball/weapon.qh:7
-msgid "Ball Stealer"
-msgstr "Lladrón de boles"
+#: qcsrc/common/gamemodes/gamemode/assault/assault.qh:22
+#: qcsrc/common/gamemodes/gamemode/cts/cts.qh:28
+#: qcsrc/common/gamemodes/gamemode/domination/domination.qh:35
+#: qcsrc/common/gamemodes/gamemode/invasion/invasion.qh:30
+#: qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh:39
+#: qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qh:18
+#: qcsrc/common/gamemodes/gamemode/tdm/tdm.qh:47
+msgid "Point limit:"
+msgstr "Llende de puntos:"
 
-#: qcsrc/common/items/item/ammo.qh:66
-msgid "bullets"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:12
+msgid "Clan Arena"
+msgstr "Arena de clanes"
 
-#: qcsrc/common/items/item/ammo.qh:96
-msgid "cells"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:12
+msgid "Kill all enemy teammates to win the round"
+msgstr "Mata a tolos miembros d'un equipu pa ganar la ronda"
 
-#: qcsrc/common/items/item/ammo.qh:126
-msgid "plasma"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:40
+#: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:43
+#: qcsrc/common/mapinfo.qh:86
+#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:105
+msgid "Frag limit:"
+msgstr "Llende d'asesinatos"
 
-#: qcsrc/common/items/item/ammo.qh:156
-msgid "rockets"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/clanarena/clanarena.qh:40
+#: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:43
+#: qcsrc/common/mapinfo.qh:86
+msgid "The amount of frags needed before the match will end"
+msgstr "El númberu d'asesinatos precisos p'acabar la partida"
 
-#: qcsrc/common/items/item/ammo.qh:190
-msgid "shells"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/ctf/cl_ctf.qc:202
+msgid "Capture time rankings"
+msgstr "Clasificación del tiempu de captura"
 
-#: qcsrc/common/items/item/armor.qh:42
-msgid "Small armor"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:12
+msgid "Capture the Flag"
+msgstr "Captura la bandera"
 
-#: qcsrc/common/items/item/armor.qh:80
-msgid "Medium armor"
+#: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:12
+msgid ""
+"Find and bring the enemy flag to your base to capture it, defend your base "
+"from the other team"
 msgstr ""
+"Atopa y lleva la bandera enemiga a la to base pa capturala. Defendi la to "
+"base de los demás equipos"
 
-#: qcsrc/common/items/item/armor.qh:118 qcsrc/common/items/item/armor.qh:121
-msgid "Big armor"
-msgstr "Armadura grande"
+#: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:30
+msgid "Capture limit:"
+msgstr "Llende de captures"
 
-#: qcsrc/common/items/item/armor.qh:158 qcsrc/common/items/item/armor.qh:161
-msgid "Mega armor"
-msgstr "Mega armadura"
+#: qcsrc/common/gamemodes/gamemode/ctf/ctf.qh:30
+msgid "The amount of captures needed before the match will end"
+msgstr "El númberu de captures precises p'acabar la partida"
 
-#: qcsrc/common/items/item/health.qh:42
-msgid "Small health"
+#: qcsrc/common/gamemodes/gamemode/cts/cl_cts.qc:41
+#: qcsrc/common/gamemodes/gamemode/race/cl_race.qc:178
+msgid "Rankings"
 msgstr ""
 
-#: qcsrc/common/items/item/health.qh:80
-msgid "Medium health"
+#: qcsrc/common/gamemodes/gamemode/cts/cts.qh:11
+msgid "Race CTS"
 msgstr ""
 
-#: qcsrc/common/items/item/health.qh:118 qcsrc/common/items/item/health.qh:121
-msgid "Big health"
-msgstr "Salú grande"
+#: qcsrc/common/gamemodes/gamemode/cts/cts.qh:11
+msgid "Race for fastest time."
+msgstr "Cuerri pol tiempu más rápidu"
 
-#: qcsrc/common/items/item/health.qh:158 qcsrc/common/items/item/health.qh:161
-msgid "Mega health"
-msgstr "Mega salú"
+#: qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qh:8
+msgid "Deathmatch"
+msgstr "Partida a muerte"
 
-#: qcsrc/common/items/item/jetpack.qh:38 qcsrc/common/items/item/jetpack.qh:41
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:91
-#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:213
-msgid "Jetpack"
-msgstr ""
+#: qcsrc/common/gamemodes/gamemode/deathmatch/deathmatch.qh:8
+msgid "Score as many frags as you can"
+msgstr "Fai tantos asesinatos como pueas"
 
-#: qcsrc/common/items/item/jetpack.qh:71
-msgid "fuel"
+#: qcsrc/common/gamemodes/gamemode/domination/domination.qh:12
+msgid "Capture and defend all the control points to win"
+msgstr "Captura y defendi tolos puntos de control pa ganar"
+
+#: qcsrc/common/gamemodes/gamemode/domination/domination.qh:12
+msgid "Domination"
+msgstr "Dominación"
+
+#: qcsrc/common/gamemodes/gamemode/domination/domination.qh:35
+#: qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh:39
+#: qcsrc/common/gamemodes/gamemode/tdm/tdm.qh:47
+msgid "The amount of points needed before the match will end"
+msgstr "El puntos de goles precisos p'acabar la partida"
+
+#: qcsrc/common/gamemodes/gamemode/duel/duel.qh:9
+msgid "Duel"
+msgstr "Duelu"
+
+#: qcsrc/common/gamemodes/gamemode/duel/duel.qh:9
+msgid "Fight in a one versus one arena battle to decide the winner"
 msgstr ""
 
-#: qcsrc/common/items/item/jetpack.qh:96
-msgid "Fuel regenerator"
+#: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:15
+msgid "Freeze Tag"
 msgstr ""
 
-#: qcsrc/common/items/item/jetpack.qh:99
-msgid "Fuel regen"
+#: qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh:15
+msgid ""
+"Kill enemies to freeze them, stand next to frozen teammates to revive them; "
+"freeze all enemies to win"
 msgstr ""
+"Mata a los enemigos pa conxelalos, quédate al llau de los compañeros pa "
+"resucitalos. Conxela a tolos enemigos pa ganar"
 
-#: qcsrc/common/items/item/powerup.qh:43 qcsrc/common/items/item/powerup.qh:46
-msgid "Strength"
-msgstr "Fuercia"
+#: qcsrc/common/gamemodes/gamemode/invasion/invasion.qh:8
+msgid "Invasion"
+msgstr "Invasión"
 
-#: qcsrc/common/items/item/powerup.qh:79 qcsrc/common/items/item/powerup.qh:82
-msgid "Shield"
-msgstr "Proteición"
+#: qcsrc/common/gamemodes/gamemode/invasion/invasion.qh:8
+msgid "Survive against waves of monsters"
+msgstr ""
 
-#: qcsrc/common/mapinfo.qc:626
-#, no-c-format
-msgid "@!#%'n Tuba Throwing"
+#: qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh:11
+msgid "Hold the ball to get points for kills"
+msgstr "Lleva la bola pa consiguir puntos polos asesinatos"
+
+#: qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qh:11
+msgid "Keepaway"
 msgstr ""
 
-#: qcsrc/common/mapinfo.qh:72 qcsrc/common/mapinfo.qh:333
-#: qcsrc/common/mapinfo.qh:528
-#: qcsrc/menu/xonotic/dialog_multiplayer_create.qc:105
-msgid "Frag limit:"
-msgstr "Llende d'asesinatos:"
+#: qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh:11
+msgid "Gather all the keys to win the round"
+msgstr "Atropa toles llaves pa ganar la ronda"
 
-#: qcsrc/common/mapinfo.qh:72 qcsrc/common/mapinfo.qh:333
-#: qcsrc/common/mapinfo.qh:528
-msgid "The amount of frags needed before the match will end"
-msgstr "La cantidá d'asesinatos precisos enantes que fine l'alcuentru"
+#: qcsrc/common/gamemodes/gamemode/keyhunt/keyhunt.qh:11
+msgid "Key Hunt"
+msgstr "Cazallaves"
 
-#: qcsrc/common/mapinfo.qh:114
-msgid "Deathmatch"
-msgstr "Alcuentru a muerte"
+#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:18
+msgid "^1Match has already begun"
+msgstr "^1La partida yá comenzó"
 
-#: qcsrc/common/mapinfo.qh:114
-msgid "Score as many frags as you can"
-msgstr "Puntúa tantos asesinatos como pueas"
+#: qcsrc/common/gamemodes/gamemode/lms/cl_lms.qc:25
+msgid "^1You have no more lives left"
+msgstr "^1Nun te queden más vides"
 
-#: qcsrc/common/mapinfo.qh:127
+#: qcsrc/common/gamemodes/gamemode/lms/lms.qh:8
 msgid "Last Man Standing"
-msgstr "El sobreviviente caberu"
+msgstr "L'últimu en pie"
 
-#: qcsrc/common/mapinfo.qh:127
+#: qcsrc/common/gamemodes/gamemode/lms/lms.qh:8
 msgid "Survive and kill until the enemies have no lives left"
-msgstr "Sobrevivi y amortia a los enemigos fasta que nun-yos queden vides"
+msgstr "Sobrevivi y mata hasta qu'al enemigu nun-y queden vides"
 
-#: qcsrc/common/mapinfo.qh:136
+#: qcsrc/common/gamemodes/gamemode/lms/lms.qh:17
 msgid "Lives:"
 msgstr "Vides:"
 
-#: qcsrc/common/mapinfo.qh:148
-msgid "Race"
-msgstr "Carrera"
+#: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:11
+msgid "Nexball"
+msgstr "Néxbol"
 
-#: qcsrc/common/mapinfo.qh:148
-msgid "Race against other players to the finish line"
-msgstr "Cuerri escontra otros xugadores fasta la llinia de fin"
+#: 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/mapinfo.qh:175
-msgid "Laps:"
-msgstr "Vueltes:"
+#: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:25
+msgid "Goals:"
+msgstr "Goles:"
 
-#: qcsrc/common/mapinfo.qh:188
-msgid "Race CTS"
-msgstr "Carrera CTS"
+#: qcsrc/common/gamemodes/gamemode/nexball/nexball.qh:25
+msgid "The amount of goals needed before the match will end"
+msgstr "El númberu de goles precisos p'acabar la partida"
 
-#: qcsrc/common/mapinfo.qh:188
-msgid "Race for fastest time."
-msgstr "Cuerri pol tiempu más rápidu."
+#: qcsrc/common/gamemodes/gamemode/nexball/weapon.qh:9
+msgid "Ball Stealer"
+msgstr "Robaboles"
 
-#: qcsrc/common/mapinfo.qh:205 qcsrc/common/mapinfo.qh:256
-#: qcsrc/common/mapinfo.qh:372 qcsrc/common/mapinfo.qh:415
-#: qcsrc/common/mapinfo.qh:441 qcsrc/common/mapinfo.qh:461
-#: qcsrc/common/mapinfo.qh:581
-msgid "Point limit:"
+#: qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qh:8
+msgid "Capture control points to reach and destroy the enemy generator"
 msgstr ""
+"Captura los puntos de control p'algamar y destruyir el xenerador enemigu"
 
-#: qcsrc/common/mapinfo.qh:218
-msgid "Help your team score the most frags against the enemy team"
+#: qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qh:8
+msgid "Onslaught"
 msgstr ""
 
-#: qcsrc/common/mapinfo.qh:218
-msgid "Team Deathmatch"
-msgstr "Alcuentru a muerte per equipos"
-
-#: qcsrc/common/mapinfo.qh:256 qcsrc/common/mapinfo.qh:372
-#: qcsrc/common/mapinfo.qh:415
-msgid "The amount of points needed before the match will end"
-msgstr "La cantidá de puntos precisos enantes que fine l'alcuentru"
+#: qcsrc/common/gamemodes/gamemode/race/cl_race.qc:96
+msgid "Personal best"
+msgstr "El meyor t. pers"
 
-#: qcsrc/common/mapinfo.qh:270
-msgid "Capture the Flag"
-msgstr "Capturar la bandera"
+#: qcsrc/common/gamemodes/gamemode/race/cl_race.qc:106
+msgid "Server best"
+msgstr "El meyor t. del sirv."
 
-#: qcsrc/common/mapinfo.qh:270
-msgid ""
-"Find and bring the enemy flag to your base to capture it, defend your base "
-"from the other team"
-msgstr ""
-"Alcuentra y trai la bandera enemiga a la to base pa capturala, defendi la to "
-"base del otru equipu"
+#: qcsrc/common/gamemodes/gamemode/race/race.qh:11
+msgid "Race"
+msgstr "Carrera"
 
-#: qcsrc/common/mapinfo.qh:288
-msgid "Capture limit:"
-msgstr "Llende de captura:"
+#: qcsrc/common/gamemodes/gamemode/race/race.qh:11
+msgid "Race against other players to the finish line"
+msgstr "Cuerri escontra otros xugadores hasta la llinia de meta"
 
-#: qcsrc/common/mapinfo.qh:288
-msgid "The amount of captures needed before the match will end"
-msgstr "La cantidá de captures precises enantes que fine l'alcuentru"
+#: qcsrc/common/gamemodes/gamemode/race/race.qh:38
+msgid "Laps:"
+msgstr "Vueltes:"
 
-#: qcsrc/common/mapinfo.qh:305
-msgid "Clan Arena"
-msgstr "Arena de clanes"
+#: qcsrc/common/gamemodes/gamemode/tdm/tdm.qh:9
+msgid "Help your team score the most frags against the enemy team"
+msgstr "Ayuda al to equipu a facer la mayoría d'asesinatos"
 
-#: qcsrc/common/mapinfo.qh:305
-msgid "Kill all enemy teammates to win the round"
-msgstr "Amortia a tolos enemigos pa ganar la ronda"
+#: qcsrc/common/gamemodes/gamemode/tdm/tdm.qh:9
+msgid "Team Deathmatch"
+msgstr "Partida a muerte per equipos"
 
-#: qcsrc/common/mapinfo.qh:349
-msgid "Capture and defend all the control points to win"
-msgstr "Captura y defendi tolos puntos de control pa ganar"
+#: qcsrc/common/items/item/ammo.qh:67
+msgid "bullets"
+msgstr "bales"
 
-#: qcsrc/common/mapinfo.qh:349
-msgid "Domination"
-msgstr "Dominación"
+#: qcsrc/common/items/item/ammo.qh:97
+msgid "cells"
+msgstr ""
 
-#: qcsrc/common/mapinfo.qh:387
-msgid "Gather all the keys to win the round"
-msgstr "Axunta toles llaves pa ganar la ronda"
+#: qcsrc/common/items/item/ammo.qh:127
+msgid "plasma"
+msgstr "plasma"
 
-#: qcsrc/common/mapinfo.qh:387
-msgid "Key Hunt"
-msgstr "Caza-llaves"
+#: qcsrc/common/items/item/ammo.qh:157
+msgid "rockets"
+msgstr "cohetes"
 
-#: qcsrc/common/mapinfo.qh:427
-msgid "Assault"
-msgstr "Asaltu"
+#: qcsrc/common/items/item/ammo.qh:191
+msgid "shells"
+msgstr "cartuchos"
 
-#: qcsrc/common/mapinfo.qh:427
-msgid ""
-"Destroy obstacles to find and destroy the enemy power core before time runs "
-"out"
-msgstr ""
-"Destrúi los obstáculos p'alcontrar y destruyir el núcleu d'enerxía enemigu "
-"enantes que'l tiempu s'escose"
+#: qcsrc/common/items/item/armor.qh:42
+msgid "Small armor"
+msgstr "Armadura pequeña"
 
-#: qcsrc/common/mapinfo.qh:451
-msgid "Capture control points to reach and destroy the enemy generator"
-msgstr ""
-"Captura los puntos de control p'algamar y destruyir el xenerador enemigu"
+#: qcsrc/common/items/item/armor.qh:80
+msgid "Medium armor"
+msgstr "Armadura"
 
-#: qcsrc/common/mapinfo.qh:451
-msgid "Onslaught"
-msgstr ""
+#: qcsrc/common/items/item/armor.qh:118 qcsrc/common/items/item/armor.qh:121
+msgid "Big armor"
+msgstr "Armadura grande"
 
-#: qcsrc/common/mapinfo.qh:473
-msgid "Nexball"
-msgstr ""
+#: qcsrc/common/items/item/armor.qh:158 qcsrc/common/items/item/armor.qh:161
+msgid "Mega armor"
+msgstr "Megaarmadura"
 
-#: qcsrc/common/mapinfo.qh:473
-msgid "Shoot and kick the ball into the enemies goal, keep your goal clean"
-msgstr "Xuta la bola haza la portería enemiga y caltén la to portería a 0"
+#: qcsrc/common/items/item/health.qh:42
+msgid "Small health"
+msgstr "Curación pequeña"
 
-#: qcsrc/common/mapinfo.qh:487
-msgid "Goals:"
-msgstr "Goles:"
+#: qcsrc/common/items/item/health.qh:80
+msgid "Medium health"
+msgstr "Curación"
 
-#: qcsrc/common/mapinfo.qh:487
-msgid "The amount of goals needed before the match will end"
-msgstr "La cantidá de goles precisos enantes que fine l'alcuentru"
+#: qcsrc/common/items/item/health.qh:118 qcsrc/common/items/item/health.qh:121
+msgid "Big health"
+msgstr "Curación grande"
 
-#: qcsrc/common/mapinfo.qh:500
-msgid "Freeze Tag"
-msgstr ""
+#: qcsrc/common/items/item/health.qh:158 qcsrc/common/items/item/health.qh:161
+msgid "Mega health"
+msgstr "Megacuración"
 
-#: qcsrc/common/mapinfo.qh:500
-msgid ""
-"Kill enemies to freeze them, stand next to frozen teammates to revive them; "
-"freeze all enemies to win"
-msgstr ""
+#: qcsrc/common/items/item/jetpack.qh:38 qcsrc/common/items/item/jetpack.qh:41
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:91
+#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc:215
+msgid "Jetpack"
+msgstr "Mochila propulsora"
 
-#: qcsrc/common/mapinfo.qh:544
-msgid "Hold the ball to get points for kills"
-msgstr "Mantén la bola pa consiguir puntos polos asesinatos"
+#: qcsrc/common/items/item/jetpack.qh:71
+msgid "fuel"
+msgstr "combustible"
 
-#: qcsrc/common/mapinfo.qh:544
-msgid "Keepaway"
-msgstr "Allóñate"
+#: qcsrc/common/items/item/jetpack.qh:96
+msgid "Fuel regenerator"
+msgstr ""
 
-#: qcsrc/common/mapinfo.qh:559
-msgid "