Merge branch 'master' into terencehill/tooltips_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_create.qc

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
index bafd9b6ff3b3163893a2af0e9f3aaedf3a18b37b..eeab84e363b4cf4098b9635f2c972c3edeee71fb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qc
@@ -77,26 +77,28 @@ void XonoticServerCreateTab_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Time limit:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider_T("timelimit_override",
                        _("Timelimit in minutes that when hit, will end the match")));
+                       #define ADDVALUE_MINUTES(i) e.addValue(e, strzone(sprintf(_("%d minutes"), i)), #i)
                        e.addValue(e, ZCTX(_("TIMLIM^Default")), "-1");
-                       e.addValue(e, ZCTX(_("TIMLIM^1 minute")), "1");
-                       e.addValue(e, ZCTX(_("TIMLIM^2 minutes")), "2");
-                       e.addValue(e, ZCTX(_("TIMLIM^3 minutes")), "3");
-                       e.addValue(e, ZCTX(_("TIMLIM^4 minutes")), "4");
-                       e.addValue(e, ZCTX(_("TIMLIM^5 minutes")), "5");
-                       e.addValue(e, ZCTX(_("TIMLIM^6 minutes")), "6");
-                       e.addValue(e, ZCTX(_("TIMLIM^7 minutes")), "7");
-                       e.addValue(e, ZCTX(_("TIMLIM^8 minutes")), "8");
-                       e.addValue(e, ZCTX(_("TIMLIM^9 minutes")), "9");
-                       e.addValue(e, ZCTX(_("TIMLIM^10 minutes")), "10");
-                       e.addValue(e, ZCTX(_("TIMLIM^15 minutes")), "15");
-                       e.addValue(e, ZCTX(_("TIMLIM^20 minutes")), "20");
-                       e.addValue(e, ZCTX(_("TIMLIM^25 minutes")), "25");
-                       e.addValue(e, ZCTX(_("TIMLIM^30 minutes")), "30");
-                       e.addValue(e, ZCTX(_("TIMLIM^40 minutes")), "40");
-                       e.addValue(e, ZCTX(_("TIMLIM^50 minutes")), "50");
-                       e.addValue(e, ZCTX(_("TIMLIM^60 minutes")), "60");
+                       e.addValue(e, _("1 minute"), "1");
+                       ADDVALUE_MINUTES(2);
+                       ADDVALUE_MINUTES(3);
+                       ADDVALUE_MINUTES(4);
+                       ADDVALUE_MINUTES(5);
+                       ADDVALUE_MINUTES(6);
+                       ADDVALUE_MINUTES(7);
+                       ADDVALUE_MINUTES(8);
+                       ADDVALUE_MINUTES(9);
+                       ADDVALUE_MINUTES(10);
+                       ADDVALUE_MINUTES(15);
+                       ADDVALUE_MINUTES(20);
+                       ADDVALUE_MINUTES(25);
+                       ADDVALUE_MINUTES(30);
+                       ADDVALUE_MINUTES(40);
+                       ADDVALUE_MINUTES(50);
+                       ADDVALUE_MINUTES(60);
                        e.addValue(e, ZCTX(_("TIMLIM^Infinite")), "0");
                        e.configureXonoticTextSliderValues(e);
+                       #undef ADDVALUE_MINUTES
        me.TR(me);
                me.TD(me, 1, 1, me.labelFraglimit = makeXonoticTextLabel(0, _("Frag limit:")));
                me.TD(me, 1, 2, e = me.sliderFraglimit = makeXonoticTextSlider("fraglimit_override"));
@@ -168,7 +170,7 @@ void XonoticServerCreateTab_fill(entity me)
                // string filter label and box
                me.TD(me, 1, 0.35, e = makeXonoticTextLabel(1, _("Filter:")));
                me.mapListBox.stringFilterBox = makeXonoticInputBox_T(0, string_null,
-                       _("Click here or Ctrl-F to provide a keyword to narrow down the maplist above. Ctrl-Delete to clear; Enter when done."));
+                       _("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done."));
                me.TD(me, 1, me.columns - me.firstColumn - 0.35, e = me.mapListBox.stringFilterBox);
                        e.onChange = MapList_StringFilterBox_Change;
                        e.keyDown = MapList_StringFilterBox_keyDown;
@@ -179,11 +181,11 @@ void XonoticServerCreateTab_fill(entity me)
                // the selection buttons
                me.TDempty(me, 0.2);
                me.TD(me, 1, 1.3, e = makeXonoticButton_T(_("Add shown"), '0 0 0',
-                       _("Add the maps shown in Maplist above to your selection")));
+                       _("Add the maps shown in the list to your selection")));
                        e.onClick = MapList_Add_Shown;
                        e.onClickEntity = me.mapListBox;
                me.TD(me, 1, 1.3, e = makeXonoticButton_T(_("Remove shown"), '0 0 0',
-                       _("Remove the maps shown in Maplist above from your selection")));
+                       _("Remove the maps shown in the list from your selection")));
                        e.onClick = MapList_Remove_Shown;
                        e.onClickEntity = me.mapListBox;
        me.gotoRC(me, me.rows - 2.5, me.firstColumn);