[debian-edu-commits] debian-edu/ 02/04: updated after running 'msguntypot -o templates.pot.orig -n templates.pot *.po' using templates.pot from 9801d96fc as templates.pot.orig

Holger Levsen holger at layer-acht.org
Sat Dec 3 13:17:17 UTC 2016


This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-install.

commit 206cab535aa76cf834715258331eb4a88b1e49e4
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 2 16:31:27 2016 +0100

    updated after running 'msguntypot -o templates.pot.orig -n templates.pot *.po' using templates.pot from 9801d96fc as templates.pot.orig
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/po/ca.po    |  55 +++++++++++++--------------
 debian/po/cs.po    |  46 +++++++++++------------
 debian/po/da.po    |  42 ++++++++++-----------
 debian/po/de.po    |  45 +++++++++++-----------
 debian/po/el.po    |  60 +++++++++++++++---------------
 debian/po/es.po    |  52 +++++++++++++-------------
 debian/po/eu.po    |  67 ++++++++++++++++-----------------
 debian/po/fi.po    |  55 +++++++++++++--------------
 debian/po/fr.po    |  48 ++++++++++++------------
 debian/po/gl.po    |  48 ++++++++++++------------
 debian/po/id.po    |  59 ++++++++++++++---------------
 debian/po/it.po    |  53 +++++++++++++-------------
 debian/po/ja.po    | 107 ++++++++++++++++++++---------------------------------
 debian/po/lv.po    |  82 ++++++++++++++++++----------------------
 debian/po/nb.po    |  59 ++++++++++++++---------------
 debian/po/nl.po    |  44 +++++++++++-----------
 debian/po/nn.po    |  44 +++++++++++-----------
 debian/po/pl.po    |  50 ++++++++++++-------------
 debian/po/pt.po    |  74 ++++++++++++++++++------------------
 debian/po/pt_BR.po |  57 +++++++++++++++-------------
 debian/po/ro.po    |  60 +++++++++++++++---------------
 debian/po/ru.po    |  48 ++++++++++++------------
 debian/po/se.po    |  54 +++++++++++++--------------
 debian/po/sk.po    |  45 +++++++++++-----------
 debian/po/sv.po    |  72 ++++++++++++++++++-----------------
 debian/po/tr.po    |  65 ++++++++++++++++----------------
 debian/po/vi.po    |  55 ++++++++++++++-------------
 debian/po/zh_CN.po |  81 ++++++++++++++++------------------------
 debian/po/zh_TW.po |  77 +++++++++++++++-----------------------
 29 files changed, 793 insertions(+), 911 deletions(-)

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 2b0a1da..f82778a 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -40,42 +40,42 @@ msgstr "Seleccioneu el perfil de Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Servidor principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Estació de treball"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Estació de treball itinerant"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Servidor de clients lleugers"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Màquina aïllada"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Mínim"
@@ -94,7 +94,6 @@ msgstr "Els perfils determina com es pot fer anar el maquinari per defecte:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -104,7 +103,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -131,8 +130,7 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
-msgstr ""
-"El perfil «Màquina aïllada» només es pot utilitzar de forma independent"
+msgstr "El perfil «Màquina aïllada» només es pot utilitzar de forma independent"
 
 #. Type: error
 #. Description
@@ -157,8 +155,8 @@ msgstr "La instal·lació de «Màquina aïllada» és parcialment manual."
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Actualment la instal·lació «Màquina aïllada» no és tant automàtica com els "
@@ -185,11 +183,11 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Açò destruirà la taula de particions en tots els discs d'aquest ordinador. "
-"ES REPETEIX: AIXÒ ESBORRARÀ TOTS ELS DISCS DURS DE L'ORDINADOR! Si hi teniu "
-"dades importants de les que encara no heu fet còpies de seguretat, potser "
-"voleu parar ara per a fer la còpia de seguretat. En eixe cas, haureu de "
-"tornar a començar la instal·lació més tard."
+"Açò destruirà la taula de particions en tots els discs d'aquest "
+"ordinador. ES REPETEIX: AIXÒ ESBORRARÀ TOTS ELS DISCS DURS DE L'ORDINADOR! "
+"Si hi teniu dades importants de les que encara no heu fet còpies de "
+"seguretat, potser voleu parar ara per a fer la còpia de seguretat. En eixe "
+"cas, haureu de tornar a començar la instal·lació més tard."
 
 #. Type: text
 #. Description
@@ -231,11 +229,11 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Sempre podeu canviar d'opinió posteriorment: «dpkg-reconfigure popularity-"
-"contest»."
+"Sempre podeu canviar d'opinió posteriorment: «dpkg-reconfigure "
+"popularity-contest»."
 
 #. Type: text
 #. Description
@@ -248,7 +246,7 @@ msgstr "Servidor principal de Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Servidor de clients lleugers de Debian Edu"
 
 #. Type: text
@@ -262,7 +260,7 @@ msgstr "Estació de treball de Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Servidor principal i de clients lleugers de Debian Edu"
 
 #. Type: text
@@ -295,10 +293,10 @@ msgstr "Instal·lació dels paquets requerits ha fallat"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Alguns paquets requerits han fallat al instal·lar-se. Els paquets son "
 "${PACKAGES}.  Revisa /var/log/syslog per trobar si hi ha cap informació que "
@@ -388,7 +386,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #~ msgid ""
 #~ " - Main Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 0ae4e14..cc98d3a 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -49,42 +49,42 @@ msgstr "Zvolte profil Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hlavní server"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Stanice"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Stanice na cestách"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Tenký klient server"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Samostatný"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimální"
@@ -103,7 +103,6 @@ msgstr "Profily určují, jak se bude počítač chovat po výchozí instalaci:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -113,7 +112,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -170,8 +169,8 @@ msgstr "Instalace samostatného počítače vyžaduje ruční zásah"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Instalace samostatného počítače zatím není tak automatická jako ostatní "
@@ -240,8 +239,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Své rozhodnutí můžete kdykoliv změnit, stačí spustit: „dpkg-reconfigure "
 "popularity-contest“."
@@ -257,7 +256,7 @@ msgstr "Debian Edu Hlavní server"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu Tenký klient server"
 
 #. Type: text
@@ -271,7 +270,7 @@ msgstr "Debian Edu Stanice"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu Hlavní server a Tenký klient server"
 
 #. Type: text
@@ -304,15 +303,15 @@ msgstr "Instalace vyžadovaných balíků selhala"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"Následující vyžadované balíky se nepodařilo nainstalovat: ${PACKAGES}. "
-"Zkontrolujte /var/log/syslog, zda se v něm nenachází informace, proč se tak "
-"stalo. Instalovaný systém nebude fungovat správně a proto byla instalace "
-"přerušena. Systém bude nyní restartován."
+"Následující vyžadované balíky se nepodařilo nainstalovat: "
+"${PACKAGES}. Zkontrolujte /var/log/syslog, zda se v něm nenachází informace, "
+"proč se tak stalo. Instalovaný systém nebude fungovat správně a proto byla "
+"instalace přerušena. Systém bude nyní restartován."
 
 #. Type: boolean
 #. Description
@@ -404,7 +403,6 @@ msgid ""
 msgstr ""
 "Tato hláška se zobrazuje pouze ve vývojové verzi, aby bylo jasné, že "
 "instalace skončila úspěšně."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/da.po b/debian/po/da.po
index 04f7c73..76c01fc 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -27,42 +27,42 @@ msgstr "Vælg Debian Edu-profil"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hovedserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Arbejdsstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Roamingarbejdsstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Tynd klient-server"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Uafhængig"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -81,7 +81,6 @@ msgstr "Profiler bestemmer hvordan maskinen kan bruges umiddelbart:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -91,7 +90,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -147,8 +146,8 @@ msgstr "Den uafhængige installation er delvist manuel"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "For at gøre manuel partitionering lettere, er de uafhængige installationer "
@@ -218,8 +217,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Du kan ændre denne indstilling senere ved at køre: »dpkg-reconfigure "
 "popularity-contest«."
@@ -235,7 +234,7 @@ msgstr "Hovedserver til Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Tynd klient-server til Debian Edu"
 
 #. Type: text
@@ -249,7 +248,7 @@ msgstr "Arbejdsstation til Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Hovedserver og Tynd klient-server til Debian Edu"
 
 #. Type: text
@@ -282,13 +281,13 @@ msgstr "Installation af krævede pakker mislykkedes"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"Nogle krævede pakker kunne ikke installeres. Pakkerne var ${PACKAGES}. Tjek /"
-"var/log/syslog om der fremgår information om, hvorfor dette skete. Det "
+"Nogle krævede pakker kunne ikke installeres. Pakkerne var ${PACKAGES}. Tjek "
+"/var/log/syslog om der fremgår information om, hvorfor dette skete. Det "
 "installerede system vil ikke fungere korrekt, så installationen blev afbrudt "
 "og systemet vil blive genstartet nu."
 
@@ -383,7 +382,6 @@ msgid ""
 msgstr ""
 "Dette vises for udviklingsversionen for at gøre det klart, at installationen "
 "lykkedes."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/de.po b/debian/po/de.po
index 878cc5b..a4dd2a1 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -35,42 +35,42 @@ msgstr "Auswahl des Debian-Edu-Profils"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hauptserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Arbeitsplatzrechner"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Mobiler Arbeitsplatzrechner"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Terminal-Server"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Einzelplatzrechner"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -89,7 +89,6 @@ msgstr "Profile bestimmen den Einsatzzweck des Rechners nach Installation:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -99,7 +98,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -127,7 +126,8 @@ msgstr ""
 #: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
-"Profil »Einzelplatzrechner« kann nicht mit anderen Profilen kombiniert werden"
+"Profil »Einzelplatzrechner« kann nicht mit anderen Profilen kombiniert "
+"werden"
 
 #. Type: error
 #. Description
@@ -153,8 +153,8 @@ msgstr "Installation des Einzelplatzrechners erfolgt teilweise manuell."
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Um die manuelle Partitionierung zu erleichtern, ist die Installation des "
@@ -225,8 +225,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Durch Ausführen von »dpkg-reconfigure popularity-contest« kann die "
 "Entscheidung später revidiert werden."
@@ -242,7 +242,7 @@ msgstr "Debian-Edu-Hauptserver"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian-Edu-Terminal-Server"
 
 #. Type: text
@@ -256,7 +256,7 @@ msgstr "Debian-Edu-Arbeitsplatzrechner"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian-Edu-Hauptserver und -Terminal-Server"
 
 #. Type: text
@@ -289,10 +289,10 @@ msgstr "Installation von benötigten Paketen fehlgeschlagen"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Einige benötigte Pakete konnten nicht installiert werden. Die betroffenen "
 "Pakete sind: ${PACKAGES}. Prüfen Sie /var/log/syslog auf Informationen "
@@ -327,8 +327,8 @@ msgid ""
 "while."
 msgstr ""
 "Wenn Sie fortfahren werden System- und Benutzerdaten in eine einzige "
-"Partition installiert. Beachten Sie, dass dies langfristig zu System-"
-"Instabilität führen kann."
+"Partition installiert. Beachten Sie, dass dies langfristig zu "
+"System-Instabilität führen kann."
 
 #. Type: text
 #. Description
@@ -391,7 +391,6 @@ msgid ""
 msgstr ""
 "Dies wird für die Entwicklungs-Version angezeigt, um klar zu machen, dass "
 "die Installation erfolgreich war."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/el.po b/debian/po/el.po
index 4cf9386..963fe64 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -40,42 +40,42 @@ msgstr "Επιλογή προφίλ του Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Κεντρικός Εξυπηρετητής"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Σταθμός Εργασίας"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Ανεξάρτητος Σταθμός Εργασίας"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Εξυπηρετητής Thin-Client"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Αυτόνομο σύστημα"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Μινιμαλιστική"
@@ -96,7 +96,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -106,7 +105,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -115,7 +114,8 @@ msgid ""
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
 msgstr ""
-" - Κεντρικός Εξυπηρετητής: Επιλογή δεσμευμένη για τον κεντρικό εξυπηρετητή \n"
+" - Κεντρικός Εξυπηρετητής: Επιλογή δεσμευμένη για τον κεντρικό εξυπηρετητή "
+"\n"
 "                του συστήματος Debian Edu. Δεν περιλαμβάνει GUI (Γραφικό \n"
 "                Περιβάλλον). Σε κάθε δίκτυο, μόνο ένας υπολογιστής έχει το\n"
 "                ρόλο του Κεντρικού Εξυπηρετητή Debian Edu\n"
@@ -127,7 +127,8 @@ msgstr ""
 "                όπως και ο 'Σταθμός Εργασίας' όμως απαιτεί δύο κάρτες \n"
 "                δικτύου. \n"
 " - Αυτόνομο Σύστημα: Για χρήση σε μηχανήματα εκτός του δικτύου Debian Edu.\n"
-"                Περιλαμβάνει GUI (Γραφικό Περιβάλλον) και δεν είναι συμβατό\n"
+"                Περιλαμβάνει GUI (Γραφικό Περιβάλλον) και δεν είναι "
+"συμβατό\n"
 "                με άλλα προφίλ.\n"
 " - Μινιμαλιστική Εγκατάσταση: Για συστήματα πλήρως ενσωματωμένα στο δίκτυο "
 "Debian\n"
@@ -164,8 +165,8 @@ msgstr "Η εγκατάσταση του Αυτόνομου συστήματος
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Η εγκατάσταση του προφίλ 'Αυτόνομο σύστημα' δεν είναι τόσο αυτοματοποιημένη "
@@ -241,11 +242,11 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Η επιλογή αυτή μπορεί να τροποποιηθεί αργότερα εκτελώντας την εντολή \"dpkg-"
-"reconfigure popularity-contest\"."
+"Η επιλογή αυτή μπορεί να τροποποιηθεί αργότερα εκτελώντας την εντολή "
+"\"dpkg-reconfigure popularity-contest\"."
 
 #. Type: text
 #. Description
@@ -258,7 +259,7 @@ msgstr "Κεντρικός Εξυπηρετητής Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Εξυπηρετητής Thin-Client"
 
 #. Type: text
@@ -272,7 +273,7 @@ msgstr "Σταθμός Εργασίας Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Κεντρικός Εξυπηρετητής και Εξυπηρετητής Thin-Client"
 
 #. Type: text
@@ -305,10 +306,10 @@ msgstr "Η εγγατάσταση των απαιτούμενων πακέτων
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Κάποια απαιτούμενα αρχεία δεν μπόρεσαν να εγκατασταθούν. Αυτά ήταν "
 "${PACKAGES}.Ελέξτε το /var/log/syslog μήπως υπάρχει κάποια πληροφορία για το "
@@ -319,8 +320,7 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
-msgstr ""
-"Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής. Ακύρωση της Εγκατάστασης;"
+msgstr "Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής. Ακύρωση της Εγκατάστασης;"
 
 #. Type: boolean
 #. Description
@@ -330,9 +330,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής για τα επιλεγμένα προφίλ. "
-"Παρακαλώ επιλέξτε αν θέλετε να ακυρώσετε την εγκατάσταση ή να συνεχίσετε "
-"χωρίς τις προτεινόμενες ρυθμίσεις διαμόρφωσης."
+"Ο διαθέσιμος χώρος στο δίσκο δεν είναι επαρκής για τα επιλεγμένα "
+"προφίλ. Παρακαλώ επιλέξτε αν θέλετε να ακυρώσετε την εγκατάσταση ή να "
+"συνεχίσετε χωρίς τις προτεινόμενες ρυθμίσεις διαμόρφωσης."
 
 #. Type: boolean
 #. Description
@@ -373,8 +373,7 @@ msgstr ""
 #. Debian Installer Main-menu Item
 #: ../debian-edu-install-udeb.templates:1001
 msgid "Install Debian Edu profile (enforce menu order)"
-msgstr ""
-"Εγκατάσταση του προφίλ Debian Edu (επιβολή σειράς προτεραιότητας μενού)"
+msgstr "Εγκατάσταση του προφίλ Debian Edu (επιβολή σειράς προτεραιότητας μενού)"
 
 #. Type: error
 #. Description
@@ -409,7 +408,6 @@ msgid ""
 msgstr ""
 "Το μήνυμα αυτό εμφανίζεται στην έκδοση υπό ανάπτυξη για να καταστήσει σαφές "
 "Το γεγονός ότι η εγκατάσταση ολοκληρώθηκε με επιτυχία. "
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/es.po b/debian/po/es.po
index b31f770..1d4d9a5 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -54,42 +54,42 @@ msgstr "Escoja un perfil de Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Servidor principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Estación de trabajo itinerante"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Servidor de clientes ligeros"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Independiente"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Mínimo"
@@ -110,7 +110,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -120,7 +119,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -178,8 +177,8 @@ msgstr "La instalación «Independiente» es en parte manual"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "La instalación de «Independiente» no es automática como la de otros "
@@ -205,10 +204,10 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Se eliminará la tabla de particiones de todos lo discos de la máquina. "
-"¡REPITO: ESTO ELIMINARÁ TODO DE LOS DISCOS DUROS DE SU MÁQUINA! Haga una "
-"copia de seguridad si tiene información importante, ahora tal vez quiera "
-"parar para hacer ese respaldo. En ese caso, tendrá que reiniciar la "
+"Se eliminará la tabla de particiones de todos lo discos de la "
+"máquina. ¡REPITO: ESTO ELIMINARÁ TODO DE LOS DISCOS DUROS DE SU MÁQUINA! "
+"Haga una copia de seguridad si tiene información importante, ahora tal vez "
+"quiera parar para hacer ese respaldo. En ese caso, tendrá que reiniciar la "
 "instalación después."
 
 #. Type: text
@@ -250,8 +249,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Puede cambiar esta decisión ejecutando más tarde «dpkg-reconfigure "
 "popularity-contest»."
@@ -267,7 +266,7 @@ msgstr "Servidor principal de Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Servidor de clientes ligeros de Debian Edu"
 
 #. Type: text
@@ -281,7 +280,7 @@ msgstr "Estación de trabajo de Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Servidor principal y Servidor de clientes ligeros de Debian Edu"
 
 #. Type: text
@@ -314,10 +313,10 @@ msgstr "La instalación de los paquetes necesarios ha fallado"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "La instalación de algunos paquetes necesarios ha fallado. Los paquetes son "
 "${PACKAGES}. Compruebe si en «/var/log/syslog» hay algún tipo de información "
@@ -339,9 +338,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"El espacio disponible es insuficiente para los perfiles seleccionados. "
-"Seleccione si desea abortar la instalación, o continuar sin utilizar el "
-"esquema de particionado sugerido."
+"El espacio disponible es insuficiente para los perfiles "
+"seleccionados. Seleccione si desea abortar la instalación, o continuar sin "
+"utilizar el esquema de particionado sugerido."
 
 #. Type: boolean
 #. Description
@@ -416,7 +415,6 @@ msgid ""
 msgstr ""
 "Esto se visualiza en la versión de desarrollo para informar que la "
 "instalación fué exitosa."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 9e1d501..6a5b964 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -28,42 +28,42 @@ msgstr "Aukeratu Debian Edu profila"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Zerbitzari nagusia"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Lanpostua"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Lanpostu ibiltaria"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Bezero arinentzako zerbitzaria"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Bakarkakoa"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Gutxienekoa"
@@ -84,7 +84,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -94,7 +93,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -149,8 +148,8 @@ msgstr "Bakarkakoaren instalazioaren urrats batzuk eskuz egin behar dira"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Beste profiletan gertatzen denaren alderantziz, bakarkakoaren instalazioa "
@@ -179,9 +178,9 @@ msgid ""
 msgstr ""
 "Honek diskoaren partizio taula ezabatuko du. KONTUZ: HONEK ORDENAGAILUKO "
 "DISKO GOGORREKO INFORMAZIO GUZTIA EZABATUKO DU! Gorde gabeko datu "
-"garrantzitsuak edukiz gero, hauxe da unea gelditu eta babeskopiak egiteko. "
-"Honetarako ordenagailua berrabiarazi beharko duzu eta ondoren instalazioa "
-"berriro hasi."
+"garrantzitsuak edukiz gero, hauxe da unea gelditu eta babeskopiak "
+"egiteko. Honetarako ordenagailua berrabiarazi beharko duzu eta ondoren "
+"instalazioa berriro hasi."
 
 #. Type: text
 #. Description
@@ -222,8 +221,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Nahi duzunean erabakiz alda dezakezu, honakoa exekutatuz: \"dpkg-reconfigure "
 "popularity-contest\"."
@@ -239,7 +238,7 @@ msgstr "Debian Edu zerbitzari nagusia"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu bezero arinentzako zerbitzaria"
 
 #. Type: text
@@ -253,7 +252,7 @@ msgstr "Debian Edu lanpostua"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu zerbitzari nagusia eta bezero arinentzako zerbitzaria"
 
 #. Type: text
@@ -286,10 +285,10 @@ msgstr "Huts egin du beharrezkoa den paketea instalatzean"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Beharrezkoak diren pakete batzuen instalazioak huts egin du. Paketeak "
 "honakoak ziren: ${PACKAGES}. Begiratu /var/log/syslog zergatiaren berri "
@@ -311,9 +310,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"Diskoan erabilgarri dagoen lekua txikiegia da hautatutako profilentzako. "
-"Instalazioa abortatzea aukera dezakezu, edo, bestela, jarraitu "
-"gomendatutako partizio-konfigurazioa ezarri gabe."
+"Diskoan erabilgarri dagoen lekua txikiegia da hautatutako "
+"profilentzako. Instalazioa abortatzea aukera dezakezu, edo, bestela, "
+"jarraitu gomendatutako partizio-konfigurazioa ezarri gabe."
 
 #. Type: boolean
 #. Description
@@ -323,10 +322,9 @@ msgid ""
 "files _and_ user files.  Note that this can cause stability problems after a "
 "while."
 msgstr ""
-"Jarraitzea aukeratzen baduzu, partizio bakar bat erabiliko da sistemaren "
-"eta erabiltzaileen fitxategiak gordetzeko. Jakin ezazu honek denbora baten"
-" ostean "
-"egonkortasun arloko arazoak eragin ditzakeela."
+"Jarraitzea aukeratzen baduzu, partizio bakar bat erabiliko da sistemaren eta "
+"erabiltzaileen fitxategiak gordetzeko. Jakin ezazu honek denbora baten "
+"ostean egonkortasun arloko arazoak eragin ditzakeela."
 
 #. Type: text
 #. Description
@@ -345,9 +343,8 @@ msgid ""
 "required.  It is currently missing, so this installation can not continue "
 "and will be aborted."
 msgstr ""
-"Sareko konexioa behar da PXE eta sareko instalazioaren (NETINST) "
-"CDa erabiliz Debian Edu instalatzeko. Unean konexioa falta denez, ezin izango"
-" da "
+"Sareko konexioa behar da PXE eta sareko instalazioaren (NETINST) CDa "
+"erabiliz Debian Edu instalatzeko. Unean konexioa falta denez, ezin izango da "
 "instalazioarekin jarraitu, eta bertan behera botako da."
 
 #. Type: text
@@ -378,7 +375,6 @@ msgstr "Pentsatu errore horien berri emateaz Debian Edu-ko garatzaileei."
 #. Type: note
 #. Description
 #: ../debian-edu-install.templates:2001
-#| msgid "Some errors were found during installation"
 msgid "No errors were found during installation"
 msgstr "Ez da errorerik aurkitu instalazioan"
 
@@ -389,9 +385,8 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-"Hau garapeneko bertsioa bistaratzen da instalazioa ongi burutu "
-"dela argi eta garbi azaltzeko."
-
+"Hau garapeneko bertsioa bistaratzen da instalazioa ongi burutu dela argi eta "
+"garbi azaltzeko."
 #~ msgid ""
 #~ " - Main Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 2ad9c84..a2f826d 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -61,42 +61,42 @@ msgstr "Valitse Debian Edu -profiili"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Pääpalvelin"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Työasema"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Siirrettävä työasema"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Päätepalvelin"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Itsenäinen työasema"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimaalinen"
@@ -117,7 +117,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -127,7 +126,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -155,8 +154,7 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
-msgstr ""
-"Profiilia ”Itsenäinen työasema” ei voida käyttää muiden profiilien kanssa."
+msgstr "Profiilia ”Itsenäinen työasema” ei voida käyttää muiden profiilien kanssa."
 
 #. Type: error
 #. Description
@@ -181,14 +179,14 @@ msgstr "Profiilin ”Itsenäinen työasema” asennus on tehtävä osaksi käsin
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Kovalevyjen osioinnin helpottamiseksi profiilin ”Itsenäinen työasema” "
 "asennusprosessi ei ole yhtä automaattinen kuin muiden profiilien. Siirryt "
-"seuraavaksi Debian-asentimen päävalikkoon. Valitse ”Muuta debconf-"
-"prioriteettia” ja valitse prioriteetiksi ”korkea” ottaaksesi "
+"seuraavaksi Debian-asentimen päävalikkoon. Valitse ”Muuta "
+"debconf-prioriteettia” ja valitse prioriteetiksi ”korkea” ottaaksesi "
 "automaattiasennuksen takaisin käyttöön."
 
 #. Type: text
@@ -211,8 +209,8 @@ msgid ""
 msgstr ""
 "Tämä tuhoaa kaikkien koneen levyjen osiotaulut. TOISTAN: KAIKKI KONEEN "
 "LEVYJEN TIEDOT KATOAVAT! Jos levyillä on tärkeää tietoa, jota ei vielä ole "
-"varmuuskopioitu, on suositeltavaa lopettaa nyt ja kopioida tiedot talteen. "
-"Tällöin asennus on käynnistettävä myöhemmin uudestaan."
+"varmuuskopioitu, on suositeltavaa lopettaa nyt ja kopioida tiedot "
+"talteen. Tällöin asennus on käynnistettävä myöhemmin uudestaan."
 
 #. Type: text
 #. Description
@@ -253,8 +251,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Valintaa voidaan muuttaa myöhemmin ajamalla komento ”dpkg-reconfigure "
 "popularity-contest”."
@@ -270,7 +268,7 @@ msgstr "Debian Edun pääpalvelin"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edun päätepalvelin"
 
 #. Type: text
@@ -284,7 +282,7 @@ msgstr "Debian Edu -työasema"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edun pääpalvelin ja päätepalvelin"
 
 #. Type: text
@@ -317,14 +315,14 @@ msgstr "Vaadittujen pakettien asennus epäonnistui"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"Seuraavien vaadittujen pakettien asennus epäonnistui: ${PACKAGES}. "
-"Tiedostossa /var/log/syslog saattaa olla lisätietoja siitä miksi näin "
-"tapahtui. Asennettu järjestelmä ei toimisi oikein, joten asennus "
+"Seuraavien vaadittujen pakettien asennus epäonnistui: "
+"${PACKAGES}. Tiedostossa /var/log/syslog saattaa olla lisätietoja siitä "
+"miksi näin tapahtui. Asennettu järjestelmä ei toimisi oikein, joten asennus "
 "keskeytettiin ja järjestelmä käynnistetään nyt uudelleen."
 
 #. Type: boolean
@@ -409,7 +407,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #~ msgid ""
 #~ " - Main Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 399e355..9f2887f 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -31,42 +31,42 @@ msgstr "Profil Debian Edu à utiliser :"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Serveur principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Station de travail"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Station de travail mobile"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Serveur pour clients légers"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Autonome"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -87,7 +87,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -97,7 +96,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -156,8 +155,8 @@ msgstr "L'installation autonome est partiellement manuelle."
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Afin de faciliter la personnalisation du partitionnement, l'installation "
@@ -232,11 +231,11 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Vous pourrez à tout moment modifier votre choix en exécutant « dpkg-"
-"reconfigure popularity-contest »."
+"Vous pourrez à tout moment modifier votre choix en exécutant "
+"« dpkg-reconfigure popularity-contest »."
 
 #. Type: text
 #. Description
@@ -249,7 +248,7 @@ msgstr "Serveur principal Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Serveur Debian Edu pour clients légers"
 
 #. Type: text
@@ -263,7 +262,7 @@ msgstr "Station de travail Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Serveur Debian Edu principal et serveur pour clients légers"
 
 #. Type: text
@@ -296,10 +295,10 @@ msgstr "Échec de l'installation de paquets requis"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Certains paquets requis n'ont pas pu être installés. Les paquets concernés "
 "sont : ${PACKAGES}. Veuillez vérifier si des informations utiles peuvent "
@@ -321,9 +320,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"La place disponible sur le disque est trop faible pour les profils choisis. "
-"Veuillez choisir si vous voulez abandonner l'installation ou continuer sans "
-"mettre en place le schéma de partitionnement recommandé."
+"La place disponible sur le disque est trop faible pour les profils "
+"choisis. Veuillez choisir si vous voulez abandonner l'installation ou "
+"continuer sans mettre en place le schéma de partitionnement recommandé."
 
 #. Type: boolean
 #. Description
@@ -398,7 +397,6 @@ msgid ""
 msgstr ""
 "Ce message s'affiche dans la version de développement pour montrer que "
 "l'installation s'est bien terminée."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 0103f10..c912f3d 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -27,7 +27,7 @@ msgstr "Escolla o perfil de Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 #, fuzzy
 #| msgid "Main-Server"
@@ -36,14 +36,14 @@ msgstr "Servidor principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Estación de traballo"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 #, fuzzy
 #| msgid "Workstation"
@@ -52,23 +52,23 @@ msgstr "Estación de traballo"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 #, fuzzy
 #| msgid "Thin-Client-Server"
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Servidor de clientes lixeiros"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Autónomo"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Mínimo"
@@ -87,7 +87,6 @@ msgstr "Os perfís determinan como se configura inicialmente a máquina:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 #, fuzzy
 #| msgid ""
@@ -112,7 +111,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -167,8 +166,8 @@ msgstr "A instalación autónoma é manual en parte"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "A instalación autónoma non é tan automática como os outros perfís, para "
@@ -194,11 +193,11 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Isto ha destruír as táboas de particións de todos os discos da máquina. "
-"REPITO: ISTO HA BORRAR TODOS OS DISCOS DUROS DA MÁQUINA! Se ten datos "
-"importantes dos que non fixo copias de seguridade, agora é cando quere parar "
-"para facer unha copia. Se o fai, ha ter que volver comezar a instalación "
-"máis tarde."
+"Isto ha destruír as táboas de particións de todos os discos da "
+"máquina. REPITO: ISTO HA BORRAR TODOS OS DISCOS DUROS DA MÁQUINA! Se ten "
+"datos importantes dos que non fixo copias de seguridade, agora é cando quere "
+"parar para facer unha copia. Se o fai, ha ter que volver comezar a "
+"instalación máis tarde."
 
 #. Type: text
 #. Description
@@ -239,8 +238,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Esta elección pódese cambiar a posteriori executando «dpkg-reconfigure "
 "popularity-contest»."
@@ -260,7 +259,7 @@ msgstr "Servidor principal de Debian Edu"
 #: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Debian Edu Thin-Client-Server"
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Servidor de clientes lixeiros de Debian Edu"
 
 #. Type: text
@@ -276,7 +275,7 @@ msgstr "Estación de traballo de Debian Edu"
 #: ../debian-edu-profile-udeb.templates:13001
 #, fuzzy
 #| msgid "Debian Edu Main-Server and Thin-Client-Server"
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Servidor principal e cliente lixeiro de Debian Edu"
 
 #. Type: text
@@ -313,10 +312,10 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 
 #. Type: boolean
@@ -401,7 +400,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #, fuzzy
 #~| msgid ""
 #~| " - Main-Server: reserved for the Debian Edu server. It does not\n"
diff --git a/debian/po/id.po b/debian/po/id.po
index 7d59c27..ba41aa5 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -10,8 +10,8 @@ msgstr ""
 "POT-Creation-Date: 2014-09-30 09:23+0200\n"
 "PO-Revision-Date: 2013-05-29 23:35+0700\n"
 "Last-Translator: T. Surya Fajri <kilelme at gmail.com>\n"
-"Language-Team: Debian Indonesia Translators <debian-l10n-indonesian at lists."
-"debian.org>\n"
+"Language-Team: Debian Indonesia Translators "
+"<debian-l10n-indonesian at lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,42 +27,42 @@ msgstr "Pilih profil Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Server Utama"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Workstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Roaming Workstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Server Thin Client"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Standalone"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -81,7 +81,6 @@ msgstr "Profil menentukan bagaimana mesin dapat digunakan out-of-the-box:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -91,7 +90,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -121,8 +120,7 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
-msgstr ""
-"Profil Standalone tidak dapat digunakan bersamaan dengan profil lainnya"
+msgstr "Profil Standalone tidak dapat digunakan bersamaan dengan profil lainnya"
 
 #. Type: error
 #. Description
@@ -147,14 +145,14 @@ msgstr "Pemasangan Standalone sebagian dilakukan secara manual"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Pemasangan Standalone saat ini tidak seotomatis profil lainnya, untuk "
-"memudahkan pemartisian manual. Anda sekarang dialihkan ke menu utama debian-"
-"installer. Pilih \"Change debconf priority\", dan pilih prioritas \"high\" "
-"untuk mengaktifkan kembali pemasangan otomatis."
+"memudahkan pemartisian manual. Anda sekarang dialihkan ke menu utama "
+"debian-installer. Pilih \"Change debconf priority\", dan pilih prioritas "
+"\"high\" untuk mengaktifkan kembali pemasangan otomatis."
 
 #. Type: text
 #. Description
@@ -211,18 +209,18 @@ msgid ""
 msgstr ""
 "Jika anda memilih untuk berpartisipasi, script pengiriman otomatis akan "
 "dijalankan satu kali seminggu, mengirimkan statistika kepada pengembang "
-"distribusi. Statistika yang telah dikumpulan dapat dilihat di http://popcon."
-"debian.org/."
+"distribusi. Statistika yang telah dikumpulan dapat dilihat di "
+"http://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Pilihan ini dapat dimodifikasi kemudian dengan menjalankan \"dpkg-"
-"reconfigure popularity-contest\"."
+"Pilihan ini dapat dimodifikasi kemudian dengan menjalankan "
+"\"dpkg-reconfigure popularity-contest\"."
 
 #. Type: text
 #. Description
@@ -235,7 +233,7 @@ msgstr "Server Utama Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Server Thin Client Debian Edu"
 
 #. Type: text
@@ -249,7 +247,7 @@ msgstr "Workstation Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Server Utama dan Server Thin Client Debian Edu"
 
 #. Type: text
@@ -282,10 +280,10 @@ msgstr "Pemasangan paket-paket yang dibutuhkan gagal"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Beberapa paket yang dibutuhkan gagal untuk dipasang. Paket-paket tersebut "
 "adalah ${PACKAGES}. Periksa /var/log/syslog jika ada beberapa informasi "
@@ -383,7 +381,6 @@ msgid ""
 msgstr ""
 "Hal ini terlihat untuk versi pengembang untuk memastikan bahwa instalasi "
 "telah berhasil."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/it.po b/debian/po/it.po
index de68fa9..c62572b 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -59,42 +59,42 @@ msgstr "Scegli un profilo Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Server Principale"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Workstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Roaming Workstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Server thin client"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Standalone"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimo"
@@ -113,7 +113,6 @@ msgstr "I profili determinano come la macchina può essere usata out-of-the-box"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -123,7 +122,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -181,13 +180,13 @@ msgstr "L'installazione 'Standalone' è parzialmente manuale."
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "L'installazione 'Standalone' è attualmente non così automatica come le altre "
-"in modo da rendere un po' più facile il partizionamento manule del disco."
-"Verrai ora indirizzato al menu principale del debian-installer. Scegli "
+"in modo da rendere un po' più facile il partizionamento manule del "
+"disco.Verrai ora indirizzato al menu principale del debian-installer. Scegli "
 "\"Change debconf priority\" e quindi seleziona \"high\" per abilitare "
 "nuovamente l'installazione automatica."
 
@@ -247,15 +246,15 @@ msgid ""
 msgstr ""
 "Se si sceglie di partecipare, lo script di invio verrà eseguito "
 "automaticamente una volta alla settimana, spedendo le statistiche agli "
-"sviluppatori Debian. Le statistiche possono essere consultate su http://"
-"popcon.debian.org/."
+"sviluppatori Debian. Le statistiche possono essere consultate su "
+"http://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Questa scelta può essere cambiata in seguito eseguendo \"dpkg-reconfigure "
 "popularity-contest\"."
@@ -271,7 +270,7 @@ msgstr "Server Principale Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Server Thin Client Debian Edu"
 
 #. Type: text
@@ -285,7 +284,7 @@ msgstr "Debian Edu Workstation"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Server Principale e Server Thin Client Debian Edu"
 
 #. Type: text
@@ -318,10 +317,10 @@ msgstr "L'installazione dei pacchetti richiesti non è riuscita"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Alcuni pacchetti richiesti non sono stati installati.  I pacchetti sono  "
 "${PACKAGES}. Controlla /var/log/syslog per cercare di trovare informazioni "
@@ -344,9 +343,10 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"Lo spazio disponibile su disco è troppo piccolo per i profili selezionati. "
-"Si prega di scegliere se si desidera interrompere l'installazione o "
-"continuare senza la configurazione di partizionamento consigliata"
+"Lo spazio disponibile su disco è troppo piccolo per i profili "
+"selezionati. Si prega di scegliere se si desidera interrompere "
+"l'installazione o continuare senza la configurazione di partizionamento "
+"consigliata"
 
 #. Type: boolean
 #. Description
@@ -421,7 +421,6 @@ msgid ""
 msgstr ""
 "Questo si mostra solo per la versione di sviluppo per evidenziare che "
 "l'installazione ha avuto successo. "
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index b3e4dbc..642aa86 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -35,42 +35,42 @@ msgstr "Debian Edu プロファイルの選択"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "主サーバ"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "ワークステーション"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "ローミングワークステーション"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "シンクライアントサーバ"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "スタンドアロン"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "最小"
@@ -89,7 +89,6 @@ msgstr "プロファイルはマシンをどのように使うかを決定しま
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -99,7 +98,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -112,12 +111,10 @@ msgstr ""
 "             インターフェイス) を含んでいません。Debian Edu ネットワークで\n"
 "             このサーバは 1 つのみであるべきです。\n"
 " - ワークステーション: Debian Edu ネットワークの通常のマシンです。\n"
-" - ローミングワークステーション: Debian Edu ネットワークでの単一ユーザマシ"
-"ン\n"
+" - ローミングワークステーション: Debian Edu ネットワークでの単一ユーザマシン\n"
 "             向けで、そのネットワークから外に出ることもあります。\n"
 " - シンクライアントサーバ:\n"
-"             'ワークステーション' を含み、2 枚のネットワークカードが必要で"
-"す。\n"
+"             'ワークステーション' を含み、2 枚のネットワークカードが必要です。\n"
 " - スタンドアロン:  Debian Edu ネットワーク外で使われるマシンです。\n"
 "             GUI を含み、ほかのプロファイルとは競合します。\n"
 " - 最小    : Debian Edu ネットワークに完全に統合されますが、GUI なしの\n"
@@ -138,10 +135,7 @@ msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
 "combination excluding Standalone."
-msgstr ""
-"スタンドアロンプロファイルは、同じマシンにほかのプロファイルと一緒にはインス"
-"トールできません。スタンドアロンだけを選ぶか、スタンドアロン以外の組み合わせ"
-"で選んでください。"
+msgstr "スタンドアロンプロファイルは、同じマシンにほかのプロファイルと一緒にはインストールできません。スタンドアロンだけを選ぶか、スタンドアロン以外の組み合わせで選んでください。"
 
 #. Type: note
 #. Description
@@ -154,14 +148,12 @@ msgstr "スタンドアロンインストールは部分的に手動です"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
-"スタンドアロンインストールは現時点ではほかのプロファイルほど自動的ではなく、"
-"手動パーティショニングをより簡単にするという程度です。debian-installer メイン"
-"メニューに移動します。\"debconf 優先度の変更\" を選び、自動インストールを再び"
-"有効にするために優先度 \"高\" を選択してください。"
+"スタンドアロンインストールは現時点ではほかのプロファイルほど自動的ではなく、手動パーティショニングをより簡単にするという程度です。debian-installer "
+"メインメニューに移動します。\"debconf 優先度の変更\" を選び、自動インストールを再び有効にするために優先度 \"高\" を選択してください。"
 
 #. Type: text
 #. Description
@@ -181,11 +173,8 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"これはマシンにあるすべてのディスクのパーティションテーブルを破壊します。*繰り"
-"返します: これはマシンにあるすべてのディスクをまっさらにします!* もしバック"
-"アップを取っていない重要なデータがあるなら、バックアップを行うために今すぐ中"
-"止するのがよいでしょう。それが終わってから、再びインストールをやり直してくだ"
-"さい。"
+"これはマシンにあるすべてのディスクのパーティションテーブルを破壊します。*繰り返します: これはマシンにあるすべてのディスクをまっさらにします!* "
+"もしバックアップを取っていない重要なデータがあるなら、バックアップを行うために今すぐ中止するのがよいでしょう。それが終わってから、再びインストールをやり直してください。"
 
 #. Type: text
 #. Description
@@ -205,10 +194,8 @@ msgid ""
 "influences decisions such as which packages should go on the first "
 "distribution CD."
 msgstr ""
-"このシステムであなたが最も利用したパッケージについての統計をディストリビュー"
-"ション開発者に匿名で提供するようシステムを設定できます。この情報は私たちが 1 "
-"番目の配布 CD に入れるべきパッケージであるかどうかなどを決定する際に役立ちま"
-"す。"
+"このシステムであなたが最も利用したパッケージについての統計をディストリビューション開発者に匿名で提供するようシステムを設定できます。この情報は私たちが "
+"1 番目の配布 CD に入れるべきパッケージであるかどうかなどを決定する際に役立ちます。"
 
 #. Type: boolean
 #. Description
@@ -218,19 +205,17 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on http://popcon.debian.org/."
 msgstr ""
-"参加することを選ぶと、自動提出スクリプトが毎週 1 回自動的に実行され、ディスト"
-"リビューション開発者に統計が送られます。収集された統計は、http://popcon."
-"debian.org/ で見ることができます。"
+"参加することを選ぶと、自動提出スクリプトが毎週 1 "
+"回自動的に実行され、ディストリビューション開発者に統計が送られます。収集された統計は、http://popcon.debian.org/ "
+"で見ることができます。"
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
-msgstr ""
-"この決定は、あとでいつでも \"dpkg-reconfigure popularity-contest\" を実行して"
-"変更できます。"
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
+msgstr "この決定は、あとでいつでも \"dpkg-reconfigure popularity-contest\" を実行して変更できます。"
 
 #. Type: text
 #. Description
@@ -243,7 +228,7 @@ msgstr "Debian Edu 主サーバ"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu シンクライアントサーバ"
 
 #. Type: text
@@ -257,7 +242,7 @@ msgstr "Debian Edu ワークステーション"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu 主サーバとシンクライアントサーバ"
 
 #. Type: text
@@ -290,22 +275,20 @@ msgstr "必須パッケージのインストールに失敗"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"いくつかの必須パッケージのインストールに失敗しました。そのパッケージは "
-"${PACKAGES} です。なぜ失敗したのかの情報があるかもしれないので、/var/log/"
-"syslog を確認してください。インストールされたシステムは正常に動作しないので、"
-"インストールは中止され、システムは今再起動されます。"
+"いくつかの必須パッケージのインストールに失敗しました。そのパッケージは ${PACKAGES} "
+"です。なぜ失敗したのかの情報があるかもしれないので、/var/log/syslog "
+"を確認してください。インストールされたシステムは正常に動作しないので、インストールは中止され、システムは今再起動されます。"
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
-msgstr ""
-"利用可能なディスクの空き容量が小さすぎます。インストールを中止しますか?"
+msgstr "利用可能なディスクの空き容量が小さすぎます。インストールを中止しますか?"
 
 #. Type: boolean
 #. Description
@@ -314,10 +297,7 @@ msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
-msgstr ""
-"利用可能なディスクの空き容量が選択されたプロファイルには小さすぎます。インス"
-"トールを中止するか、推奨パーティションセットアップでのセットアップなしに続け"
-"るかいずれか選んでください。"
+msgstr "利用可能なディスクの空き容量が選択されたプロファイルには小さすぎます。インストールを中止するか、推奨パーティションセットアップでのセットアップなしに続けるかいずれか選んでください。"
 
 #. Type: boolean
 #. Description
@@ -327,9 +307,8 @@ msgid ""
 "files _and_ user files.  Note that this can cause stability problems after a "
 "while."
 msgstr ""
-"続けることを選ぶ場合、1 つのパーティションが全システムファイルおよびユーザ"
-"ファイル用に使われます。これは後日安定性の問題を引き起こすかもしれないことに"
-"注意してください。"
+"続けることを選ぶ場合、1 "
+"つのパーティションが全システムファイルおよびユーザファイル用に使われます。これは後日安定性の問題を引き起こすかもしれないことに注意してください。"
 
 #. Type: text
 #. Description
@@ -348,9 +327,8 @@ msgid ""
 "required.  It is currently missing, so this installation can not continue "
 "and will be aborted."
 msgstr ""
-"PXE と NETINST CD を使って Debian Edu をインストールするにはネットワーク接続"
-"が必要です。現在それがないため、このインストールを続行することはできず、中止"
-"されます。"
+"PXE と NETINST CD を使って Debian Edu "
+"をインストールするにはネットワーク接続が必要です。現在それがないため、このインストールを続行することはできず、中止されます。"
 
 #. Type: text
 #. Description
@@ -389,10 +367,7 @@ msgstr "インストール中にエラーは発見されませんでした"
 msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
-msgstr ""
-"開発バージョンではインストールが成功したことを明確にするためにこのように表示"
-"しています。"
-
+msgstr "開発バージョンではインストールが成功したことを明確にするためにこのように表示しています。"
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/lv.po b/debian/po/lv.po
index b4e8841..a5a625b 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -26,8 +26,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
-"\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
 #. Type: text
@@ -39,45 +39,42 @@ msgstr "Izvēlieties Debian Edu profīlu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-#| msgid "Main-Server"
 msgid "Main Server"
 msgstr "Pamatserveris"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Darbstacija"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-#| msgid "Workstation"
 msgid "Roaming Workstation"
 msgstr "Parvietojama Darbstacija"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-#| msgid "Thin-Client-Server"
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Plāno Klientu Serveris"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Patstāvīgs"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimāls"
@@ -96,7 +93,6 @@ msgstr "Profili nosaka kā dators var tikt lietots uzreiz pēc uzstādīšanas:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -106,7 +102,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -123,8 +119,8 @@ msgstr ""
 "dažreiz ceļo ārpus šī tīkla.\n"
 " - Plāno Klientu Serveris: iekļauj 'Darbstacijas' profilu un pieprasa divas "
 "tīkla kartes.\n"
-" - Patstāvīgs: datoriem, kas paredzēti lietošanai ārpus Debian Edu tīkla. "
-"Šis profils iekļauj grafisko saskarni un nav savietojams ar citiem.\n"
+" - Patstāvīgs: datoriem, kas paredzēti lietošanai ārpus Debian Edu "
+"tīkla. Šis profils iekļauj grafisko saskarni un nav savietojams ar citiem.\n"
 " - Minimāls: pilnībā integrēts Debian Edu tīklā, bet tikai minimāla sistēma "
 "bez grafiskās saskarnes."
 
@@ -157,8 +153,8 @@ msgstr "Patstāvīgā profila instalācija ir daļēji manuāla"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Patstāvīgā profila instalācija nav tik automatizēta, kā citu profilu "
@@ -185,12 +181,12 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Ši darbība iznīcinās partīciju tabulu uz visiem šīs mašīnas diskiem. "
-"ATKĀRTOJU: ŠĪ DARBĪBA IZNĪCINĀS VISUS DATUS ŠĪ DATORA CIETAJOS DISKOS! Ja "
-"Jums uz šiem diskiem ir svarīgi dati, kuriem nav izveidotas rezerves "
-"kopijas, jūms vajadzētu pārtraukt instalācijas procesu, lai veiktu datu "
-"rezerves kopēšanu. Šajā gadījumā Jums būs jāuzsāk instalācijas process no "
-"jauna."
+"Ši darbība iznīcinās partīciju tabulu uz visiem šīs mašīnas "
+"diskiem. ATKĀRTOJU: ŠĪ DARBĪBA IZNĪCINĀS VISUS DATUS ŠĪ DATORA CIETAJOS "
+"DISKOS! Ja Jums uz šiem diskiem ir svarīgi dati, kuriem nav izveidotas "
+"rezerves kopijas, jūms vajadzētu pārtraukt instalācijas procesu, lai veiktu "
+"datu rezerves kopēšanu. Šajā gadījumā Jums būs jāuzsāk instalācijas process "
+"no jauna."
 
 #. Type: text
 #. Description
@@ -212,7 +208,8 @@ msgid ""
 msgstr ""
 "Sistēma spēj anonīmi nosūtīt distributīva izstrādātājiem statistiku par "
 "biežāk lietojamajām programmām šajā sistēmā. Šī informācija ietekmē dažādus "
-"lēmumus, kā piemēram kādas programmas tiek iekļautas pirmajā instalācijas CD."
+"lēmumus, kā piemēram kādas programmas tiek iekļautas pirmajā instalācijas "
+"CD."
 
 #. Type: boolean
 #. Description
@@ -230,17 +227,16 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Šo izvēli var mainīt vēlāk izmantojot komandu \"dpkg-reconfigure popularity-"
-"contest\"."
+"Šo izvēli var mainīt vēlāk izmantojot komandu \"dpkg-reconfigure "
+"popularity-contest\"."
 
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:10001
-#| msgid "Main-Server"
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu Pamatserveris"
 
@@ -248,15 +244,13 @@ msgstr "Debian Edu Pamatserveris"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-#| msgid "Thin-Client-Server"
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu Plāno Klientu Serveris"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:12001
-#| msgid "Workstation"
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu Darbstacija"
 
@@ -264,14 +258,13 @@ msgstr "Debian Edu Darbstacija"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu Pamatserveris un Plāno Klientu Serveris"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:14001
-#| msgid "Workstation"
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu Pamatserveris un Darbstacija"
 
@@ -279,14 +272,12 @@ msgstr "Debian Edu Pamatserveris un Darbstacija"
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:15001
-#| msgid "Choose Debian Edu profile"
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Minimāls"
 
 #. Type: title
 #. Description
 #: ../debian-edu-profile-udeb.templates:16001
-#| msgid "Workstation"
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu paku uzstādīšanas kļūda"
 
@@ -300,15 +291,15 @@ msgstr "Nepieciešamo paku uzstādīšanas laikā ir notikusi kļūda"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"Dažas nepieciešamās pakas netika uzstādītas. Šīs pakas ir ${PACKAGES}. "
-"Pārbaudiet /var/log/syslog - tajā var būt papildus informācija par to kāpēc "
-"tas notika. Uzstādītā sistēma nav funkcionāla, uzstādīšanas process tiks "
-"pārtraukts un dators tiks pārstartēts."
+"Dažas nepieciešamās pakas netika uzstādītas. Šīs pakas ir "
+"${PACKAGES}. Pārbaudiet /var/log/syslog - tajā var būt papildus informācija "
+"par to kāpēc tas notika. Uzstādītā sistēma nav funkcionāla, uzstādīšanas "
+"process tiks pārtraukts un dators tiks pārstartēts."
 
 #. Type: boolean
 #. Description
@@ -401,7 +392,6 @@ msgid ""
 msgstr ""
 "Šis paziņojums tiek rādīts izstrādātāju versijā, lai būtu skaidrs, ka "
 "uzstādīšana veiksmīgi beidzās."
-
 #, fuzzy
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Debian Edu instalācijas procesā kaut kas nogāja greizi."
diff --git a/debian/po/nb.po b/debian/po/nb.po
index 6d8823e..20262e3 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -46,42 +46,42 @@ msgstr "Velg Debian Edu-profil"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hovedtjener"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Vandrende arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Tynnklienttjener"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Frittstående"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -100,7 +100,6 @@ msgstr "Profiler styrer hvordan maskinen kan bli brukt ut av boksen:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -110,7 +109,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -166,14 +165,14 @@ msgstr "Frittstående installasjon er delvis manuell"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Frittstående installasjon er for tiden ikke like fullt automatisert som de "
-"andre profilene, for at du da lettere selv skal kunne partisjonere manuelt. "
-"Du får nå tilgang til den utvidede installasjonsmenyen. Velg der «Endre "
-"debconf-prioritet», og velg prioritet «høy» slik at den automatiske "
+"andre profilene, for at du da lettere selv skal kunne partisjonere "
+"manuelt. Du får nå tilgang til den utvidede installasjonsmenyen. Velg der "
+"«Endre debconf-prioritet», og velg prioritet «høy» slik at den automatiske "
 "installasjonen starter igjen."
 
 #. Type: text
@@ -183,8 +182,7 @@ msgstr ""
 #: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
 msgid "Really use the automatic partitioning tool?"
-msgstr ""
-"Er du sikker på at du vil bruke det automatiske partisjoneringsverktøyet?"
+msgstr "Er du sikker på at du vil bruke det automatiske partisjoneringsverktøyet?"
 
 #. Type: boolean
 #. Description
@@ -195,10 +193,10 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Denne operasjonen ødelegger partisjonstabellen på alle disker i maskinen. "
-"GJENTAR: DETTE SLETTER ALLE HARDDISKER I MASKINEN. Hvis du har viktige data "
-"som ikke er sikkerhetskopiert bør du stoppe nå og sikre dataene dine. I så "
-"fall må du starte installasjonen om igjen senere."
+"Denne operasjonen ødelegger partisjonstabellen på alle disker i "
+"maskinen. GJENTAR: DETTE SLETTER ALLE HARDDISKER I MASKINEN. Hvis du har "
+"viktige data som ikke er sikkerhetskopiert bør du stoppe nå og sikre dataene "
+"dine. I så fall må du starte installasjonen om igjen senere."
 
 #. Type: text
 #. Description
@@ -239,11 +237,11 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Dette valget kan senere endres ved å kjøre «dpkg reconfigure popularity-"
-"contest»."
+"Dette valget kan senere endres ved å kjøre «dpkg reconfigure "
+"popularity-contest»."
 
 #. Type: text
 #. Description
@@ -256,7 +254,7 @@ msgstr "Debian Edu hovedtjener"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu tynnklienttjener"
 
 #. Type: text
@@ -270,7 +268,7 @@ msgstr "Debian Edu arbeidsstasjon"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu hovedtjener og tynnklient-tjener"
 
 #. Type: text
@@ -303,10 +301,10 @@ msgstr "Installasjonen av påkrevde pakker feilet"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Noen obligatoriske pakker kunne ikke bli innstallert. Pakken(e) er "
 "${PACKAGES}. Sjekk i /var/log/syslog om det finnes noen informasjon om "
@@ -405,7 +403,6 @@ msgid ""
 msgstr ""
 "Dette blir vist for utviklingsversjonen for å gjøre det klart at "
 "installasjonen var vellykket."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 2019f8e..de5cc64 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -30,42 +30,42 @@ msgstr "Toe te passen Debian Edu profiel(en) kiezen"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hoofdserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Werkstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Mobiel werkstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Thin-clientserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Autonome computer"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimale installatie"
@@ -86,7 +86,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -96,7 +95,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -158,8 +157,8 @@ msgstr ""
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "De installatie van het profiel 'autonome computer' is niet in dezelfde mate "
@@ -233,8 +232,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "U kunt uw keuze altijd nog herzien via het commando 'dpkg-reconfigure "
 "popularity-contest'."
@@ -250,7 +249,7 @@ msgstr "Hoofdserver van Debian Edu "
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Thin-clientserver van Debian Edu"
 
 #. Type: text
@@ -264,7 +263,7 @@ msgstr "Werkstation van Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Hoofdserver en thin-clientserver van Debian Edu"
 
 #. Type: text
@@ -297,10 +296,10 @@ msgstr "De installatie van noodzakelijke pakketten is mislukt"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Sommige noodzakelijke pakketten konden niet worden geïnstalleerd. Het "
 "betreft de pakketten ${PACKAGES}. Raadpleeg /var/log/syslog voor een "
@@ -322,9 +321,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"Er is te weinig schijfruimte beschikbaar voor de geselecteerde profielen. "
-"Geef aan of u de installatie wilt afbreken of wilt doorgaan zonder de "
-"aanbevolen partitie-indeling."
+"Er is te weinig schijfruimte beschikbaar voor de geselecteerde "
+"profielen. Geef aan of u de installatie wilt afbreken of wilt doorgaan "
+"zonder de aanbevolen partitie-indeling."
 
 #. Type: boolean
 #. Description
@@ -401,7 +400,6 @@ msgid ""
 msgstr ""
 "In de ontwikkelingsversie wordt dit bericht getoond om duidelijk te maken "
 "dat de installatie succesvol verliep."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/nn.po b/debian/po/nn.po
index 7f6a1c8..bb314b8 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -40,42 +40,42 @@ msgstr "Vel Debian Edu-profil"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hovudtenar"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Vandrande Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Tynnklient-tenar"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Frittståande"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -94,7 +94,6 @@ msgstr "Profilar styrer korleis maskina kan bli brukt ut-av-boksen:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -104,7 +103,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -159,8 +158,8 @@ msgstr "Frittståande installasjon er delvis manuell"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Frittståande installasjon er for tida ikkje like automatisert som dei andre "
@@ -231,8 +230,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Du kan seinare endra valet ditt ved å køyra kommandoen «dpkg-reconfigure "
 "popularity-contest»."
@@ -248,7 +247,7 @@ msgstr "Debian Edu Hovudtenar"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu Tynnklienttenar"
 
 #. Type: text
@@ -262,7 +261,7 @@ msgstr "Debian Edu Arbeidsstasjon"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu Hovudtenar og tynnklienttenar"
 
 #. Type: text
@@ -295,15 +294,15 @@ msgstr "Installasjonen av påkravde pakkar feila"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Installasjonen av nokre påkravde pakkar feila. Desse pakkane var "
-"${PACKAGES}. Sjå i /var/log/syslog etter informasjon om kvifor dette hende. "
-"Det installerte systemet vil ikkje verka skikkeleg, så installasjonen vart "
-"avbroten og systemet vil no starta på nytt."
+"${PACKAGES}. Sjå i /var/log/syslog etter informasjon om kvifor dette "
+"hende. Det installerte systemet vil ikkje verka skikkeleg, så installasjonen "
+"vart avbroten og systemet vil no starta på nytt."
 
 #. Type: boolean
 #. Description
@@ -395,7 +394,6 @@ msgid ""
 msgstr ""
 "Dette vert vist i utviklingsversjonen for å gjera det klart at "
 "installasjonen var vellukka."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 943f1f3..48fd0dd 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -53,8 +53,8 @@ msgstr ""
 "#-#-#-#-#  pl.po.newstring (nn)  #-#-#-#-#\n"
 "nynorsk at lists.debian.org>\n"
 "X-Generator: Gtranslator 2.91.5\n"
-"Plural-Forms:  nplurals=3; \t\t\t\tplural=n==1 ? 0 : \t\t\t\t\tn%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms:  nplurals=3; \t\t\t\tplural=n==1 ? 0 : \t\t\t\t\tn%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "#-#-#-#-#  pl.po.newstring (debian-installer)  #-#-#-#-#\n"
 "#-#-#-#-#  pl.po (popularity-contest)  #-#-#-#-#\n"
 
@@ -67,42 +67,42 @@ msgstr "Wybierz profil Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Serwer główny"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Stacja robocza"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Mobilna stacja robocza"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Serwer cienkich klientów"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Samodzielna stacja"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimalna stacja"
@@ -121,7 +121,6 @@ msgstr "Profile określają sposób użytkowania maszyny:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -131,7 +130,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -183,8 +182,8 @@ msgstr "Instalacja Samodzielnej stacji jest częściowo ręczna"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Instalacja Samodzielnej stacji nie jest jeszcze tak zautomatyzowana jak inne "
@@ -248,18 +247,18 @@ msgid ""
 msgstr ""
 "Jeśli zgodzisz się na udział w tym konkursie, skrypt uruchamiany "
 "automatycznie raz w tygodniu będzie przesyłał statystyki do deweloperów "
-"dystrybucji. Zebrane statystyki oglądać można pod adresem http://popcon."
-"debian.org/."
+"dystrybucji. Zebrane statystyki oglądać można pod adresem "
+"http://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Możesz w każdej chwili zmienić swoje zdanie uruchamiając później: \"dpkg-"
-"reconfigure popularity-contest\""
+"Możesz w każdej chwili zmienić swoje zdanie uruchamiając później: "
+"\"dpkg-reconfigure popularity-contest\""
 
 #. Type: text
 #. Description
@@ -272,7 +271,7 @@ msgstr "Serwer główny Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Serwer cienkich klientów Debian Edu"
 
 #. Type: text
@@ -286,7 +285,7 @@ msgstr "Stacja robocza Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Serwer główny i serwer cienkich klientów Debian Edu"
 
 #. Type: text
@@ -319,10 +318,10 @@ msgstr "Instalacja wymaganych pakietów nie powiodła się"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Instalacja niektórych wymaganych pakietów nie powiodła się. Te pakiety to "
 "${PACKAGES}. Sprawdź /var/log/syslog, mogą tam znajdować się informacje "
@@ -420,7 +419,6 @@ msgid ""
 msgstr ""
 "Ten komunikat pokazywany jest w wersji deweloperskiej aby potwierdzić, że "
 "instalacja powiodła się."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 710461d..7fee4ef 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -33,42 +33,42 @@ msgstr "Escolher o perfil de Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Servidor Principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Estação de Trabalho Roaming"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Servidor de Thin Client"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Individual"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Mínimo"
@@ -83,12 +83,10 @@ msgstr "Perfil(s) a aplicar a esta máquina:"
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
-msgstr ""
-"Os perfis determinam como pode a máquina ser utilizada após a instalação:"
+msgstr "Os perfis determinam como pode a máquina ser utilizada após a instalação:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -98,7 +96,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -154,8 +152,8 @@ msgstr "A instalação 'Individual' é parcialmente manual"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "A instalação 'Individual' não é actualmente tão automática como os outros "
@@ -182,11 +180,11 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Isto irá destruir a tabela de partições em todos os discos desta máquina. "
-"REPITO:  ISTO IRÁ LIMPAR TODOS OS DISCOS RÍGIDOS DESTA MÁQUINA! Se tem "
-"informação importante de que não existam backups, talvez queira parar agora "
-"para poder fazer uma cópia de segurança. Nesse caso, terá de recomeçar a "
-"instalação mais tarde."
+"Isto irá destruir a tabela de partições em todos os discos desta "
+"máquina. REPITO:  ISTO IRÁ LIMPAR TODOS OS DISCOS RÍGIDOS DESTA MÁQUINA! Se "
+"tem informação importante de que não existam backups, talvez queira parar "
+"agora para poder fazer uma cópia de segurança. Nesse caso, terá de recomeçar "
+"a instalação mais tarde."
 
 #. Type: text
 #. Description
@@ -227,8 +225,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Esta escolha pode ser posteriormente alterada correndo \"dpkg-reconfigure "
 "popularity-contest\"."
@@ -244,7 +242,7 @@ msgstr "Servidor Principal Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Servidor Thin Client Debian Edu"
 
 #. Type: text
@@ -258,7 +256,7 @@ msgstr "Estação de Trabalho Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Servidor Principal Debian Edu e Servidor de Thin Client"
 
 #. Type: text
@@ -291,10 +289,10 @@ msgstr "A instalação dos pacotes necessários falhou"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "A instalação de alguns pacotes necessários falhou. Os pacotes eram "
 "${PACKAGES}. Verifique se em /var/log/syslog existe alguma informação acerca "
@@ -305,8 +303,7 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
-msgstr ""
-"O espaço disponível em disco é demasiado pequeno.  Abortar a instalação?"
+msgstr "O espaço disponível em disco é demasiado pequeno.  Abortar a instalação?"
 
 #. Type: boolean
 #. Description
@@ -316,9 +313,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"O espaço em disco disponível é demasiado pequeno para os perfis escolhidos. "
-"Por favor escolha se deseja abortar a instalação ou continuar sem definir a "
-"configuração recomendada de particionamento"
+"O espaço em disco disponível é demasiado pequeno para os perfis "
+"escolhidos. Por favor escolha se deseja abortar a instalação ou continuar "
+"sem definir a configuração recomendada de particionamento"
 
 #. Type: boolean
 #. Description
@@ -393,7 +390,6 @@ msgid ""
 msgstr ""
 "Isto é mostrado na versão de desenvolvimento para tornar claro que a "
 "instalação teve sucesso."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
@@ -467,13 +463,13 @@ msgstr ""
 #~ "to include the workstation profile or 'Thin-Client-Server'."
 #~ msgstr ""
 #~ "Cada rede Debian Edu necessita de uma, e apenas uma máquina a correr o "
-#~ "perfil 'Servidor-Principal'.  Esta máquina fornece os serviços de rede"
-#~ "(principalmente serviços de ficheiros/rede e LDAP), logo sem esta máquina "
-#~ "a rede não funciona. Como esta máquina irá conter todos os ficheiros de "
-#~ "dados, esta necessitará de bastante espaço no disco. Instalar unicamente "
-#~ "esta opção resultará numa máquina sem Interface Gráfico de Utilizador"
-#~ "(=GUI), se desejar um GUI necessitará de incluir o perfil 'Estação-de-"
-#~ "Trabalho' ou 'Servidor-de-cliente-Leve'."
+#~ "perfil 'Servidor-Principal'.  Esta máquina fornece os serviços de "
+#~ "rede(principalmente serviços de ficheiros/rede e LDAP), logo sem esta "
+#~ "máquina a rede não funciona. Como esta máquina irá conter todos os "
+#~ "ficheiros de dados, esta necessitará de bastante espaço no disco. "
+#~ "Instalar unicamente esta opção resultará numa máquina sem Interface "
+#~ "Gráfico de Utilizador(=GUI), se desejar um GUI necessitará de incluir o "
+#~ "perfil 'Estação-de-Trabalho' ou 'Servidor-de-cliente-Leve'."
 
 #~ msgid ""
 #~ "Machines running the 'Workstation' profile are normal machines. Users "
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 4eb3cd3..c92f6af 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.821\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-15 14:28+0000\n"
+"Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
+"POT-Creation-Date: 2014-09-30 09:23+0200\n"
 "PO-Revision-Date: 2015-08-15 19:04-0300\n"
 "Last-Translator: Adriano Rafael Gomes <adrianorg at arg.eti.br>\n"
-"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
-"org>\n"
+"Language-Team: Brazilian Portuguese "
+"<debian-l10n-portuguese at lists.debian.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,36 +29,42 @@ msgstr "Selecione o perfil Debian Edu"
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Servidor Principal"
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Estação de Trabalho Itinerante"
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Servidor de \"Thin Client\""
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Autônomo"
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Mínimo"
@@ -88,7 +94,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -141,8 +147,8 @@ msgstr "A instalação do perfil Autônomo é parcialmente manual"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Atualmente, a instalação do perfil Autônomo não é tão automática quanto os "
@@ -169,10 +175,10 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Isto destruirá a tabela de partições em todos os discos desta máquina. "
-"REPITO: ISTO APAGARÁ TODOS OS DISCOS NESTA MÁQUINA! Se você possui dados "
-"importantes que não estão salvos em backup, pode ser interessante que você "
-"pare agora e faça um backup. Neste caso, você terá que reiniciar a "
+"Isto destruirá a tabela de partições em todos os discos desta "
+"máquina. REPITO: ISTO APAGARÁ TODOS OS DISCOS NESTA MÁQUINA! Se você possui "
+"dados importantes que não estão salvos em backup, pode ser interessante que "
+"você pare agora e faça um backup. Neste caso, você terá que reiniciar a "
 "instalação posteriormente."
 
 #. Type: text
@@ -208,15 +214,15 @@ msgid ""
 msgstr ""
 "Caso você opte por participar, o script de envio automático será executado "
 "uma vez por semana, enviando as estatísticas para os desenvolvedores da "
-"distribuição. As estatísticas coletadas podem ser visualizadas em http://"
-"popcon.debian.org/."
+"distribuição. As estatísticas coletadas podem ser visualizadas em "
+"http://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Sua escolha pode ser modificada posteriormente através da execução do "
 "comando \"dpkg-reconfigure popularity-contest\"."
@@ -232,7 +238,7 @@ msgstr "Servidor Principal Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Servidor de \"Thin Client\" Debian Edu"
 
 #. Type: text
@@ -246,7 +252,7 @@ msgstr "Estação de Trabalho Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Servidor Principal e Servidor de \"Thin Client\" Debian Edu"
 
 #. Type: text
@@ -279,10 +285,10 @@ msgstr "Instalação de pacotes requeridos falhou"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "A instalação de alguns pacotes requeridos falhou. Os pacotes foram "
 "${PACKAGES}. Verifique em /var/log/syslog se existe alguma informação sobre "
@@ -304,9 +310,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"O espaço em disco disponível é muito pequeno para os perfis selecionados. "
-"Por favor, escolha se você quer cancelar a instalação ou continuar sem "
-"configurar o esquema de particionamento recomendado"
+"O espaço em disco disponível é muito pequeno para os perfis "
+"selecionados. Por favor, escolha se você quer cancelar a instalação ou "
+"continuar sem configurar o esquema de particionamento recomendado"
 
 #. Type: boolean
 #. Description
@@ -383,7 +389,6 @@ msgid ""
 msgstr ""
 "Isso é exibido para a versão em desenvolvimento para deixar claro que a "
 "instalação foi bem sucedida."
-
 #~ msgid ""
 #~ " - Main-Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 2c188c0..f9cfbed 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -28,42 +28,42 @@ msgstr "Alegeți profilul Debian Edu:"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Serverul principal"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Stație de lucru"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Stație de lucru mobilă"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Server pentru clienți minimali"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Autonom"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -84,7 +84,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -94,7 +93,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -151,15 +150,15 @@ msgstr "Instalarea profilului „Autonom” este parțial manuală"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Instalarea profilului „Autonom” nu este în acest moment la fel de "
 "automatizată precum celelalte profile, pentru a ușura crearea manuală de "
-"partiții. Veți fi direcționat către meniul principal din debian-installer. "
-"Selectați \"Change debconf priority\", și alegeți \"high\" pentru a reactiva "
-"instalarea automată."
+"partiții. Veți fi direcționat către meniul principal din "
+"debian-installer. Selectați \"Change debconf priority\", și alegeți \"high\" "
+"pentru a reactiva instalarea automată."
 
 #. Type: text
 #. Description
@@ -179,11 +178,11 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Aceasta va elimina tabela de partiții de pe toate discurile sistemului. "
-"REPETARE: ACEASTĂ ACȚIUNEA VA ȘTERGE COMPLET TOATE DISCURILE FIXE DIN "
-"SISTEM! Dacă aveți date importante care nu sunt salvate, probabil că ar "
-"trebui să întrerupeți instalarea pentru a efectua copii de siguranță. În "
-"acest caz, va trebui să reporniți instalarea."
+"Aceasta va elimina tabela de partiții de pe toate discurile "
+"sistemului. REPETARE: ACEASTĂ ACȚIUNEA VA ȘTERGE COMPLET TOATE DISCURILE "
+"FIXE DIN SISTEM! Dacă aveți date importante care nu sunt salvate, probabil "
+"că ar trebui să întrerupeți instalarea pentru a efectua copii de "
+"siguranță. În acest caz, va trebui să reporniți instalarea."
 
 #. Type: text
 #. Description
@@ -224,8 +223,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Această alegere poate fi modificată ulterior executând „dpkg-reconfigure "
 "popularity-contest”."
@@ -241,7 +240,7 @@ msgstr "Serverul principal Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Serverul Debian Edu pentru clienți minimali"
 
 #. Type: text
@@ -255,7 +254,7 @@ msgstr "Stație de lucru Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Server principal Debian Edu și server pentru clienti minimali"
 
 #. Type: text
@@ -288,10 +287,10 @@ msgstr "Instalarea pachetelor solicitate a eșuat"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Anumite pachete nu au putut fi instalate. Pachetele în cauză sunt: "
 "${PACKAGES}. Verificați raportul din /var/log/syslog pentru informații care "
@@ -312,9 +311,9 @@ msgid ""
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
 msgstr ""
-"Spațiul disponibil pe disc este insuficient pentru profilele selectate. "
-"Alegeți dacă vreți să opriți instalarea sau să continuați fără a configura "
-"partițiile recomandate."
+"Spațiul disponibil pe disc este insuficient pentru profilele "
+"selectate. Alegeți dacă vreți să opriți instalarea sau să continuați fără a "
+"configura partițiile recomandate."
 
 #. Type: boolean
 #. Description
@@ -389,7 +388,6 @@ msgid ""
 msgstr ""
 "Afișat doar pentru versiunea de dezvoltare, pentru a asigura că instalarea a "
 "avut succes."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 6f85c37..f1d450c 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: text
 #. Description
@@ -30,42 +30,42 @@ msgstr "Выберите профиль Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Основной сервер"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Рабочая станция"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Передвижная рабочая станция"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Сервер тонких клиентов"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Автономная машина"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Минимальная система"
@@ -86,7 +86,6 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -96,7 +95,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -154,8 +153,8 @@ msgstr "Установка профиля 'Автономная машина' ч
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "В настоящий момент установка профиля 'Автономная машина' не так "
@@ -225,8 +224,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Это решение можно позже изменить запустив команду \"dpkg-reconfigure "
 "popularity-contest\"."
@@ -242,7 +241,7 @@ msgstr "Основной сервер Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Сервер тонких клиентов Debian Edu"
 
 #. Type: text
@@ -256,7 +255,7 @@ msgstr "Рабочая станция Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Основной сервер и Сервер тонких клиентов Debian Edu"
 
 #. Type: text
@@ -289,15 +288,15 @@ msgstr "Не удалось установить необходимые паке
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Несколько из необходимых пакетов не удалось установить. Вот список: "
-"${PACKAGES}. Посмотрите в /var/log/syslog почему это случилось. "
-"Установленная система не будет работоспособной, поэтому установка была "
-"прервана, и сейчас система будет перезапущена."
+"${PACKAGES}. Посмотрите в /var/log/syslog почему это "
+"случилось. Установленная система не будет работоспособной, поэтому установка "
+"была прервана, и сейчас система будет перезапущена."
 
 #. Type: boolean
 #. Description
@@ -389,7 +388,6 @@ msgid ""
 msgstr ""
 "Это сообщение показывается в разрабатываемой версии, чтобы показать, что "
 "установка прошла успешно."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/se.po b/debian/po/se.po
index 3f21988..8a1c2cb 100644
--- a/debian/po/se.po
+++ b/debian/po/se.po
@@ -35,42 +35,42 @@ msgstr "Vállje Debian Edu-profiilla"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Váldobálvá"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Bargostašuvdna"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Sirddihahtti bargostašuvdna"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Asehisklieantabálvá"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Oktonas mašiidna"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimála"
@@ -89,7 +89,6 @@ msgstr "Profiillat mearridit man láhkai sáhttá geavahit mašiinna álgoálggu
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -99,7 +98,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -153,15 +152,15 @@ msgstr "Oktonas profiilla sajáiduhttin ii leat áibbas automatiserejuvvon"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Oktonassajáiduhttinprofiila ii leat nu automatiserejuvvon go dat eará "
-"profiillat, vai šaddá álkibut manualalaččat partišuneret garraskearru. "
-"Boahtte lávki lea debian-sajáiduhtti váldofállu. Vállje «Rievdat debconf "
-"ovddavuoru», válljes «alla» ovddavuoru jus háliidat bidjat johtui "
-"automatiserejuvvon sajáiduhttima fas."
+"profiillat, vai šaddá álkibut manualalaččat partišuneret "
+"garraskearru. Boahtte lávki lea debian-sajáiduhtti váldofállu. Vállje "
+"«Rievdat debconf ovddavuoru», válljes «alla» ovddavuoru jus háliidat bidjat "
+"johtui automatiserejuvvon sajáiduhttima fas."
 
 #. Type: text
 #. Description
@@ -216,15 +215,15 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on http://popcon.debian.org/."
 msgstr ""
-"Jus searvvat, de skripta mii sádde dáid dieđuid bidjo johtui oktii vahkus. "
-"Statistihkka mii čohkkejuvvo gávdno dás: http://popcon.debian.org/."
+"Jus searvvat, de skripta mii sádde dáid dieđuid bidjo johtui oktii "
+"vahkus. Statistihkka mii čohkkejuvvo gávdno dás: http://popcon.debian.org/."
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Sáhtát rievdadit dán mearrádusa maŋileabbut jos vuoját «dpkg-reconfigure "
 "popularity-contest»."
@@ -240,7 +239,7 @@ msgstr "Debian Edu-váldobálvá"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu-asehisklieantabálvá"
 
 #. Type: text
@@ -254,7 +253,7 @@ msgstr "Debian Edu-bargostašuvdna"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu-váldo- ja -asehisklieantabálvá"
 
 #. Type: text
@@ -287,10 +286,10 @@ msgstr "Filtii sajáiduhttit muhtin gáibiduvvon páhkaid"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Filtii sajáiduhttit muhtin gáibiduvvon páhkaid. Dá leat dat páhkat:  "
 "${PACKAGES}. Iskka jus leat dieđut «/var/log/syslog» fiillas mat čilgejit "
@@ -364,8 +363,8 @@ msgstr "${ERRORS}"
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr ""
-"Livččii buorre jus dieđihivččet dáid meattáhusaid birra Debian Edu-"
-"ovdánahttiide."
+"Livččii buorre jus dieđihivččet dáid meattáhusaid birra Debian "
+"Edu-ovdánahttiide."
 
 #. Type: note
 #. Description
@@ -382,7 +381,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #~ msgid ""
 #~ " - Main Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 693f557..e005699 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -26,42 +26,42 @@ msgstr "Vyberte profil Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Hlavný server"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Pracovná stanica"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Potulná pracovná stanica"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Server tenkých klientov"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Samostatný"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimálny"
@@ -76,12 +76,10 @@ msgstr "Ktoré profily aplikovať na tento počítač:"
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
-msgstr ""
-"Profily určujú akým spôsobom možno používať počítač ihneď po inštalácii:"
+msgstr "Profily určujú akým spôsobom možno používať počítač ihneď po inštalácii:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -91,7 +89,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -145,8 +143,8 @@ msgstr "„Samostatná“ inštalácia prebieha čiastočne manuálne"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Inštalácia „Samostatný“ momentálne nie je automatická do takej miery ako "
@@ -216,11 +214,11 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
-"Svoju voľbu môžete neskôr zmeniť spustením „dpkg-reconfigure popularity-"
-"contest“."
+"Svoju voľbu môžete neskôr zmeniť spustením „dpkg-reconfigure "
+"popularity-contest“."
 
 #. Type: text
 #. Description
@@ -233,7 +231,7 @@ msgstr "Hlavný server Debian Edu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Server tenkých klientov Debian Edu"
 
 #. Type: text
@@ -247,7 +245,7 @@ msgstr "Pracovná stanica Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Hlavný server a Server tenkých klientov Debian Edu"
 
 #. Type: text
@@ -280,10 +278,10 @@ msgstr "Inštalácia požadovaných balíkov zlyhala"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Niektoré požadované balíky sa nepodarilo nainštalovať. Týka sa to balíkov "
 "${PACKAGES}. Pozrite sa do /var/log/syslog či nenájdete nejaké informácie o "
@@ -381,7 +379,6 @@ msgid ""
 msgstr ""
 "Toto sa zobrazuje pre vývojovú verziu, aby bolo jasné, že inštalácia bola "
 "úspešná."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 5adee8e..239966c 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -29,42 +29,42 @@ msgstr "Välj profil för Debian Edu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Huvudserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Arbetsstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Flyttbar Arbetsstation"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Tunnklientserver"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Fristående"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Minimal"
@@ -83,7 +83,6 @@ msgstr "Profiler bestämmer hur maskinen initialt ska användas:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -93,7 +92,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -148,8 +147,8 @@ msgstr "Fristående installation är delvis manuell"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Installation av den fristående profilen är för närvarande inte lika "
@@ -202,8 +201,8 @@ msgid ""
 msgstr ""
 "Du kan låta ditt system anonymt skicka e-post till Debian-utvecklarna med "
 "statistik om de mest använda paketen på detta system.  Denna information "
-"influerar de val som görs om vilka paket som ska hamna på den första Debian-"
-"cd:n."
+"influerar de val som görs om vilka paket som ska hamna på den första "
+"Debian-cd:n."
 
 #. Type: boolean
 #. Description
@@ -221,8 +220,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Du kan alltid ändra detta val senare genom att köra \"dpkg-reconfigure "
 "popularity-contest\"."
@@ -238,7 +237,7 @@ msgstr "Debian Edu Huvudserver"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu Tunnklientserver"
 
 #. Type: text
@@ -252,7 +251,7 @@ msgstr "Arbetsstation för Debian Edu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu Huvudserver och Tunnklient-server"
 
 #. Type: text
@@ -285,10 +284,10 @@ msgstr "Installation av paket som måste finnas misslyckades"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Några paket som måste finnas kunde inte installeras. Paketen var; "
 "${PACKAGES}. Kontrollera /var/log/syslog efter information om varför det "
@@ -386,7 +385,6 @@ msgid ""
 msgstr ""
 "Detta visas i utvecklingsverionen för att vara övertydlig med att "
 "installationen fungerade korrekt."
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
@@ -481,11 +479,11 @@ msgstr ""
 #~ "will  need to include the 'Workstation' profile or 'Thin-Client-Server'."
 #~ msgstr ""
 #~ "Varje Debian Edu-nätverk behöver en, och endast en, dator som kör med "
-#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller (nätverks)"
-#~ "tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den här datorn "
-#~ "kan nätverket inte fungera. Eftersom den här datorn ska lagra alla "
-#~ "datafiler så behöver den mycket diskutrymme. Om du bara väljer det här "
-#~ "alternativet så kommer den installerade datorn inte ha något grafiskt "
+#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller "
+#~ "(nätverks)tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den "
+#~ "här datorn kan nätverket inte fungera. Eftersom den här datorn ska lagra "
+#~ "alla datafiler så behöver den mycket diskutrymme. Om du bara väljer det "
+#~ "här alternativet så kommer den installerade datorn inte ha något grafiskt "
 #~ "gränsnitt. Om du vill ha ett grafiskt gränsnitt måste du också välja "
 #~ "profilen arbetsstation eller profilen \"Tunnklientsserver\"."
 
@@ -533,11 +531,11 @@ msgstr ""
 #~ "'Main-Server' profile to provides the (network) services."
 #~ msgstr ""
 #~ "Varje Debian Edu-nätverk behöver en, och endast en, dator som kör med "
-#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller (nätverks)"
-#~ "tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den här datorn "
-#~ "kan nätverket inte fungera. Eftersom den här datorn ska lagra alla "
-#~ "datafiler så behöver den mycket diskutrymme. Om du bara väljer det här "
-#~ "alternativet så kommer den installerade datorn inte ha något grafiskt "
+#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller "
+#~ "(nätverks)tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den "
+#~ "här datorn kan nätverket inte fungera. Eftersom den här datorn ska lagra "
+#~ "alla datafiler så behöver den mycket diskutrymme. Om du bara väljer det "
+#~ "här alternativet så kommer den installerade datorn inte ha något grafiskt "
 #~ "gränsnitt. Om du vill ha ett grafiskt gränsnitt måste du också välja "
 #~ "profilen arbetsstation eller profilen \"Tunnklientsserver\"."
 
@@ -565,11 +563,11 @@ msgstr ""
 #~ "to include the workstation profile or 'Thin-Client-Server'."
 #~ msgstr ""
 #~ "Varje Debian Edu-nätverk behöver en, och endast en, dator som kör med "
-#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller (nätverks)"
-#~ "tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den här datorn "
-#~ "kan nätverket inte fungera. Eftersom den här datorn ska lagra alla "
-#~ "datafiler så behöver den mycket diskutrymme. Om du bara väljer det här "
-#~ "alternativet så kommer den installerade datorn inte ha något grafiskt "
+#~ "profilen \"Huvudserver\". Den här datorn tillhandahåller "
+#~ "(nätverks)tjänsterna (huvudsakligen filer/nätverk och LDAP) så utan den "
+#~ "här datorn kan nätverket inte fungera. Eftersom den här datorn ska lagra "
+#~ "alla datafiler så behöver den mycket diskutrymme. Om du bara väljer det "
+#~ "här alternativet så kommer den installerade datorn inte ha något grafiskt "
 #~ "gränsnitt. Om du vill ha ett grafiskt gränsnitt måste du också välja "
 #~ "profilen arbetsstation eller profilen \"Tunnklientsserver\"."
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index a58ea1a..5249f14 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -26,42 +26,42 @@ msgstr "Debian Edu profilini seçin"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Ana Sunucu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "İş-istasyonu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Gezici İş İstasyonu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Hafif İstemci Sunucusu"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Kendibaşına"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Asgari"
@@ -77,11 +77,11 @@ msgstr "Bu makineye uygulanacak profil(ler):"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
-"Kurulum tamamlandığında makinenin nasıl kullanılacağını belirleyen profiller:"
+"Kurulum tamamlandığında makinenin nasıl kullanılacağını belirleyen "
+"profiller:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -91,7 +91,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -130,9 +130,9 @@ msgid ""
 "on the same machine. Please either only choose Standalone or any other "
 "combination excluding Standalone."
 msgstr ""
-"Kendibaşına profili aynı makineye diğer profillerle birlikte kurulamaz. "
-"Lütfen ya sadece Kendibaşına'yı; ya da Kendibaşına'yı içermeyen diğer "
-"bileşimleri seçin."
+"Kendibaşına profili aynı makineye diğer profillerle birlikte "
+"kurulamaz. Lütfen ya sadece Kendibaşına'yı; ya da Kendibaşına'yı içermeyen "
+"diğer bileşimleri seçin."
 
 #. Type: note
 #. Description
@@ -145,8 +145,8 @@ msgstr "Kendibaşına kurulumu kısmen elle yürütülür"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Kendibaşına kurulumu, elle bölümlemeyi kolaylaştıracak şekilde hâlihazırda "
@@ -173,11 +173,11 @@ msgid ""
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
-"Bu işlem makinede bulunan tüm disklerin bölümleme tablosunu yok edecektir. "
-"TEKRAR EDİYORUM: BU İŞLEM MAKİNEDE BULUNAN TÜM SABİT DİSKLERDEKİ VERİLERİ "
-"SİLECEKTİR! Eğer yedeklenmemiş önemli verileriniz varsa işlemi şimdi "
-"durdurup yedekleme yapmak isteyebilirsiniz.  Böyle bir durumda kurulumu daha "
-"sonra tekrar başlatmalısınız."
+"Bu işlem makinede bulunan tüm disklerin bölümleme tablosunu yok "
+"edecektir. TEKRAR EDİYORUM: BU İŞLEM MAKİNEDE BULUNAN TÜM SABİT DİSKLERDEKİ "
+"VERİLERİ SİLECEKTİR! Eğer yedeklenmemiş önemli verileriniz varsa işlemi "
+"şimdi durdurup yedekleme yapmak isteyebilirsiniz.  Böyle bir durumda "
+"kurulumu daha sonra tekrar başlatmalısınız."
 
 #. Type: text
 #. Description
@@ -218,8 +218,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Burada yapılan seçim daha sonra, \"dpkg-reconfigure popularity-contest\" "
 "komutu çalıştırılarak değiştirilebilir."
@@ -235,7 +235,7 @@ msgstr "Debian Edu Ana Sunucu"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu Hafif İstemci Sunucusu"
 
 #. Type: text
@@ -249,7 +249,7 @@ msgstr "Debian Edu İş-istasyonu"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu Ana Sunucu ve Hafif İstemci Sunucusu"
 
 #. Type: text
@@ -282,15 +282,15 @@ msgstr "Gerekli paketler kurulamadı"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"Gerekli paketlerden bazıları kurulamadı. Kurulamayan paketler: ${PACKAGES}. "
-"Bunun sebebini öğrenmek için /var/log/syslog dosyasına göz atın. Kurulan "
-"sistem düzgün çalışmayacak, bu nedenle kurulum iptal edildi ve şimdi sistem "
-"yeniden başlatılacak."
+"Gerekli paketlerden bazıları kurulamadı. Kurulamayan paketler: "
+"${PACKAGES}. Bunun sebebini öğrenmek için /var/log/syslog dosyasına göz "
+"atın. Kurulan sistem düzgün çalışmayacak, bu nedenle kurulum iptal edildi ve "
+"şimdi sistem yeniden başlatılacak."
 
 #. Type: boolean
 #. Description
@@ -380,7 +380,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 6884529..8e7959a 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -26,42 +26,42 @@ msgstr "Hãy chọn hồ sơ Giao dục Debian"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "Máy phục vụ chính"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "Máy trạm"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "Máy trạm đi lang thang"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "Máy phục vụ khách mảnh"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "Độc lập"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "Nhỏ gọn"
@@ -80,7 +80,6 @@ msgstr "Hồ sơ thì xác định phương pháp sử dụng máy có sẵn:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -90,7 +89,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -104,7 +103,8 @@ msgstr ""
 "\t\t\t\tChỉ nên có một máy phục vụ như vậy\n"
 "\t\t\t\ttrên mỗi mạng Giáo dục Debian.\n"
 " • Máy trạm\t\tcho các máy bình thường trên mạng Giáo dục Debian.\n"
-" • Máy trạm đi lang thang\tcho máy người dùng đơn trên mạng Giáo dục Debian\n"
+" • Máy trạm đi lang thang\tcho máy người dùng đơn trên mạng Giáo dục "
+"Debian\n"
 "\t\t\t\tmà đôi khi duyệt bên ngoài mạng.\n"
 " • Máy phục vụ khách mảnh\t\tbao gồm « Máy trạm »\n"
 "\t\t\t\t\t\t\tvà đòi hỏi 2 bo mạch mạng.\n"
@@ -141,8 +141,8 @@ msgstr "Cài đặt « Độc lập » thì thủ công một phần"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
 "Hiện thời tiến trình cài đặt « Độc lập » không phải hoàn thành tự động, để "
@@ -169,10 +169,10 @@ msgid ""
 "backup. In that case, you'll have to restart the installation later."
 msgstr ""
 "Hành động này sẽ hủy hoàn toàn bảng phân vùng trên tất cả các đĩa của máy "
-"này. CẢNH BÁO : VIỆC NÀY SẼ XÓA SẠCH HOÀN TOÀN MỌI ĐĨA CỨNG TRONG MÁY NÀY. "
-"Nếu bạn có dữ liệu quan trọng chưa được sao lưu, khuyên bạn ngừng để sao lưu "
-"dữ liệu vào vật chứa khác. Như thế thì bạn sẽ cần phải khởi chạy lại tiến "
-"trình cài đặt về sau."
+"này. CẢNH BÁO : VIỆC NÀY SẼ XÓA SẠCH HOÀN TOÀN MỌI ĐĨA CỨNG TRONG MÁY "
+"NÀY. Nếu bạn có dữ liệu quan trọng chưa được sao lưu, khuyên bạn ngừng để "
+"sao lưu dữ liệu vào vật chứa khác. Như thế thì bạn sẽ cần phải khởi chạy lại "
+"tiến trình cài đặt về sau."
 
 #. Type: text
 #. Description
@@ -193,9 +193,9 @@ msgid ""
 "distribution CD."
 msgstr ""
 "Hệ thống của bạn có khả năng cung cấp nặc danh cho các nhà phát triển bản "
-"phân phối thống kê về những gói Debian được dùng thường nhất trên máy này. "
-"Thông tin này thì ảnh hưởng đến quyết định, v.d. những gói nào nên nằm trên "
-"đĩa CD thứ nhất của bản phân phối."
+"phân phối thống kê về những gói Debian được dùng thường nhất trên máy "
+"này. Thông tin này thì ảnh hưởng đến quyết định, v.d. những gói nào nên nằm "
+"trên đĩa CD thứ nhất của bản phân phối."
 
 #. Type: boolean
 #. Description
@@ -213,8 +213,8 @@ msgstr ""
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr ""
 "Cũng có thể sửa đổi sự chọn này về sau bằng cách chạy câu lệnh cấu hình lại: "
 "« dpkg-reconfigure popularity-contest »."
@@ -230,7 +230,7 @@ msgstr "Máy phục vụ chính Giáo dục Debian"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Máy phục vụ khách mảnh Giáo dục Debian"
 
 #. Type: text
@@ -244,7 +244,7 @@ msgstr "Máy trạm Giáo dục Debian"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Máy phục vụ chính và máy phục vụ khách mảnh của Giáo dục Debian"
 
 #. Type: text
@@ -277,10 +277,10 @@ msgstr "Lỗi cài đặt gói cần thiết"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
 "Một số gói cần thiết đã không cài đặt được: ${PACKAGES}. Hãy kiểm tra lại sổ "
 "theo dõi hệ thống « /var/log/syslog » có thông tin về nguyên nhân. Trong "
@@ -369,7 +369,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr ""
-
 #~ msgid ""
 #~ " - Main Server: reserved for the Debian Edu server. It does not\n"
 #~ "                include any GUI (Graphical User Interface). There\n"
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index fc35c7b..67ddd83 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -9,8 +9,8 @@ msgstr ""
 "POT-Creation-Date: 2014-09-30 09:23+0200\n"
 "PO-Revision-Date: 2013-06-01 22:35+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji at gmail.com>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
-"sourceforge.net>\n"
+"Language-Team: Chinese (simplified) "
+"<translation-team-zh-cn at lists.sourceforge.net>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,42 +25,42 @@ msgstr "选择 Debian Edu 的安装方式"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "主服务器"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "工作站"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "移动工作站"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "瘦客户机/服务器"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "独立主机"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "最小安装"
@@ -79,7 +79,6 @@ msgstr "安装方式决定了这台电脑在不安装额外软件时的使用方
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -89,7 +88,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -130,9 +129,7 @@ msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
 "combination excluding Standalone."
-msgstr ""
-"独立主机安装方式不能与其它安装方式同时安装在同一台机器上。 请仅选择独立主机安"
-"装方式,或者选择其它方式不带独立主机的组合。"
+msgstr "独立主机安装方式不能与其它安装方式同时安装在同一台机器上。 请仅选择独立主机安装方式,或者选择其它方式不带独立主机的组合。"
 
 #. Type: note
 #. Description
@@ -145,13 +142,12 @@ msgstr "独立主机安装方式需要偶尔手工操作"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
-"目前独立主机安装方式还没有像其它安装方式一样完全自动化,以便更容易进行手工分"
-"区。现在您正在进入 debian 安装主菜单。选择“更改 debconf 优先级”,然后再选择优"
-"先级“高”,这样就可以再次开启自动安装了。"
+"目前独立主机安装方式还没有像其它安装方式一样完全自动化,以便更容易进行手工分区。现在您正在进入 debian 安装主菜单。选择“更改 debconf "
+"优先级”,然后再选择优先级“高”,这样就可以再次开启自动安装了。"
 
 #. Type: text
 #. Description
@@ -170,10 +166,7 @@ msgid ""
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
-msgstr ""
-"此操作将会破坏此机器上的所有硬盘中的分区信息。注意:这将完全清除此机器上的所"
-"有内容!如果您还有重要信息未备份,现在您可能需要中止安装并做个备份。如果那样"
-"的话,您将稍后再重启开始安装。"
+msgstr "此操作将会破坏此机器上的所有硬盘中的分区信息。注意:这将完全清除此机器上的所有内容!如果您还有重要信息未备份,现在您可能需要中止安装并做个备份。如果那样的话,您将稍后再重启开始安装。"
 
 #. Type: text
 #. Description
@@ -192,9 +185,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"系统会将此机器上用得最多的软件包的统计信息匿名发送给开发者。此类信息会影响下"
-"一步的决定,比如在下一个将要发布的 CD 中要保留哪些包。"
+msgstr "系统会将此机器上用得最多的软件包的统计信息匿名发送给开发者。此类信息会影响下一步的决定,比如在下一个将要发布的 CD 中要保留哪些包。"
 
 #. Type: boolean
 #. Description
@@ -204,15 +195,15 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on http://popcon.debian.org/."
 msgstr ""
-"如果您选择参与这个过程,那么每周会运行一次自动提交脚本,将统计信息发送给开发"
-"者。收集到的统计信息可以在 http://popcon.debian.org/ 上看到。"
+"如果您选择参与这个过程,那么每周会运行一次自动提交脚本,将统计信息发送给开发者。收集到的统计信息可以在 "
+"http://popcon.debian.org/ 上看到。"
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr "这一选择可在今后用“dpkg-reconfigure popularity-contest”进行更改。"
 
 #. Type: text
@@ -226,7 +217,7 @@ msgstr "Debian 教育网主服务器"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian 教育网瘦客户机/服务器"
 
 #. Type: text
@@ -240,7 +231,7 @@ msgstr "Debian 教育网工作站"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian 教育网主服务器及瘦客户机/服务器"
 
 #. Type: text
@@ -273,14 +264,13 @@ msgstr "所需软件包的安装失败"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"某些所需的软件包安装失败。这些包是${PACKAGES}。请查看/var/log/syslog 以确认是"
-"否有关此信息的提示信息。安装好的系统将无法正常工作,因此取消安装并将重启系"
-"统。"
+"某些所需的软件包安装失败。这些包是${PACKAGES}。请查看/var/log/syslog "
+"以确认是否有关此信息的提示信息。安装好的系统将无法正常工作,因此取消安装并将重启系统。"
 
 #. Type: boolean
 #. Description
@@ -295,9 +285,7 @@ msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
-msgstr ""
-"对于所选安装方式而言可用的磁盘空间不足。请选择:您是想退出安装,还是继续安"
-"装,但不按推荐分区安装系统。"
+msgstr "对于所选安装方式而言可用的磁盘空间不足。请选择:您是想退出安装,还是继续安装,但不按推荐分区安装系统。"
 
 #. Type: boolean
 #. Description
@@ -306,9 +294,7 @@ msgid ""
 "If you choose to continue, one single partition will be used for all system "
 "files _and_ user files.  Note that this can cause stability problems after a "
 "while."
-msgstr ""
-"如果您选择继续,所有系统文件及用户文件将安装至单一分区。注意过段时间这可能引"
-"起稳定性问题。"
+msgstr "如果您选择继续,所有系统文件及用户文件将安装至单一分区。注意过段时间这可能引起稳定性问题。"
 
 #. Type: text
 #. Description
@@ -326,9 +312,7 @@ msgid ""
 "To install Debian Edu using PXE and NETINST CD, network connectivity is "
 "required.  It is currently missing, so this installation can not continue "
 "and will be aborted."
-msgstr ""
-"若想以PXE 或是NETINST CD 方式安装Debian Edu,则必须使用网络连接。但目前并未连"
-"接网络,因此安装无法继续,即将退出。"
+msgstr "若想以PXE 或是NETINST CD 方式安装Debian Edu,则必须使用网络连接。但目前并未连接网络,因此安装无法继续,即将退出。"
 
 #. Type: text
 #. Description
@@ -368,7 +352,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr "这是为开发版而显示的,此信息只是为了证明已经成功安装完毕。"
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index d45eb28..1a6b1f0 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -26,42 +26,42 @@ msgstr "請選擇 Debian Edu 的安裝模式(profile)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Main Server"
 msgstr "主伺服器(Main Server)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Workstation"
 msgstr "工作站(Workstation)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Roaming Workstation"
 msgstr "漫遊工作站(Roaming Workstation)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
-msgid "Thin Client Server"
+msgid "LTSP Server"
 msgstr "終端機伺服器(Thin Client Server)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Standalone"
 msgstr "獨立主機(Standalone)"
 
 #. Type: multiselect
 #. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal
 #: ../debian-edu-profile-udeb.templates:2001
 msgid "Minimal"
 msgstr "最小安裝"
@@ -80,7 +80,6 @@ msgstr "安裝模式(profiles)決定這台機器的用途:"
 
 #. Type: multiselect
 #. Description
-#. # Translators, do not translate "Sugar"
 #: ../debian-edu-profile-udeb.templates:2002
 msgid ""
 " - Main Server: reserved for the Debian Edu server. It does not\n"
@@ -90,7 +89,7 @@ msgid ""
 " - Workstation: for normal machines on the Debian Edu network.\n"
 " - Roaming Workstation: for single user machines on the Debian Edu\n"
 "                network which some times travel outside the network.\n"
-" - Thin Client Server:\n"
+" - LTSP Server:\n"
 "                includes 'Workstation' and requires two network\n"
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
@@ -124,9 +123,7 @@ msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
 "combination excluding Standalone."
-msgstr ""
-"獨立主機的安裝模式不能與其他安裝模式同時被選擇,請“單獨選擇獨立主機”的安裝模"
-"式,或是“複選其他安裝模式”的組合。"
+msgstr "獨立主機的安裝模式不能與其他安裝模式同時被選擇,請“單獨選擇獨立主機”的安裝模式,或是“複選其他安裝模式”的組合。"
 
 #. Type: note
 #. Description
@@ -139,13 +136,12 @@ msgstr "獨立主機的安裝模式需要部份手動操作。"
 #: ../debian-edu-profile-udeb.templates:4001
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
-"to make it easier to do manual partitioning.  You are now sent to the debian-"
-"installer main menu.  Select \"Change debconf priority\", and choose "
+"to make it easier to do manual partitioning.  You are now sent to the "
+"debian-installer main menu.  Select \"Change debconf priority\", and choose "
 "priority \"high\" to enable the automatic installation again."
 msgstr ""
-"為了更方便手動進行磁碟分割,目前獨立主機安裝模式不像其他安裝模式一樣完全自動"
-"化。現在您將進入 Debian 安裝程式主選單。您可以選擇“變更 debconf 優先權配置”,"
-"然後再選擇優先權“高”,這樣就可以回到自動安裝模式。"
+"為了更方便手動進行磁碟分割,目前獨立主機安裝模式不像其他安裝模式一樣完全自動化。現在您將進入 Debian 安裝程式主選單。您可以選擇“變更 "
+"debconf 優先權配置”,然後再選擇優先權“高”,這樣就可以回到自動安裝模式。"
 
 #. Type: text
 #. Description
@@ -164,10 +160,7 @@ msgid ""
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
 "data that are not backed up, you may want to stop now in order to do a "
 "backup. In that case, you'll have to restart the installation later."
-msgstr ""
-"這個操作將會破壞機器上所有磁碟分割表。注意!!這將會完全清除這台機器上的所有"
-"內容!如果您還有重要資料尚未備份,您可能會需要先停止安裝,然後做好備份,稍後"
-"在重頭開始安裝。"
+msgstr "這個操作將會破壞機器上所有磁碟分割表。注意!!這將會完全清除這台機器上的所有內容!如果您還有重要資料尚未備份,您可能會需要先停止安裝,然後做好備份,稍後在重頭開始安裝。"
 
 #. Type: text
 #. Description
@@ -186,9 +179,7 @@ msgid ""
 "statistics about the most used packages on this system.  This information "
 "influences decisions such as which packages should go on the first "
 "distribution CD."
-msgstr ""
-"系統將會收集機器安裝的套件資料傳送給開發者,並用於統計哪些套件較常被使用,這"
-"些資料會決定下一版的第一張 CD 內會包含哪些套件。"
+msgstr "系統將會收集機器安裝的套件資料傳送給開發者,並用於統計哪些套件較常被使用,這些資料會決定下一版的第一張 CD 內會包含哪些套件。"
 
 #. Type: boolean
 #. Description
@@ -198,15 +189,15 @@ msgid ""
 "every week, sending statistics to the distribution developers. The collected "
 "statistics can be viewed on http://popcon.debian.org/."
 msgstr ""
-"如果您選擇參與這個勘查計畫,遞呈程式(script)將自動會每週執行一次,並將套件安"
-"裝資料送給開發者。收集到的統計資料可以在 http://popcon.debian.org/ 上瀏覽。"
+"如果您選擇參與這個勘查計畫,遞呈程式(script)將自動會每週執行一次,並將套件安裝資料送給開發者。收集到的統計資料可以在 "
+"http://popcon.debian.org/ 上瀏覽。"
 
 #. Type: boolean
 #. Description
 #: ../debian-edu-profile-udeb.templates:9001
 msgid ""
-"This choice can be later modified by running \"dpkg-reconfigure popularity-"
-"contest\"."
+"This choice can be later modified by running \"dpkg-reconfigure "
+"popularity-contest\"."
 msgstr "此選擇可以之後再用“dpkg-reconfigure popularity-contest”進行變更。"
 
 #. Type: text
@@ -220,7 +211,7 @@ msgstr "Debian Edu 主伺服器(Main Server)"
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:11001
-msgid "Debian Edu Thin Client Server"
+msgid "Debian Edu LTSP Server"
 msgstr "Debian Edu 終端機伺服器(Thin Client Server)"
 
 #. Type: text
@@ -234,7 +225,7 @@ msgstr "Debian Edu 工作站(Workstation)"
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
 #: ../debian-edu-profile-udeb.templates:13001
-msgid "Debian Edu Main Server and Thin Client Server"
+msgid "Debian Edu Main Server and LTSP Server"
 msgstr "Debian Edu 主伺服器(Main-Server) 和終端機伺服器(Thin-Client-Server)"
 
 #. Type: text
@@ -267,14 +258,13 @@ msgstr "所需套件安裝失敗"
 #. Description
 #: ../debian-edu-profile-udeb.templates:17001
 msgid ""
-"Some required packages failed to install. The packages were ${PACKAGES}. "
-"Check /var/log/syslog if there is some information why this happened. The "
-"installed system is not going to work properly, so the installation was "
-"aborted and the system will be rebooted now."
+"Some required packages failed to install. The packages were "
+"${PACKAGES}. Check /var/log/syslog if there is some information why this "
+"happened. The installed system is not going to work properly, so the "
+"installation was aborted and the system will be rebooted now."
 msgstr ""
-"有些需要的套件安裝失敗。安裝失敗套件套件為 ${PACKAGES}。若需得到更多相關訊"
-"息,請見 /var/log/syslog,目前已安裝得系統將不會運作適當,所以安裝程序在此中"
-"斷並請重新啟動。"
+"有些需要的套件安裝失敗。安裝失敗套件套件為 ${PACKAGES}。若需得到更多相關訊息,請見 "
+"/var/log/syslog,目前已安裝得系統將不會運作適當,所以安裝程序在此中斷並請重新啟動。"
 
 #. Type: boolean
 #. Description
@@ -289,9 +279,7 @@ msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
 "setting up the recommended partitioning setup"
-msgstr ""
-"磁碟可用空間不足以完成所選取的安裝模式。請決定您是要中止安裝程式,還是忽略建"
-"議的分割區設定繼續進行安裝?"
+msgstr "磁碟可用空間不足以完成所選取的安裝模式。請決定您是要中止安裝程式,還是忽略建議的分割區設定繼續進行安裝?"
 
 #. Type: boolean
 #. Description
@@ -300,9 +288,7 @@ msgid ""
 "If you choose to continue, one single partition will be used for all system "
 "files _and_ user files.  Note that this can cause stability problems after a "
 "while."
-msgstr ""
-"假如您選擇繼續,所有系統檔案_與_使用者檔案將會共用同一個磁碟分割區。這樣可能"
-"會造成穩定性的潛在問題。"
+msgstr "假如您選擇繼續,所有系統檔案_與_使用者檔案將會共用同一個磁碟分割區。這樣可能會造成穩定性的潛在問題。"
 
 #. Type: text
 #. Description
@@ -320,9 +306,7 @@ msgid ""
 "To install Debian Edu using PXE and NETINST CD, network connectivity is "
 "required.  It is currently missing, so this installation can not continue "
 "and will be aborted."
-msgstr ""
-"要用 PXE 與網路安裝光碟(NetInst CD)來安裝 Debian Edu 需要網路連線。目前沒有"
-"網路連線,因此無法繼續安裝。"
+msgstr "要用 PXE 與網路安裝光碟(NetInst CD)來安裝 Debian Edu 需要網路連線。目前沒有網路連線,因此無法繼續安裝。"
 
 #. Type: text
 #. Description
@@ -362,7 +346,6 @@ msgid ""
 "This is shown for the development version to make it clear that the "
 "installation was successful."
 msgstr "這個訊息是開發版本才會顯示,確定安裝已完成。"
-
 #~ msgid ""
 #~ "The Debian Edu installer already has executed some disk setup commands. "
 #~ "Previous content of your disk might already have been destroyed by this."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git



More information about the debian-edu-commits mailing list