Change last instances of nixnex into nix

diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 1cc5c9c65b0408f8def27fce190bcc33d5f3236f..a4131af40e8a530f223822db10df609652e6ac29 100644 (file)
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -191,7 +191,7 @@ MUTATOR_HOOKFUNCTION(nix_FilterItem)
 
 MUTATOR_HOOKFUNCTION(nix_OnEntityPreSpawn)
 {
-       if(self.classname == "target_items") // items triggers cannot work in nixnex (as they change weapons/ammo)
+       if(self.classname == "target_items") // items triggers cannot work in nix (as they change weapons/ammo)
                return 1;
        return 0;
 }

diff --git a/tooltips.db b/tooltips.db
index a0443b70352e8a8477e5570f332925589c782127..ac4ac0403b604db926967a280ee3e4c30cce11c6 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
 

diff --git a/tooltips.db.de b/tooltips.db.de
index b23b40eab2691ac83d0c4534d2d3622b6fbcd852..959dc7afdb0ae84dd036d81a2ae9a5bc4b859168 100644 (file)
--- a/tooltips.db.de
+++ b/tooltips.db.de
@@ -45,7 +45,7 @@
 \menu_weaponarena_with_laser\Aktiviere auch den Laser in der Waffen-Arena.
 \g_minstagib\Alle Spieler starten mit der Minstanex, eine elektromagnetische Schienenkanone mit unendlich viel Schaden. Wenn ein Spieler keine Munition mehr hat, bleiben ihm 10 Sekunden um neue zu finden, ansonsten stirbt er. Der 2. Feuermodus ist Laser, welcher keinen Schaden hinzufügen kann. Dieser eignet sich gut für Tricksprünge.
 \g_nix\Es gibt keine aufzusammelnden Gegenstände in Xonotic - Anstelle der Möglichkeit Waffen aufzusammeln, spielen alle mit der gleichen Waffe. Nach einiger Zeit startet ein Countdown, danach wechseln alle Spieler zu einer neuen gleichen Waffe.
-\g_nix_with_laser\In NixNex ist als zweite Waffe der Laser vorhanden.
+\g_nix_with_laser\In Nix ist als zweite Waffe der Laser vorhanden.
 \XonoticMultiplayerDialog/All\Wähle alle Maps.
 \XonoticMultiplayerDialog/None\Wähle alle Maps ab.
 

diff --git a/tooltips.db.fr b/tooltips.db.fr
index cf672c3e40a50841241e18166b4a1cfb78fd802d..1ab14650e365dcf4d23c5f9bd33c1da7cae12be0 100644 (file)
--- a/tooltips.db.fr
+++ b/tooltips.db.fr
@@ -42,8 +42,8 @@
 \g_weaponarena\Séléctionner une arène d'une seule arme donne des munitions illimitées pour cette arme, et désactive toutes les autres armes
 \menu_weaponarena_with_laser\Also enable the laser in the weapon arena
 \g_minstagib\Tous les joueurs reçoivent un MinstaNex, qui est un sniper hyperpuissant qui tue d'un coup. Si vous n'avez plus de munitions, vous mourez progressivement.
-\g_nixnex\No Items Xonotic; tous les joueurs ont la même arme en même temps, et on change d'arme régulièrement
-\g_nixnex_with_laser\Porter le laser avec l'arme du No Items Xonotic
+\g_nix\No Items Xonotic; tous les joueurs ont la même arme en même temps, et on change d'arme régulièrement
+\g_nix_with_laser\Porter le laser avec l'arme du No Items Xonotic
 \XonoticMultiplayerDialog/All\Séléctionner toutes les cartes
 \XonoticMultiplayerDialog/None\Déséléctionner toutes les cartes
 

diff --git a/tooltips.db.ru b/tooltips.db.ru
index c5ba916a120d85611590e7629a0a129b699d6904..914d3d47ef3e2075b921f6a02848c96be72bf5c4 100644 (file)
--- a/tooltips.db.ru
+++ b/tooltips.db.ru
@@ -42,8 +42,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\Выбрать все карты
 \XonoticMultiplayerDialog/None\Снять выделение со всех карт