25 files changed, 96 insertions, 204 deletions
diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml
index d55fd5418..ddc274dfb 100644
--- a/ca/appendix/preseed.xml
+++ b/ca/appendix/preseed.xml
@@ -1359,37 +1359,37 @@ En aquest moment les tasques que hi ha són:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>estàndard</userinput>
+  <userinput>standard</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>escriptori</userinput>
+  <userinput>desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>escriptori-gnome</userinput>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>escriptori-kde</userinput>
+  <userinput>xfce-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-web</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-impresió</userinput>
+  <userinput>cinnamon-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-dns</userinput>
+  <userinput>mate-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-fitxers</userinput>
+  <userinput>lxde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-correu</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>servidor-base-de-dades</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>portàtil</userinput>
+  <userinput>ssh-server</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -1410,10 +1410,7 @@ que el podeu utilitzar de forma senzilla a la línia d'ordres del nucli.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect estàndard, servidor-web
-# Si es selecciona la tasca d'escriptori, s'instal·larà els escriptoris kde
-# i xfce, en comptes de l'escriptori per defecte, gnome.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 # Paquets addicionals per instal·lar individualment
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml
index 9c2b6b28c..ab230bca4 100644
--- a/cs/appendix/preseed.xml
+++ b/cs/appendix/preseed.xml
@@ -1446,28 +1446,28 @@ to zahrnuje:
   <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>kde-desktop</userinput>
+  <userinput>xfce-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>web-server</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>print-server</userinput>
+  <userinput>cinnamon-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>dns-server</userinput>
+  <userinput>mate-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>file-server</userinput>
+  <userinput>lxde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>mail-server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>sql-database</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>laptop</userinput>
+  <userinput>ssh-server</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -1487,10 +1487,7 @@ můžete jednoduše použít i na příkazové řádce jádra.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-# Pokud je vybrána desktopová úloha, nainstaluje místo výchozího GNOME
-# desktopy KDE a Xfce.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 # Samostatné balíky pro instalaci.
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml
index e443811f9..78567c454 100644
--- a/de/appendix/preseed.xml
+++ b/de/appendix/preseed.xml
@@ -1497,37 +1497,37 @@ Mögliche Werte zum Zeitpunkt, als dies geschrieben wurde:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>standard (Standard-System)</userinput>
+  <userinput>standard</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>desktop (Arbeitsplatz-System)</userinput>
+  <userinput>desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>gnome-desktop (Arbeitsplatz-System mit Gnome)</userinput>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>kde-desktop (Arbeitsplatz-System mit KDE)</userinput>
+  <userinput>xfce-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>web-server (Web-Server)</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>print-server (Druck-Server)</userinput>
+  <userinput>cinnamon-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>dns-server (DNS-Server)</userinput>
+  <userinput>mate-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>file-server (Datei-Server)</userinput>
+  <userinput>lxde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>mail-server (Mail-Server)</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>sql-database (SQL-Datenbank)</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>laptop (tragbarer Computer)</userinput>
+  <userinput>ssh-server</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -1550,10 +1550,7 @@ verwenden können.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-# Wenn die Programmgruppe "desktop" (Arbeitsplatz-System) ausgewählt ist,
-# den KDE- und XFCE-Desktop statt dem Standard-Gnome-Desktop installieren.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 # Individuelle zusätzliche Pakete, die installiert werden sollen:
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/debian/changelog b/debian/changelog
index 30a92b88c..8b66db43f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ installation-guide (201409xx) UNRELEASED; urgency=medium
   * Fix preseed name: netcfg/link_detection_timeout ->
     netcfg/link_wait_timeout. Thanks Julien Cristau for noticing.
   * Update brltty URLs and version.
+  * Update preseeding of desktops and list of desktops.
 
  -- Samuel Thibault <sthibault@debian.org>  Tue, 16 Sep 2014 13:24:16 +0200
 
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 61915b40d..64bfda9cb 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1385,37 +1385,37 @@ Available tasks as of this writing include:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>standard</userinput>
+  <userinput>standard</userinput> (standard tools)
 </para></listitem>
 <listitem><para>
-  <userinput>desktop</userinput>
+  <userinput>desktop</userinput> (graphical desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>gnome-desktop</userinput>
+  <userinput>gnome-desktop</userinput> (Gnome desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>kde-desktop</userinput>
+  <userinput>xfce-desktop</userinput> (XFCE desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>web-server</userinput>
+  <userinput>kde-desktop</userinput> (KDE desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>print-server</userinput>
+  <userinput>cinnamon-desktop</userinput> (Cinnamon desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>dns-server</userinput>
+  <userinput>mate-desktop</userinput> (MATE desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>file-server</userinput>
+  <userinput>lxde-desktop</userinput> (LXDE desktop)
 </para></listitem>
 <listitem><para>
-  <userinput>mail-server</userinput>
+  <userinput>web-server</userinput> (web server)
 </para></listitem>
 <listitem><para>
-  <userinput>sql-database</userinput>
+  <userinput>print-server</userinput> (print server)
 </para></listitem>
 <listitem><para>
-  <userinput>laptop</userinput>
+  <userinput>ssh-server</userinput> (SSH server)
 </para></listitem>
 </itemizedlist>
 
@@ -1436,10 +1436,7 @@ to be used easily on the kernel command line as well.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml
index 81a40920d..4bc82fbe8 100644
--- a/it/appendix/preseed.xml
+++ b/it/appendix/preseed.xml
@@ -2432,37 +2432,37 @@ siano disponibili. I task attualmente disponibili includono:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>standard (sistema standard)</userinput>
+  <userinput>standard</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>desktop (ambiente desktop)</userinput>
+  <userinput>desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>gnome-desktop (ambiente desktop gnome)</userinput>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>kde-desktop (ambiente desktop kde)</userinput>
+  <userinput>xfce-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>web-server (server web)</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>print-server (server di stampa)</userinput>
+  <userinput>cinnamon-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>dns-server (server DNS)</userinput>
+  <userinput>mate-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>file-server (file server)</userinput>
+  <userinput>lxde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>mail-server (server di posta)</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>sql-database (database SQL)</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>laptop (computer portatile)</userinput>
+  <userinput>ssh-server</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -2497,13 +2497,7 @@ sulla riga di comando del kernel.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-<!--
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
---># Quando è selezionato il task desktop, si può installare kde e xfce
-# al posto del desktop predefinito gnome.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 <!--
 # Individual additional packages to install
diff --git a/po/da/preseed.po b/po/da/preseed.po
index 207a17107..3a0f8ac7c 100644
--- a/po/da/preseed.po
+++ b/po/da/preseed.po
@@ -1977,10 +1977,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/el/preseed.po b/po/el/preseed.po
index 26579e16d..b0880f9fc 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -2901,10 +2901,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2918,11 +2915,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Αν έχει επιλεγεί η ομάδα πακέτων Περιβάλλον Γραφείου, τότε να "
-"εγκατασταθούν τα περιβάλλοντα kde και xfce\n"
-"# αντί του προκαθορισμένου περιβάλλοντος gnome.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Επιπλέον μεμονωμένα πακέτα για εγκατάσταση\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/es/preseed.po b/po/es/preseed.po
index f962cee0d..671969fe4 100644
--- a/po/es/preseed.po
+++ b/po/es/preseed.po
@@ -2873,10 +2873,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2890,10 +2887,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Si se selecciona la tarea «desktop», instalar los escritorios\n"
-"# kde y xfce en lugar del escritorio predeterminado gnome.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Paquetes individuales a instalar\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index e01d145b0..88539b026 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -2871,10 +2871,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2888,10 +2885,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"tasksel tasksel/first multiselect standard, web-server\n"
-"# Jos tehtävä \"desktop\" on valittuna, asennetaan kde- ja xfce-työpöydät\n"
-"# oletusarvoisen gnome-työpöydän sijaan.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Asennetaan yksittäisiä lisäpaketteja\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/fr/preseed.po b/po/fr/preseed.po
index 3c670ab64..60fa5f19c 100644
--- a/po/fr/preseed.po
+++ b/po/fr/preseed.po
@@ -2762,10 +2762,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2779,11 +2776,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Si vous sélectionnez la tâche desktop, vous pouvez installer les "
-"environnements kde ou xfce\n"
-"# au lieu de l'environnement gnome.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Paquets supplémentaires\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index f7bf45852..d6f5cb04e 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -2706,10 +2706,7 @@ msgstr ""
 #: preseed.xml:1101
 #, fuzzy, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2723,9 +2720,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"tasksel tasksel/first multiselect standard, desktop\n"
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"#tasksel tasksel/first multiselect standard, kde-desktop\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Egyéni további telepítendő csomagok\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 8ee0f588a..ae6fa9229 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -2671,10 +2671,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2688,10 +2685,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 59a89f8d5..0239968d5 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -2628,10 +2628,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2645,10 +2642,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# 데스크톱 태스크를 선택했을 때, 기본값인 그놈 대신에 kde와 xfce\n"
-"# 데스크톱 설치하기\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# 추가로 설치할 패키지\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/nl/preseed.po b/po/nl/preseed.po
index 09ffd1871..15321da2b 100644
--- a/po/nl/preseed.po
+++ b/po/nl/preseed.po
@@ -1968,10 +1968,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/nn/preseed.po b/po/nn/preseed.po
index 09ffd1871..15321da2b 100644
--- a/po/nn/preseed.po
+++ b/po/nn/preseed.po
@@ -1968,10 +1968,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 239f1d682..325410ac3 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -2753,10 +2753,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2770,10 +2767,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Se for escolhida a tarefa desktop, instalar os ambientes kde e\n"
-"# xfce em vez do ambiente predefinido, o gnome.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Pacotes individuais adicionais a instalar\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/ro/preseed.po b/po/ro/preseed.po
index 09ffd1871..15321da2b 100644
--- a/po/ro/preseed.po
+++ b/po/ro/preseed.po
@@ -1968,10 +1968,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index eb1fb1713..04a79d44f 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -2783,10 +2783,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2800,10 +2797,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Если выбрана задача Рабочий стол, то установить рабочие столы\n"
-"# kde и xfce вместо рабочего стола gnome по умолчанию.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Отдельные дополнительные пакеты для установки\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 249b47501..56de237cb 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -3003,10 +3003,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -3020,10 +3017,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# Om skrivbordsfunktionen väljs kommer skrivbordsmiljöerna kde och xfce\n"
-"# att installeras istället för standardskrivbordsmiljön gnome.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individuella paket att installera\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/tl/preseed.po b/po/tl/preseed.po
index 09ffd1871..15321da2b 100644
--- a/po/tl/preseed.po
+++ b/po/tl/preseed.po
@@ -1968,10 +1968,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 4fd9ac2a5..0705edcd0 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -2835,10 +2835,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 8d642e76c..5483f83d3 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -2655,10 +2655,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
@@ -2672,10 +2669,7 @@ msgid ""
 "# popular and include it on CDs.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/po/zh_TW/preseed.po b/po/zh_TW/preseed.po
index 09ffd1871..15321da2b 100644
--- a/po/zh_TW/preseed.po
+++ b/po/zh_TW/preseed.po
@@ -1968,10 +1968,7 @@ msgstr ""
 #: preseed.xml:1101
 #, no-c-format
 msgid ""
-"#tasksel tasksel/first multiselect standard, web-server\n"
-"# If the desktop task is selected, install the kde and xfce desktops\n"
-"# instead of the default gnome desktop.\n"
-"#tasksel tasksel/desktop multiselect kde, xfce\n"
+"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
 "\n"
 "# Individual additional packages to install\n"
 "#d-i pkgsel/include string openssh-server build-essential\n"
diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml
index daab88bc5..d7eb8e39f 100644
--- a/pt_BR/appendix/preseed.xml
+++ b/pt_BR/appendix/preseed.xml
@@ -1254,28 +1254,28 @@ Tarefas disponíveis enquanto isto é escrito incluem:
   <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>kde-desktop</userinput>
+  <userinput>xfce-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>web-server</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>print-server</userinput>
+  <userinput>cinnamon-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>dns-server</userinput>
+  <userinput>mate-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>file-server</userinput>
+  <userinput>lxde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>mail-server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>sql-database</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>laptop</userinput>
+  <userinput>ssh-server</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -1296,10 +1296,7 @@ seja facilmente usado na linha de comando do kernel.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
+#tasksel tasksel/first multiselect standard, web-server, kde-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential