From: Rudolf Polzer Date: Mon, 17 Jan 2011 15:39:28 +0000 (+0100) Subject: fix some widths in the menu X-Git-Tag: xonotic-v0.5.0~318^2~68 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a6711af481052afae2600f1ba212bcbf4806f3f;p=xonotic%2Fxonotic-data.pk3dir.git fix some widths in the menu --- diff --git a/menu.dat.fr.po b/menu.dat.fr.po index 068bac6cc..a2e7095d9 100644 --- a/menu.dat.fr.po +++ b/menu.dat.fr.po @@ -95,7 +95,7 @@ msgstr "Numéro" #: xonotic/dialog_hudpanel_weapons.c:46 msgid "Bind" -msgstr "Touche d'accès" +msgstr "Touche" #: xonotic/dialog_hudpanel_weapons.c:49 msgid "Show Accuracy" @@ -124,11 +124,11 @@ msgstr "Pseudonyme:" #: xonotic/dialog_settings_input_userbind.c:42 msgid "Command when pressed:" -msgstr "Commande quand touche appuyée:" +msgstr "Commande quand appuyée:" #: xonotic/dialog_settings_input_userbind.c:45 msgid "Command when released:" -msgstr "Commande quand touche relachée:" +msgstr "Commande quand relachée:" #: xonotic/dialog_settings_input_userbind.c:48 msgid "Save" @@ -184,7 +184,7 @@ msgstr "Armes:" #: xonotic/dialog_settings_audio.c:103 xonotic/dialog_settings_audio.c:161 msgid "Frequency:" -msgstr "Fréquance:" +msgstr "Fréquence:" #: xonotic/dialog_settings_audio.c:105 msgid "8 kHz" @@ -369,7 +369,7 @@ msgstr "erreur: a reçu un fichier HTML et non une notification de mise à jour\ #: xonotic/util.qc:288 msgid "error: received carriage returns from update notification server\n" -msgstr "" +msgstr "erreur: a reçu un message erroné depuis le serveur de notifications de M.A.J.\n" #: xonotic/util.qc:309 #, c-format @@ -686,7 +686,7 @@ msgstr "Monojoueur" #: xonotic/dialog_singleplayer.c:59 msgid "Instant action! (random map with bots)" -msgstr "Instant action! (map aléactoire avec bots)" +msgstr "Instant action! (map aléatoire avec bots)" #: xonotic/dialog_singleplayer.c:66 xonotic/campaign.c:284 msgid "???" @@ -1054,7 +1054,7 @@ msgstr "Désactivé" #: xonotic/dialog_settings_video.c:59 msgid "Vertices, some Tris (compatible)" -msgstr "Points, quelques triangles (compatible)" +msgstr "Points, quelques Triangles (compatible)" #: xonotic/dialog_settings_video.c:62 msgid "Vertices" @@ -1370,7 +1370,7 @@ msgstr "9 choix" #: xonotic/dialog_multiplayer_create_advanced.c:79 msgid "Simple majority wins vcall" -msgstr "Majorité simple pour gagner le vote" +msgstr "Majorité 50% pour gagner le vote" #: xonotic/dialog_hudpanel_infomessages.c:4 msgid "Info Messages Panel" @@ -2159,7 +2159,7 @@ msgstr "Panneau Mini-carte" #: xonotic/dialog_hudpanel_radar.c:22 msgid "Panel enabled in teamgames" -msgstr "Panneau activé en modes d'Équipe" +msgstr "Panneau activé en Équipe" #: xonotic/dialog_hudpanel_radar.c:29 msgid "Radar:" diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c index 05bd9850d..dcffb1fe4 100644 --- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c +++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c @@ -21,14 +21,14 @@ void XonoticHUDExitDialog_fill(entity me) me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Panel background defaults:"))); me.TR(me); me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:")); - me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_bg")))); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_bg")))); e.addValue(e, _("Disable"), "0"); e.addValue(e, "border_default", "border_default"); // this is a file name! e.configureXonoticTextSliderValues(e); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Color:"))); - me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_panel_bg_color", "hud_panel_bg_color")); + me.TD(me, 2, 2.6, e = makeXonoticColorpickerString("hud_panel_bg_color", "hud_panel_bg_color")); me.TR(me); me.TR(me); me.TDempty(me, 0.2); @@ -55,7 +55,7 @@ void XonoticHUDExitDialog_fill(entity me) e.configureXonoticTextSliderValues(e); me.TR(me); me.TDempty(me, 0.4); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", _("Test team color in configure mode"))); + me.TD(me, 1, 3.6, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", _("Test team color in configure mode"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Padding:"))); @@ -75,7 +75,7 @@ void XonoticHUDExitDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Color:"))); - me.TD(me, 2, 2.4, e = makeXonoticColorpickerString("hud_dock_color", "hud_dock_color")); + me.TD(me, 2, 2.6, e = makeXonoticColorpickerString("hud_dock_color", "hud_dock_color")); me.TR(me); me.TR(me); me.TDempty(me, 0.2); @@ -96,7 +96,7 @@ void XonoticHUDExitDialog_fill(entity me) me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Grid settings:"))); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_grid", _("Snap panels to grid"))); + me.TD(me, 1, 3.8, e = makeXonoticCheckBox(0, "hud_configure_grid", _("Snap panels to grid"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Grid size:"))); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c index 5eaabf67a..3ae9f0838 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c @@ -4,7 +4,7 @@ CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog) METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float)) ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information")) ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_SERVERINFO) - ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.68) + ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.8) ATTRIB(XonoticServerInfoDialog, rows, float, 15) ATTRIB(XonoticServerInfoDialog, columns, float, 12) diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 8910027bd..40ad9f6a1 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -129,15 +129,15 @@ void XonoticEffectsSettingsTab_fill(entity me) setDependent(e, "cl_decals", 1, 1); me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, 1.5, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps"))); + me.TD(me, 1, 1.3, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps"))); me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping"))); setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0); - me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss"))); + me.TD(me, 1, 0.8, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss"))); setDependentAND3(e, "vid_gl20", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0); me.TR(me); - me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping"))); + me.TD(me, 1, 1.3, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping"))); setDependent(e, "vid_gl20", 1, 1); - me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping"))); + me.TD(me, 1, 1.7, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping"))); setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:"))); @@ -172,9 +172,9 @@ void XonoticEffectsSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_coronas", _("Coronas"))); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom"))); + me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom"))); setDependent(e, "r_hdr", 0, 0); - me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(2, 0, "r_hdr", _("High Dynamic Range (HDR)"))); + me.TD(me, 1, 1.8, e = makeXonoticCheckBoxEx(2, 0, "r_hdr", _("High Dynamic Range (HDR)"))); me.TR(me); s = makeXonoticSlider(0.1, 1, 0.1, "r_motionblur"); diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 1b79ef82d..3053a903d 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -590,7 +590,7 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname) me.TR(me); me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Background:"))); - me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg")))); e.addValue(e, _("Default"), ""); e.addValue(e, _("Disable"), "0"); e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname))); @@ -598,11 +598,11 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Color:"))); - me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")), "hud_panel_bg_color")); + me.TD(me, 2, 2.6, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")), "hud_panel_bg_color")); setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), ""); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), _("Use default"))); + me.TD(me, 1, 3.8, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), _("Use default"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Border size:"))); @@ -631,7 +631,7 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname) e.configureXonoticTextSliderValues(e); me.TR(me); me.TDempty(me, 0.4); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", _("Test team color in configure mode"))); + me.TD(me, 1, 3.6, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", _("Test team color in configure mode"))); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Padding:"))); diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh index 2cdfe87c7..414c44314 100644 --- a/qcsrc/menu/xonotic/util.qh +++ b/qcsrc/menu/xonotic/util.qh @@ -46,7 +46,7 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname); dialog_hudpanel_common_notoggle(me, panelname) #define DIALOG_HUDPANEL_COMMON() \ me.TR(me); \ - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", panelname)), _("Enable panel"))); \ + me.TD(me, 1, 4, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", panelname)), _("Enable panel"))); \ DIALOG_HUDPANEL_COMMON_NOTOGGLE() string language_filename(string s);