Merge remote-tracking branch 'origin/master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / tooltips.db

diff --git a/tooltips.db b/tooltips.db
index fd9abbe535cba8e2f91add631ceaca8b9bd1cd3f..345a8e7b8458729e2f16d2b0c83da7e76d011e3c 100644 (file)
--- a/tooltips.db
+++ b/tooltips.db
@@ -43,8 +43,8 @@
 \g_weaponarena\Selecting a weapon arena will give all players that weapon at spawn as well as unlimited ammo, and disable all other weapon pickups.
 \menu_weaponarena_with_laser\Also enable the laser in the weapon arena
 \g_minstagib\Players will be given the Minstanex, which is a railgun with infinite damage. If the player runs out of ammo, he will have 10 seconds to find some or if he fails to do so, face death. The secondary fire mode is a laser which does not inflict any damage and is good for doing trickjumps.
-\g_nixnex\No items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon.
-\g_nixnex_with_laser\Always carry the laser as an additional weapon in NixNex
+\g_nix\No items Xonotic - instead of pickup items, everyone plays with the same weapon. After some time, a countdown will start, after which everyone will switch to another weapon.
+\g_nix_with_laser\Always carry the laser as an additional weapon in Nix
 \XonoticMultiplayerDialog/All\Select all maps
 \XonoticMultiplayerDialog/None\Unselect all maps