From b6f62c6f3d422c93567261eaa7f62411c77d4dac Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 18 Jan 2011 15:52:43 +0100 Subject: [PATCH] use the "contexts" to differentiate between different uses of the same word in some harmful cases --- menu.dat.de.po | 248 ++++++++++++------ qcsrc/menu/xonotic/dialog_hudpanel_weapons.c | 2 +- .../dialog_multiplayer_create_mutators.c | 2 +- qcsrc/menu/xonotic/dialog_multiplayer_join.c | 4 +- .../xonotic/dialog_multiplayer_playersetup.c | 8 +- qcsrc/menu/xonotic/dialog_settings_audio.c | 20 +- qcsrc/menu/xonotic/dialog_settings_effects.c | 44 ++-- qcsrc/menu/xonotic/dialog_settings_video.c | 24 +- qcsrc/menu/xonotic/slider_decibels.c | 4 +- 9 files changed, 217 insertions(+), 139 deletions(-) diff --git a/menu.dat.de.po b/menu.dat.de.po index 0788eaf652..06b4a8c023 100644 --- a/menu.dat.de.po +++ b/menu.dat.de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1preview\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-18 11:25+0100\n" +"POT-Creation-Date: 2011-01-18 15:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Rudolf Polzer \n" "Language-Team: LANGUAGE \n" @@ -87,43 +87,39 @@ msgid "Font/UI size:" msgstr "Schriftgröße:" #: qcsrc/menu/xonotic/dialog_settings_video.c:31 -msgid "Unreadable" +msgid "SZ^Unreadable" msgstr "Unleserlich" #: qcsrc/menu/xonotic/dialog_settings_video.c:32 -msgid "Tiny" +msgid "SZ^Tiny" msgstr "Winzig" #: qcsrc/menu/xonotic/dialog_settings_video.c:33 -msgid "Little" +msgid "SZ^Little" msgstr "Klein" #: qcsrc/menu/xonotic/dialog_settings_video.c:34 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:71 -msgid "Small" +msgid "SZ^Small" msgstr "Klein" #: qcsrc/menu/xonotic/dialog_settings_video.c:35 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:72 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:43 -msgid "Medium" +msgid "SZ^Medium" msgstr "Mittel" #: qcsrc/menu/xonotic/dialog_settings_video.c:36 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:73 -msgid "Large" +msgid "SZ^Large" msgstr "Groß" #: qcsrc/menu/xonotic/dialog_settings_video.c:37 -msgid "Huge" +msgid "SZ^Huge" msgstr "Riesig" #: qcsrc/menu/xonotic/dialog_settings_video.c:38 -msgid "Gigantic" +msgid "SZ^Gigantic" msgstr "Gigantisch" #: qcsrc/menu/xonotic/dialog_settings_video.c:39 -msgid "Colossal" +msgid "SZ^Colossal" msgstr "Kolossal" #: qcsrc/menu/xonotic/dialog_settings_video.c:42 @@ -151,7 +147,7 @@ msgid "Vertex Buffer Objects (VBOs)" msgstr "Vertex Buffer Objects (VBOs)" #: qcsrc/menu/xonotic/dialog_settings_video.c:58 -msgid "Off" +msgid "VBO^Off" msgstr "Aus" #: qcsrc/menu/xonotic/dialog_settings_video.c:59 @@ -171,19 +167,15 @@ msgid "Depth first:" msgstr "Tiefe zuerst rendern:" #: qcsrc/menu/xonotic/dialog_settings_video.c:67 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:64 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:102 -msgid "Disabled" +msgid "DF^Disabled" msgstr "Aus" #: qcsrc/menu/xonotic/dialog_settings_video.c:68 -msgid "World" +msgid "DF^World" msgstr "nur Map" #: qcsrc/menu/xonotic/dialog_settings_video.c:69 -#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:177 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:139 -msgid "All" +msgid "DF^All" msgstr "Immer" #: qcsrc/menu/xonotic/dialog_settings_video.c:73 @@ -247,18 +239,17 @@ msgstr "Panel-Standardhintergrund:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:25 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:37 #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:52 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:70 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:91 qcsrc/menu/xonotic/util.qc:595 -#: qcsrc/menu/xonotic/util.qc:611 qcsrc/menu/xonotic/util.qc:628 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:91 qcsrc/menu/xonotic/util.qc:602 +#: qcsrc/menu/xonotic/util.qc:618 qcsrc/menu/xonotic/util.qc:635 msgid "Disable" msgstr "Aus" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:30 -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:77 qcsrc/menu/xonotic/util.qc:600 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:77 qcsrc/menu/xonotic/util.qc:607 msgid "Color:" msgstr "Farbe:" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:35 qcsrc/menu/xonotic/util.qc:608 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:35 qcsrc/menu/xonotic/util.qc:615 msgid "Border size:" msgstr "Rahmengröße:" @@ -266,7 +257,7 @@ msgstr "Rahmengröße:" #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:82 #: qcsrc/menu/xonotic/dialog_hudpanel_radar.c:32 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:151 -#: qcsrc/menu/xonotic/util.qc:617 +#: qcsrc/menu/xonotic/util.qc:624 msgid "Alpha:" msgstr "Alpha:" @@ -275,11 +266,11 @@ msgstr "Alpha:" msgid "Team color:" msgstr "Teamfarbe:" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:58 qcsrc/menu/xonotic/util.qc:634 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:58 qcsrc/menu/xonotic/util.qc:641 msgid "Test team color in configure mode" msgstr "Teamfarbe bei Konfiguration testen" -#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:61 qcsrc/menu/xonotic/util.qc:637 +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:61 qcsrc/menu/xonotic/util.qc:644 msgid "Padding:" msgstr "Abstand:" @@ -287,6 +278,22 @@ msgstr "Abstand:" msgid "HUD Dock:" msgstr "HUD-Dock:" +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:70 +msgid "DOCK^Disabled" +msgstr "Aus" + +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:71 +msgid "DOCK^Small" +msgstr "Klein" + +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:72 +msgid "DOCK^Medium" +msgstr "Mittel" + +#: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:73 +msgid "DOCK^Large" +msgstr "Groß" + #: qcsrc/menu/xonotic/dialog_hudsetup_exit.c:96 msgid "Grid settings:" msgstr "Gitter:" @@ -596,15 +603,8 @@ msgid "Fade effect:" msgstr "Ausblendeeffekt:" #: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:33 -#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:44 -#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:98 -#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:156 -#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:175 -#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:183 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:167 -msgid "None" -msgstr "Aus" +msgid "EF^None" +msgstr "keiner" #: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:35 msgid "Slide" @@ -622,6 +622,10 @@ msgstr "Waffensymbole:" msgid "Show weapon ID as:" msgstr "Waffen-ID zeigen als:" +#: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:44 +msgid "EFFECT^None" +msgstr "keiner" + #: qcsrc/menu/xonotic/dialog_hudpanel_weapons.c:45 msgid "Number" msgstr "Zahl" @@ -688,13 +692,12 @@ msgid "Filter:" msgstr "Filter:" #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:36 -msgid "Empty" -msgstr "Leer" +msgid "SRVS^Empty" +msgstr "leer" #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:40 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:149 -msgid "Full" -msgstr "Voll" +msgid "SRVS^Full" +msgstr "voll" #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:44 msgid "Pause" @@ -944,11 +947,11 @@ msgid "Close" msgstr "Schließen" #: qcsrc/menu/xonotic/slider_decibels.c:50 -msgid "OFF" +msgid "VOL^OFF" msgstr "AUS" #: qcsrc/menu/xonotic/slider_decibels.c:52 -msgid "MAX" +msgid "VOL^MAX" msgstr "MAX" #: qcsrc/menu/xonotic/slider_decibels.c:53 @@ -1042,6 +1045,10 @@ msgstr "Blutverlust" msgid "Jet pack" msgstr "Jetpack" +#: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:98 +msgid "MUT^None" +msgstr "keiner" + #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:164 msgid "Gameplay mutators:" msgstr "Spielmechanik-Mutators:" @@ -1373,6 +1380,10 @@ msgstr "Größe:" msgid "Hit test:" msgstr "Treffer-Test:" +#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:156 +msgid "HTST^None" +msgstr "Aus" + #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:157 msgid "TrueAim" msgstr "TrueAim" @@ -1393,9 +1404,17 @@ msgstr "HUD-Editor starten" msgid "Force models:" msgstr "Modell erzwingen:" +#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:175 +msgid "MDL^None" +msgstr "keine" + #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:176 -msgid "Custom" -msgstr "Benutzerdefiniert" +msgid "MDL^Custom" +msgstr "inoffizielle" + +#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:177 +msgid "MDL^All" +msgstr "alle" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:179 msgid "Disable gore effects" @@ -1405,16 +1424,20 @@ msgstr "Gewalteffekte deaktivieren" msgid "Gibs:" msgstr "Fleischteile:" +#: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:183 +msgid "GIBS^None" +msgstr "Aus" + #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:184 -msgid "Few" +msgid "GIBS^Few" msgstr "Wenige" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:185 -msgid "Many" +msgid "GIBS^Many" msgstr "Einige" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:186 -msgid "Lots" +msgid "GIBS^Lots" msgstr "Viele" #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:190 @@ -1692,21 +1715,21 @@ msgstr "Team Deathmatch" msgid "@!#%'n Tuba Throwing" msgstr "@!#%'n Tuba-Werfen" -#: qcsrc/menu/xonotic/util.qc:592 +#: qcsrc/menu/xonotic/util.qc:599 msgid "Background:" msgstr "Hintergrund:" -#: qcsrc/menu/xonotic/util.qc:594 qcsrc/menu/xonotic/util.qc:610 -#: qcsrc/menu/xonotic/util.qc:619 qcsrc/menu/xonotic/util.qc:627 -#: qcsrc/menu/xonotic/util.qc:639 +#: qcsrc/menu/xonotic/util.qc:601 qcsrc/menu/xonotic/util.qc:617 +#: qcsrc/menu/xonotic/util.qc:626 qcsrc/menu/xonotic/util.qc:634 +#: qcsrc/menu/xonotic/util.qc:646 msgid "Default" msgstr "Standard" -#: qcsrc/menu/xonotic/util.qc:605 +#: qcsrc/menu/xonotic/util.qc:612 msgid "Use default" msgstr "Standard verwenden" -#: qcsrc/menu/xonotic/util.qc:625 +#: qcsrc/menu/xonotic/util.qc:632 msgid "Team Color:" msgstr "Teamfarbe:" @@ -1787,32 +1810,31 @@ msgid "Quality preset:" msgstr "Qualitäts-Vorgabe:" #: qcsrc/menu/xonotic/dialog_settings_effects.c:41 -msgid "OMG!" +msgid "PRE^OMG!" msgstr "OMG!" #: qcsrc/menu/xonotic/dialog_settings_effects.c:42 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:55 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:75 -msgid "Low" +msgid "PRE^Low" msgstr "Niedrig" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:43 +msgid "PRE^Medium" +msgstr "Mittel" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:44 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:56 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:76 -#: qcsrc/menu/xonotic/dialog_settings_audio.c:147 -msgid "Normal" +msgid "PRE^Normal" msgstr "Normal" #: qcsrc/menu/xonotic/dialog_settings_effects.c:45 -msgid "High" +msgid "PRE^High" msgstr "Hoch" #: qcsrc/menu/xonotic/dialog_settings_effects.c:46 -msgid "Ultra" +msgid "PRE^Ultra" msgstr "Ultra" #: qcsrc/menu/xonotic/dialog_settings_effects.c:48 -msgid "Ultimate" +msgid "PRE^Ultimate" msgstr "Ultimativ" #: qcsrc/menu/xonotic/dialog_settings_effects.c:52 @@ -1820,29 +1842,37 @@ msgid "Geometry detail:" msgstr "Geometrie-Detail:" #: qcsrc/menu/xonotic/dialog_settings_effects.c:54 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:74 -msgid "Lowest" +msgid "DET^Lowest" msgstr "Sehr niedrig" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:55 +msgid "DET^Low" +msgstr "Niedrig" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:56 +msgid "DET^Normal" +msgstr "Normal" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:57 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:77 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:147 -msgid "Good" +msgid "DET^Good" msgstr "Gut" #: qcsrc/menu/xonotic/dialog_settings_effects.c:58 -#: qcsrc/menu/xonotic/dialog_settings_effects.c:78 -msgid "Best" -msgstr "Optimal" +msgid "DET^Best" +msgstr "Sehr gut" #: qcsrc/menu/xonotic/dialog_settings_effects.c:59 -msgid "Insane" +msgid "DET^Insane" msgstr "Wahnsinnig" #: qcsrc/menu/xonotic/dialog_settings_effects.c:62 msgid "Antialiasing:" msgstr "Kantenglättung:" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:64 +msgid "AA^Disabled" +msgstr "Aus" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:65 #: qcsrc/menu/xonotic/dialog_settings_effects.c:103 msgid "2x" @@ -1858,9 +1888,29 @@ msgid "Texture resolution:" msgstr "Texturauflösung:" #: qcsrc/menu/xonotic/dialog_settings_effects.c:73 -msgid "Leet" +msgid "RES^Leet" msgstr "Leet" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:74 +msgid "RES^Lowest" +msgstr "Sehr niedrig" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:75 +msgid "RES^Low" +msgstr "Niedrig" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:76 +msgid "RES^Normal" +msgstr "Normal" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:77 +msgid "RES^Good" +msgstr "Gut" + +#: qcsrc/menu/xonotic/dialog_settings_effects.c:78 +msgid "RES^Best" +msgstr "Sehr gut" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:91 #: qcsrc/menu/xonotic/dialog_settings_effects.c:94 msgid "Avoid lossy texture compression" @@ -1870,6 +1920,10 @@ msgstr "Texturkompression vermeiden" msgid "Anisotropy:" msgstr "Anisotropie:" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:102 +msgid "ANISO^Disabled" +msgstr "Aus" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:105 msgid "8x" msgstr "8x" @@ -1926,6 +1980,10 @@ msgstr "Reflexionen:" msgid "Blurred" msgstr "Schwammig" +#: qcsrc/menu/xonotic/dialog_settings_effects.c:147 +msgid "REFL^Good" +msgstr "Gut" + #: qcsrc/menu/xonotic/dialog_settings_effects.c:148 msgid "Sharp" msgstr "Scharf" @@ -2252,26 +2310,42 @@ msgstr "Kopfhörer-Modus" msgid "Spatial voices:" msgstr "Räumliche Sprachnachrichten:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:137 +msgid "VOCS^None" +msgstr "keine" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:138 -msgid "Taunts" -msgstr "Spott" +msgid "VOCS^Taunts" +msgstr "nur Spott" + +#: qcsrc/menu/xonotic/dialog_settings_audio.c:139 +msgid "VOCS^All" +msgstr "alle" #: qcsrc/menu/xonotic/dialog_settings_audio.c:142 msgid "Taunt range:" msgstr "Spott-Radius:" #: qcsrc/menu/xonotic/dialog_settings_audio.c:145 -msgid "Very short" +msgid "RNG^Very short" msgstr "Sehr klein" #: qcsrc/menu/xonotic/dialog_settings_audio.c:146 -msgid "Short" +msgid "RNG^Short" msgstr "Klein" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:147 +msgid "RNG^Normal" +msgstr "Normal" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:148 -msgid "Long" +msgid "RNG^Long" msgstr "Groß" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:149 +msgid "RNG^Full" +msgstr "Sehr groß" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:156 msgid "Automatic taunts" msgstr "Automatischer Spott" @@ -2280,6 +2354,10 @@ msgstr "Automatischer Spott" msgid "Time warning:" msgstr "Zeitwarnung:" +#: qcsrc/menu/xonotic/dialog_settings_audio.c:167 +msgid "WRN^None" +msgstr "keine" + #: qcsrc/menu/xonotic/dialog_settings_audio.c:168 msgid "1 minute" msgstr "1 Minute" @@ -2289,8 +2367,8 @@ msgid "5 minutes" msgstr "5 Minuten" #: qcsrc/menu/xonotic/dialog_settings_audio.c:170 -msgid "Both" -msgstr "Beide" +msgid "WRN^Both" +msgstr "beide" #: qcsrc/menu/xonotic/dialog_settings_audio.c:173 msgid "Hit indicator" diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c index a008f84af7..6ddcc62ed3 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c @@ -30,7 +30,7 @@ void XonoticHUDWeaponsDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Fade effect:"))); - me.TD(me, 1, 0.8, e = makeXonoticRadioButton(3, "hud_panel_weapons_timeout_effect", "0", ZCTX(_("EFFECT^None")))); + me.TD(me, 1, 0.8, e = makeXonoticRadioButton(3, "hud_panel_weapons_timeout_effect", "0", ZCTX(_("EF^None")))); setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_timeout")), "0"); me.TD(me, 1, 0.8, e = makeXonoticRadioButton(3, "hud_panel_weapons_timeout_effect", "1", _("Slide"))); setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_timeout")), "0"); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c index cd86e8aa6d..640c28a348 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c @@ -95,7 +95,7 @@ string XonoticMutatorsDialog_toString(entity me) if(cvar("g_jetpack")) s = strcat(s, ", ", _("Jet pack")); if(s == "") - return ZCTX(_("MUTATOR^None")); + return ZCTX(_("MUT^None")); else return substring(s, 2, strlen(s) - 2); } diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.c b/qcsrc/menu/xonotic/dialog_multiplayer_join.c index 625bb89279..fe9f860c31 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.c @@ -33,11 +33,11 @@ void XonoticServerListTab_fill(entity me) e.onChangeEntity = slist; btn.onClickEntity = e; slist.controlledTextbox = e; - me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "menu_slist_showempty", ZCTX(_("SERVERS^Empty")))); + me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "menu_slist_showempty", ZCTX(_("SRVS^Empty")))); slist.filterShowEmpty = e.checked; e.onClickEntity = slist; e.onClick = ServerList_ShowEmpty_Click; - me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "menu_slist_showfull", ZCTX(_("SERVERS^Full")))); + me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "menu_slist_showfull", ZCTX(_("SRVS^Full")))); slist.filterShowFull = e.checked; e.onClickEntity = slist; e.onClick = ServerList_ShowFull_Click; diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index 87fecd400a..fe0e757496 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -153,7 +153,7 @@ void XonoticPlayerSettingsTab_fill(entity me) setDependent(e, "crosshair_dot", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Hit test:"))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "0", ZCTX(_("HITTEST^None")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "0", ZCTX(_("HTST^None")))); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1", _("TrueAim"))); me.TD(me, 1, 2/3, e = makeXonoticRadioButton(5, "crosshair_hittest", "1.25", _("Enemies"))); me.TR(me); @@ -172,9 +172,9 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TR(me); #ifdef ALLOW_FORCEMODELS me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Force models:"))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, ZCTX(_("MODELS^None"))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodelsfromxonotic", string_null, ZCTX(_("MODELS^Custom")))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodels", string_null, ZCTX(_("MODELS^All")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, string_null, string_null, ZCTX(_("MDL^None"))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodelsfromxonotic", string_null, ZCTX(_("MDL^Custom")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(6, "cl_forceplayermodels", string_null, ZCTX(_("MDL^All")))); #endif me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects"))); me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index b459c2e0e9..2fee6d4d9a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -134,19 +134,19 @@ void XonoticAudioSettingsTab_fill(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Spatial voices:"))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "0", ZCTX(_("VOICES^None")))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "2", ZCTX(_("VOICES^Taunts")))); - me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "1", ZCTX(_("VOICES^All")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "0", ZCTX(_("VOCS^None")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "2", ZCTX(_("VOCS^Taunts")))); + me.TD(me, 1, 2/3, e = makeXonoticRadioButton(1, "cl_voice_directional", "1", ZCTX(_("VOCS^All")))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Taunt range:"))); setDependent(e, "cl_voice_directional", 0.5, -0.5); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_voice_directional_taunt_attenuation")); - e.addValue(e, ZCTX(_("RANGE^Very short")), "3"); - e.addValue(e, ZCTX(_("RANGE^Short")), "2"); - e.addValue(e, ZCTX(_("RANGE^Normal")), "0.5"); - e.addValue(e, ZCTX(_("RANGE^Long")), "0.25"); - e.addValue(e, ZCTX(_("RANGE^Full")), "0.015625"); + e.addValue(e, ZCTX(_("RNG^Very short")), "3"); + e.addValue(e, ZCTX(_("RNG^Short")), "2"); + e.addValue(e, ZCTX(_("RNG^Normal")), "0.5"); + e.addValue(e, ZCTX(_("RNG^Long")), "0.25"); + e.addValue(e, ZCTX(_("RNG^Full")), "0.015625"); e.configureXonoticTextSliderValues(e); setDependent(e, "cl_voice_directional", 0.5, -0.5); me.TR(me); @@ -164,10 +164,10 @@ void XonoticAudioSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Time warning:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_sound_maptime_warning")); - e.addValue(e, ZCTX(_("WARNING^None")), "0"); + e.addValue(e, ZCTX(_("WRN^None")), "0"); e.addValue(e, _("1 minute"), "1"); e.addValue(e, _("5 minutes"), "2"); - e.addValue(e, ZCTX(_("WARNING^Both")), "3"); + e.addValue(e, ZCTX(_("WRN^Both")), "3"); e.configureXonoticTextSliderValues(e); me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_hitsound", _("Hit indicator"))); diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 29c94fd45d..ec8329b5d8 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -38,30 +38,30 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Quality preset:"))); n = 5 + 2 * !!cvar("developer"); if(cvar("developer")) - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^OMG!")), '1 0 1', "exec effects-omg.cfg", 0)); - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^Low")), '0 0 0', "exec effects-low.cfg", 0)); - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^Medium")), '0 0 0', "exec effects-med.cfg", 0)); - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^Normal")), '0 0 0', "exec effects-normal.cfg", 0)); - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^High")), '0 0 0', "exec effects-high.cfg", 0)); - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^Ultra")), '0 0 0', "exec effects-ultra.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^OMG!")), '1 0 1', "exec effects-omg.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Low")), '0 0 0', "exec effects-low.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Medium")), '0 0 0', "exec effects-med.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Normal")), '0 0 0', "exec effects-normal.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^High")), '0 0 0', "exec effects-high.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Ultra")), '0 0 0', "exec effects-ultra.cfg", 0)); if(cvar("developer")) - me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRESET^Ultimate")), '0 0 0', "exec effects-ultimate.cfg", 0)); + me.TD(me, 1, 5.5 / n, e = makeXonoticCommandButton(ZCTX(_("PRE^Ultimate")), '0 0 0', "exec effects-ultimate.cfg", 0)); me.TR(me); me.TR(me); me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Geometry detail:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("r_subdivisions_tolerance")); - e.addValue(e, ZCTX(_("DETAIL^Lowest")), "16"); - e.addValue(e, ZCTX(_("DETAIL^Low")), "8"); - e.addValue(e, ZCTX(_("DETAIL^Normal")), "4"); - e.addValue(e, ZCTX(_("DETAIL^Good")), "3"); - e.addValue(e, ZCTX(_("DETAIL^Best")), "2"); - e.addValue(e, ZCTX(_("DETAIL^Insane")), "1"); + e.addValue(e, ZCTX(_("DET^Lowest")), "16"); + e.addValue(e, ZCTX(_("DET^Low")), "8"); + e.addValue(e, ZCTX(_("DET^Normal")), "4"); + e.addValue(e, ZCTX(_("DET^Good")), "3"); + e.addValue(e, ZCTX(_("DET^Best")), "2"); + e.addValue(e, ZCTX(_("DET^Insane")), "1"); e.configureXonoticTextSliderValues(e); me.TR(me); me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Antialiasing:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("vid_samples")); - e.addValue(e, ZCTX(_("ANTIALIASING^Disabled")), "1"); + e.addValue(e, ZCTX(_("AA^Disabled")), "1"); e.addValue(e, _("2x"), "2"); e.addValue(e, _("4x"), "4"); e.configureXonoticTextSliderValues(e); @@ -70,12 +70,12 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Texture resolution:"))); me.TD(me, 1, 2, e = makeXonoticPicmipSlider()); if(cvar("developer")) - e.addValue(e, ZCTX(_("RESOLUTION^Leet")), "1337"); - e.addValue(e, ZCTX(_("RESOLUTION^Lowest")), "2"); - e.addValue(e, ZCTX(_("RESOLUTION^Low")), "1"); - e.addValue(e, ZCTX(_("RESOLUTION^Normal")), "0"); - e.addValue(e, ZCTX(_("RESOLUTION^Good")), "-1"); - e.addValue(e, ZCTX(_("RESOLUTION^Best")), "-2"); + e.addValue(e, ZCTX(_("RES^Leet")), "1337"); + e.addValue(e, ZCTX(_("RES^Lowest")), "2"); + e.addValue(e, ZCTX(_("RES^Low")), "1"); + e.addValue(e, ZCTX(_("RES^Normal")), "0"); + e.addValue(e, ZCTX(_("RES^Good")), "-1"); + e.addValue(e, ZCTX(_("RES^Best")), "-2"); e.configureXonoticTextSliderValues(e); me.TR(me); me.TDempty(me, 0.2); @@ -99,7 +99,7 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1.1, e = makeXonoticTextLabel(0, _("Anisotropy:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("gl_texture_anisotropy")); - e.addValue(e, ZCTX(_("ANISOTROPY^Disabled")), "1"); + e.addValue(e, ZCTX(_("ANISO^Disabled")), "1"); e.addValue(e, _("2x"), "2"); e.addValue(e, _("4x"), "4"); e.addValue(e, _("8x"), "8"); @@ -144,7 +144,7 @@ void XonoticEffectsSettingsTab_fill(entity me) setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 2, e = makeXonoticTextSlider("r_water_resolutionmultiplier")); e.addValue(e, _("Blurred"), "0.25"); - e.addValue(e, ZCTX(_("REFLECTIONS^Good")), "0.5"); + e.addValue(e, ZCTX(_("REFL^Good")), "0.5"); e.addValue(e, _("Sharp"), "1"); e.configureXonoticTextSliderValues(e); setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1); diff --git a/qcsrc/menu/xonotic/dialog_settings_video.c b/qcsrc/menu/xonotic/dialog_settings_video.c index ef50e3f2ba..229687d51c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_video.c +++ b/qcsrc/menu/xonotic/dialog_settings_video.c @@ -28,15 +28,15 @@ void XonoticVideoSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Font/UI size:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_vid_scale")); - e.addValue(e, ZCTX(_("SIZE^Unreadable")), "-1"); - e.addValue(e, ZCTX(_("SIZE^Tiny")), "-0.75"); - e.addValue(e, ZCTX(_("SIZE^Little")), "-0.5"); - e.addValue(e, ZCTX(_("SIZE^Small")), "-0.25"); - e.addValue(e, ZCTX(_("SIZE^Medium")), "0"); - e.addValue(e, ZCTX(_("SIZE^Large")), "0.25"); - e.addValue(e, ZCTX(_("SIZE^Huge")), "0.5"); - e.addValue(e, ZCTX(_("SIZE^Gigantic")), "0.75"); - e.addValue(e, ZCTX(_("SIZE^Colossal")), "1"); + e.addValue(e, ZCTX(_("SZ^Unreadable")), "-1"); + e.addValue(e, ZCTX(_("SZ^Tiny")), "-0.75"); + e.addValue(e, ZCTX(_("SZ^Little")), "-0.5"); + e.addValue(e, ZCTX(_("SZ^Small")), "-0.25"); + e.addValue(e, ZCTX(_("SZ^Medium")), "0"); + e.addValue(e, ZCTX(_("SZ^Large")), "0.25"); + e.addValue(e, ZCTX(_("SZ^Huge")), "0.5"); + e.addValue(e, ZCTX(_("SZ^Gigantic")), "0.75"); + e.addValue(e, ZCTX(_("SZ^Colossal")), "1"); e.configureXonoticTextSliderValues(e); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Color depth:"))); @@ -64,9 +64,9 @@ void XonoticVideoSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Depth first:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("r_depthfirst")); - e.addValue(e, ZCTX(_("DEPTHFIRST^Disabled")), "0"); - e.addValue(e, ZCTX(_("DEPTHFIRST^World")), "1"); - e.addValue(e, ZCTX(_("DEPTHFIRST^All")), "2"); + e.addValue(e, ZCTX(_("DF^Disabled")), "0"); + e.addValue(e, ZCTX(_("DF^World")), "1"); + e.addValue(e, ZCTX(_("DF^All")), "2"); e.configureXonoticTextSliderValues(e); me.TR(me); if(cvar_type("apple_multithreadedgl") & CVAR_TYPEFLAG_ENGINE) diff --git a/qcsrc/menu/xonotic/slider_decibels.c b/qcsrc/menu/xonotic/slider_decibels.c index e18d2daf7c..f517a0bc60 100644 --- a/qcsrc/menu/xonotic/slider_decibels.c +++ b/qcsrc/menu/xonotic/slider_decibels.c @@ -47,9 +47,9 @@ void XonoticDecibelsSlider_saveCvars(entity me) string XonoticDecibelsSlider_valueToText(entity me, float v) { if(v < -33) - return ZCTX(_("VOLUME^OFF")); + return ZCTX(_("VOL^OFF")); else if(v >= -0.1) - return ZCTX(_("VOLUME^MAX")); + return ZCTX(_("VOL^MAX")); return sprintf(_("%s dB"), SUPER(XonoticDecibelsSlider).valueToText(me, v)); } -- 2.39.2