From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 17 Jan 2011 09:35:03 +0000 (+0100)
Subject: fix some minor bugs
X-Git-Tag: xonotic-v0.5.0~318^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b49d68454a1223b3a51cd27e4410a595944bada;p=xonotic%2Fxonotic-data.pk3dir.git

fix some minor bugs
---

diff --git a/menu.dat.de.po b/menu.dat.de.po
index 713003c4f..7a9cff6bd 100644
--- a/menu.dat.de.po
+++ b/menu.dat.de.po
@@ -1093,7 +1093,7 @@ msgstr "GLSL für Farbregelung verwenden"
 
 #: xonotic/dialog_settings_video.c:99 xonotic/dialog_settings_audio.c:38
 msgid "Ambient:"
-msgstr "Umgebungslicht:"
+msgstr "Umgebung:"
 
 #: xonotic/dialog_settings_video.c:102
 msgid "Intensity:"
@@ -1950,7 +1950,7 @@ msgstr "Normalmaps verwenden"
 
 #: xonotic/dialog_settings_effects.c:170
 msgid "Soft shadows"
-msgstr "Weiche Schaten"
+msgstr "Weiche Schatten"
 
 #: xonotic/dialog_settings_effects.c:173
 msgid "Coronas"
diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 6f9dfce6d..81ee05667 100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -32,60 +32,62 @@ void XonoticAudioSettingsTab_fill(entity me)
 		makeMulti(s, "snd_csqcchannel2volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
 		me.TD(me, 1, 2, s);
+		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Ambient:")));
 		makeMulti(s, "snd_entchannel2volume");
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_worldchannel0volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Info:")));
 		makeMulti(s, "snd_csqcchannel0volume");
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_entchannel3volume");
 		makeMulti(s, "snd_playerchannel0volume snd_playerchannel3volume snd_csqcchannel3volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Items:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(s, "volume", "0");
 		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel6volume");
 		makeMulti(s, "snd_csqcchannel6volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Pain:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel7volume");
 		makeMulti(s, "snd_entchannel7volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Player:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(s, "volume", "0");
 		setDependentStringNotEqual(e, "mastervolume", "0");
+		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_entchannel4volume");
 		makeMulti(s, "snd_playerchannel4volume snd_entchannel6volume snd_csqcchannel4volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Shots:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
+		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_playerchannel2volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Voice:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
+		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -93,7 +95,7 @@ void XonoticAudioSettingsTab_fill(entity me)
 		makeMulti(s, "snd_playerchannel5volume snd_entchannel1volume snd_entchannel5volume");
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
 		me.TD(me, 1, 2, s);
-		setDependentStringNotEqual(e, "volume", "0");
+		setDependentStringNotEqual(e, "mastervolume", "0");
 		setDependentStringNotEqual(s, "mastervolume", "0");
 	me.TR(me);
 
diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 2135b301f..ee244931d 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -63,6 +63,6 @@ void XonoticInputSettingsTab_fill(entity me)
 		else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
 			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Turn off OS mouse acceleration")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", "\"enter console\" also closes"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("\"enter console\" also closes")));
 }
 #endif