From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Dec 2015 00:30:01 +0000 (+0100)
Subject: Make a few strings generic
X-Git-Tag: xonotic-v0.8.2~1285^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3ec83b61dba78c5b9f057c2da0b24f9345b135d;p=xonotic%2Fxonotic-data.pk3dir.git

Make a few strings generic
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
index bc6476071..cab2d25c6 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc
@@ -51,19 +51,19 @@ void XonoticGameCrosshairSettingsTab_fill(entity me)
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair size:")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Size:")));
 			setDependent(e, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 1.9, e = makeXonoticSlider(0.1, 1.0, 0.01, "crosshair_size"));
 			setDependent(e, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair alpha:")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:")));
 			setDependent(e, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 1.9, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha"));
 			setDependent(e, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Crosshair color:")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Color:")));
 			setDependent(e, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 0.9, e = makeXonoticRadioButton(5, "crosshair_color_special", "1", _("Per weapon")));
 			setDependent(e, "crosshair_enabled", 1, 2);
@@ -84,13 +84,13 @@ void XonoticGameCrosshairSettingsTab_fill(entity me)
 			setDependent(e, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Ring size:")));
+		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Size:")));
 			setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 1.8, e = makeXonoticSlider(2, 4, 0.1, "crosshair_ring_size"));
 			setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.3);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Ring alpha:")));
+		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Alpha:")));
 			setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 1.8, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_ring_alpha"));
 			setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2);
@@ -100,19 +100,19 @@ void XonoticGameCrosshairSettingsTab_fill(entity me)
 		setDependent(e, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Dot size:")));
+		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Size:")));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 2, 0.1, "crosshair_dot_size"));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Dot alpha:")));
+		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Alpha:")));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_dot_alpha"));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
 	me.TR(me);
 		me.TDempty(me, 0.1);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Dot color:")));
+		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Color:")));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
 		me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "crosshair_dot_color_custom", "0", _("Use normal crosshair color")));
 			setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2);
diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index f46ada0f1..997c97f19 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -54,8 +54,7 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(1, 5, 1, "cl_curl_maxdownloads",
 			_("Maximum number of concurrent HTTP/FTP downloads")));
 	me.TR(me);
-		me.TDempty(me, 0.1);
-		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Speed (kB/s):")));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Speed (kB/s):")));
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(10, 2000, 50, "cl_curl_maxspeed",
 			_("Maximum download speed")));
 	me.TR(me);