18 files changed, 29 insertions, 117 deletions
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"