From: Samual <samual@xonotic.org>
Date: Thu, 19 Jan 2012 19:32:23 +0000 (-0500)
Subject: Use ZCTX(_("")) for the translated strings where "disabled" or such arises, just... 
X-Git-Tag: xonotic-v0.6.0~117
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09c624791a05cd5c207e30af0d5aaca32f0e899d;p=xonotic%2Fxonotic-data.pk3dir.git

Use ZCTX(_("")) for the translated strings where "disabled" or such arises, just in case the string needs to be specific to the option
---

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 47cbd15bb..95273901a 100644
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -19,8 +19,13 @@ float CheckFirstRunButton(entity me)
 {
 	if(cvar_string("_cl_name") != "Player")
 		return 1;
+		
 	if(cvar_string("prvm_language") != prvm_language)
 		return 1; // OK will then reopen the dialog in another language
+		
+	if(cvar_string("cl_allow_uid2name") != "-1")
+		return 1; 
+		
 	return 0;
 }
 
@@ -73,9 +78,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", _("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")));
+	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"))));
 
 	// because of the language selector, this is a menu_restart!
 	me.gotoRC(me, me.rows - 1, 0);
diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index edc9f517b..051520549 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -80,41 +80,41 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
-			e.addValue(e, _("5 fps"), "5");
-			e.addValue(e, _("10 fps"), "10");
-			e.addValue(e, _("20 fps"), "20");
-			e.addValue(e, _("30 fps"), "30");
-			e.addValue(e, _("40 fps"), "40");
-			e.addValue(e, _("50 fps"), "50");
-			e.addValue(e, _("60 fps"), "60");
-			e.addValue(e, _("70 fps"), "70");
-			e.addValue(e, _("100 fps"), "100");
-			e.addValue(e, _("125 fps"), "125");
-			e.addValue(e, _("200 fps"), "200");
-			e.addValue(e, _("Unlimited"), "0");
+			e.addValue(e, ZCTX(_("MAXFPS^5 fps")), "5");
+			e.addValue(e, ZCTX(_("MAXFPS^10 fps")), "10");
+			e.addValue(e, ZCTX(_("MAXFPS^20 fps")), "20");
+			e.addValue(e, ZCTX(_("MAXFPS^30 fps")), "30");
+			e.addValue(e, ZCTX(_("MAXFPS^40 fps")), "40");
+			e.addValue(e, ZCTX(_("MAXFPS^50 fps")), "50");
+			e.addValue(e, ZCTX(_("MAXFPS^60 fps")), "60");
+			e.addValue(e, ZCTX(_("MAXFPS^70 fps")), "70");
+			e.addValue(e, ZCTX(_("MAXFPS^100 fps")), "100");
+			e.addValue(e, ZCTX(_("MAXFPS^125 fps")), "125");
+			e.addValue(e, ZCTX(_("MAXFPS^200 fps")), "200");
+			e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Target:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
-			e.addValue(e, _("Disabled"), "0");
-			e.addValue(e, _("30 fps"), "30");
-			e.addValue(e, _("40 fps"), "40");
-			e.addValue(e, _("50 fps"), "50");
-			e.addValue(e, _("60 fps"), "60");
-			e.addValue(e, _("100 fps"), "100");
-			e.addValue(e, _("125 fps"), "125");
-			e.addValue(e, _("200 fps"), "200");
+			e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
+			e.addValue(e, ZCTX(_("TRGT^30 fps")), "30");
+			e.addValue(e, ZCTX(_("TRGT^40 fps")), "40");
+			e.addValue(e, ZCTX(_("TRGT^50 fps")), "50");
+			e.addValue(e, ZCTX(_("TRGT^60 fps")), "60");
+			e.addValue(e, ZCTX(_("TRGT^100 fps")), "100");
+			e.addValue(e, ZCTX(_("TRGT^125 fps")), "125");
+			e.addValue(e, ZCTX(_("TRGT^200 fps")), "200");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Idle limit:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxidlefps"));
-			e.addValue(e, _("10 fps"), "10");
-			e.addValue(e, _("20 fps"), "20");
-			e.addValue(e, _("30 fps"), "30");
-			e.addValue(e, _("60 fps"), "60");
-			e.addValue(e, _("Unlimited"), "0");
+			e.addValue(e, ZCTX(_("IDLFPS^10 fps")), "10");
+			e.addValue(e, ZCTX(_("IDLFPS^20 fps")), "20");
+			e.addValue(e, ZCTX(_("IDLFPS^30 fps")), "30");
+			e.addValue(e, ZCTX(_("IDLFPS^60 fps")), "60");
+			e.addValue(e, ZCTX(_("IDLFPS^Unlimited")), "0");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 	me.TR(me);
@@ -128,9 +128,9 @@ void XonoticMiscSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
-			e.addValue(e, _("Disabled"), "0");
-			e.addValue(e, _("Standard"), "1");
-			e.addValue(e, _("Advanced"), "2");
+			e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
+			e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");
+			e.addValue(e, ZCTX(_("TLTIP^Advanced")), "2");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 	me.TR(me);