From: terencehill <piuntn@gmail.com>
Date: Tue, 20 Jan 2015 19:59:38 +0000 (+0100)
Subject: Cleanup string prefixes
X-Git-Tag: xonotic-v0.8.1~130^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa7127f2d3630e76c50d1cecfdc50c4a4836ee81;p=xonotic%2Fxonotic-data.pk3dir.git

Cleanup string prefixes
---

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 90988703e..9c38e0e04 100644
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -84,9 +84,9 @@ void XonoticFirstRunDialog_fill(entity me)
 
 	me.gotoRC(me, me.rows - 3, 0);
 	me.TDempty(me, 1.5);
-	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "1", ZCTX(_("ALWU2N^Yes"))));
-	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "0", ZCTX(_("ALWU2N^No"))));
-	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "-1", ZCTX(_("ALWU2N^Undecided"))));
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "1", _("Yes")));
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "0", _("No")));
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "-1", _("Undecided")));
 
 	// because of the language selector, this is a menu_restart!
 	me.gotoRC(me, me.rows - 1, 0);
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c
index a5a97c550..136997eec 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.c
@@ -21,10 +21,10 @@ void XonoticDemoStartConfirmDialog_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Do you really wish to disconnect now?")));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("DMCNFRM^Yes")), '1 0 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Yes"), '1 0 0'));
 			e.onClick = Handle_StartDemo_Click;
 			e.onClickEntity = demolist;
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("DMCNFRM^No")), '0 1 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c
index 5510710c2..5c9bf8cb3 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.c
@@ -21,10 +21,10 @@ void XonoticDemoTimeConfirmDialog_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Do you really wish to disconnect now?")));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("DMCNFRM^Yes")), '1 0 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Yes"), '1 0 0'));
 			e.onClick = Handle_TimeDemo_Click;
 			e.onClickEntity = demolist;
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("DMCNFRM^No")), '0 1 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.c b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c
index a316be73b..5f90ce95e 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c
@@ -142,9 +142,9 @@ void XonoticProfileTab_fill(entity me)
 	#if 0
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gender:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_gender"));
-			e.addValue(e, ZCTX(_("GENDER^Undisclosed")), "0");
-			e.addValue(e, ZCTX(_("GENDER^Female")), "1");
-			e.addValue(e, ZCTX(_("GENDER^Male")), "2");
+			e.addValue(e, _("Undisclosed"), "0");
+			e.addValue(e, _("Female"), "1");
+			e.addValue(e, _("Male"), "2");
 			e.configureXonoticTextSliderValues(e);
 	#else
 			me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Gender")));
diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 59b4860af..09ec8d470 100644
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -149,9 +149,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Damage effects:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_damageeffect"));
-			e.addValue(e, _("Disabled"), "0");
+			e.addValue(e, ZCTX(_("DMGFX^Disabled")), "0");
 			e.addValue(e, _("Skeletal"), "1");
-			e.addValue(e, _("All"), "2");
+			e.addValue(e, ZCTX(_("DMGFX^All")), "2");
 			e.configureXonoticTextSliderValues(e);
 
 	me.gotoRC(me, 1.25, 3.2); me.setFirstColumn(me, me.currentColumn);
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.c b/qcsrc/menu/xonotic/dialog_settings_game_hud.c
index fc7e3a136..bb0587184 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.c
@@ -142,9 +142,9 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Decolorize:")));
 			setDependent(e, "hud_shownames", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_shownames_decolorize"));
-			e.addValue(e, ZCTX(_("Never")), "0");
-			e.addValue(e, ZCTX(_("Teamplay")), "1");
-			e.addValue(e, ZCTX(_("Always")), "2");
+			e.addValue(e, _("Never"), "0");
+			e.addValue(e, _("Teamplay"), "1");
+			e.addValue(e, _("Always"), "2");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "hud_shownames", 1, 1);
 
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c
index 7749a148d..9f327c3f5 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.c
@@ -30,10 +30,10 @@ void XonoticHUDConfirmDialog_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Do you wish to start a local game to set up the HUD?")));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("HDCNFRM^Yes")), '1 0 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Yes"), '1 0 0'));
 			e.onClick = HUDSetup_Start;
 			e.onClickEntity = me;
-		me.TD(me, 1, 1, e = makeXonoticButton(ZCTX(_("HDCNFRM^No")), '0 1 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.c b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
index 6f605ccbc..399437d4a 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
@@ -52,10 +52,10 @@ void XonoticGameMessageSettingsTab_fill(entity me)
 		me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Sprees in info messages:")));
 			setDependent(e, "notification_show_sprees", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("notification_show_sprees_info"));
-			e.addValue(e, ZCTX(_("Disabled")), "0");
-			e.addValue(e, ZCTX(_("Target")), "1");
-			e.addValue(e, ZCTX(_("Attacker")), "2");
-			e.addValue(e, ZCTX(_("Both")), "3");
+			e.addValue(e, ZCTX(_("SPREES^Disabled")), "0");
+			e.addValue(e, _("Target"), "1");
+			e.addValue(e, _("Attacker"), "2");
+			e.addValue(e, ZCTX(_("SPREES^Both")), "3");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "notification_show_sprees", 1, 1);
 	#endif
diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 57b6cef63..01e207c74 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -91,9 +91,9 @@ void XonoticInputSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Jetpack on jump:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_jetpack_jump"));
-			e.addValue(e, _("Disabled"), "0");
+			e.addValue(e, ZCTX(_("JPJUMP^Disabled")), "0");
 			e.addValue(e, _("Air only"), "1");
-			e.addValue(e, _("All"), "2");
+			e.addValue(e, ZCTX(_("JPJUMP^All")), "2");
 			e.configureXonoticTextSliderValues(e);
 			e.sendCvars = TRUE;
 	me.TR(me);