Merge branch 'master' of git://git.qubes-os.org/joanna/installer

This commit is contained in:
Marek Marczykowski 2013-02-25 13:26:44 +01:00
commit 8438eab17c

View File

@ -1160,8 +1160,8 @@
<environment> <environment>
<id>qubes-kde</id> <id>qubes-kde</id>
<display_order>2</display_order> <display_order>2</display_order>
<name>Qubes with KDE</name> <name>Qubes OS with KDE</name>
<description>Qubes standard installation.</description> <description>Standard installation with KDE enviroment in Dom0.</description>
<grouplist> <grouplist>
<groupid>base</groupid> <groupid>base</groupid>
<groupid>base-x</groupid> <groupid>base-x</groupid>
@ -1176,8 +1176,8 @@
<environment> <environment>
<id>qubes-xfce</id> <id>qubes-xfce</id>
<display_order>1</display_order> <display_order>1</display_order>
<name>Qubes with Xfce</name> <name>Qubes OS with Xfce</name>
<description>Qubes standard installation with Xfce.</description> <description>Standard installation with Xfce enviroment in Dom0.</description>
<grouplist> <grouplist>
<groupid>base</groupid> <groupid>base</groupid>
<groupid>base-x</groupid> <groupid>base-x</groupid>
@ -1193,8 +1193,8 @@
<environment> <environment>
<id>qubes-kde-xfce</id> <id>qubes-kde-xfce</id>
<display_order>3</display_order> <display_order>3</display_order>
<name>Qubes with KDE and Xfce</name> <name>Qubes OS with KDE and Xfce</name>
<description>Qubes standard installation with KDE and Xfce.</description> <description>Standard installation with both KDE and Xfce enviroments in Dom0 (selectable on startup).</description>
<grouplist> <grouplist>
<groupid>base</groupid> <groupid>base</groupid>
<groupid>base-x</groupid> <groupid>base-x</groupid>