Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir

diff --git a/menu.dat.fr.po b/menu.dat.fr.po
index 77bd96e2a45fbcfcf8026226bf769c1a2f18b40f..9772d226194b89ff7adb21b91c5adc678e59d4f8 100644 (file)
--- a/menu.dat.fr.po
+++ b/menu.dat.fr.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2011-06-27 18:26+0200\n"
 "PO-Revision-Date: 2011-03-09 15:48-0500\n"
 "Last-Translator: Maxime Paradis <taximus.micro@gmail.com>\n"
-"Language-Team: French <kde-i18n-doc@kde.org>\n"
+"Language-Team: Calinou <hugohachel@gmail.com>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 23cb6a3b9b6a2bc4252280c0df4155a198f39143..585b2079683ba10c50434d7073d3e7b29dfacd12 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -186,8 +186,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
                        e.savedValue = 0.5; // default
                me.TD(me, 1, 2, s);
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Damage & water blur")));
-               me.TD(me, 1, 1, e = makeXonoticCheckBoxEx(0.5, 0, "hud_powerup", _("Powerup sharpen")));
+               e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Blur and sharpen postprocessing"));
+               makeMulti(e, "hud_powerup");
+               me.TD(me, 1, 2, e);
        
        me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));