Merge branch 'master' into terencehill/string_prefixes_cleanup

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer_profile.qc

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qc b/qcsrc/menu/xonotic/dialog_firstrun.qc
index 90988703e0e5f9fa491ef0759e2a95a358b7fec3..9c38e0e04f4eed5bafe417a2fd31e2fd5286ec5b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_firstrun.qc
+++ b/qcsrc/menu/xonotic/dialog_firstrun.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
index a5a97c5503fe77f30a1064b657c2bdcd0fb67eee..136997eec0afae2a1b2451d1b5eb5d8e6af68e6f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
index 5510710c2c21a4b22e0c874dcd3dbd489021e7de..5c9bf8cb3d12ba9d6b633d1f1cd8cf27448728f8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 1adfb015eff1d85e192034eab19ce93c93f351cb..06bf7924444ffc6651b595f2e3536bb7c7b6f931 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 811cb0998f2774588359af13bee781431b1619f7..fcbbbbe0e19b6a740576762a673d725b16e21bd4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -148,9 +148,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.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index fc7e3a136abb12250ac5af16ca22e38d4b7187f9..bb0587184be7b6ca1491c4cc2730a3eb9831091a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
index 7749a148d96a5a6e77d5bb2c57123c19b106d528..9f327c3f51245c96cf4df83480c6eaceb88c92e5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
index f1707bd3f57fd414540c7ec9e026106107062a38..034608d096d396ca59142133ff54018ef5c9b62f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc
@@ -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.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc
index 0c454d3bc525de0cba701a058e704cd05850bf4c..b4ac6134834ba254d571ed93db991eede16e8bfd 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@ -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);