Merge branch 'master' into TimePath/guide

# Conflicts:
#	qcsrc/menu/xonotic/dialog_multiplayer_media.qc

diff --cc qcsrc/common/mapinfo.qc
Simple merge

diff --cc qcsrc/common/nades.qh
index 5a9877c4ee961565ec906a8daac69de315c5ff1b,ba189c9bf8dc38cb416107cf24682f67e89eea05..85abc5b5216c0db88dde9ab9ac065082b3713cb0
--- 1/qcsrc/common/nades.qh
--- 2/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@@ -101,6 -101,6 +101,7 @@@ REGISTER_NADE(MONSTER) 
      NADE_PROJECTILE(1, PROJECTILE_NADE_MONSTER_BURN, "nade_red_burn");
  }
  
++#ifndef MENUQC
  entity Nade_FromProjectile(float proj)
  {
      FOREACH(NADES, true, LAMBDA(
@@@ -132,6 -132,6 +133,7 @@@ string Nade_TrailEffect(float proj, flo
      }
      return "";
  }
++#endif
  
  #ifdef SVQC
  float healer_send(entity to, int sf);

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media.qc
index 40c434aff79ade4d9645671a4bf344d4bac6c0a7,19c97f771f8dfb61a665fe07ee279c49a33a35e5..f37b36a677b7424c68cd9b1d3c6485c8ffaa92e3
--- 1/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
--- 2/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@@ -25,8 -25,8 +25,9 @@@ void XonoticMediaTab_fill(entity me
        mc = makeXonoticTabController(me.rows - 2);
  
        me.gotoRC(me, 0.5, 0);
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
 +              me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Guide"), NEW(XonoticGuideTab)));
+               me.TD(me, 1, 1, e = mc.makeTabButton_T(mc, _("Demos"), makeXonoticDemoBrowserTab(),
+                       _("Browse and view demos")));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
                me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Music Player"), makeXonoticMusicPlayerTab()));