[debian-edu-commits] r78927 - branches/wheezy/debian-edu-install/debian/po

pere at alioth.debian.org pere at alioth.debian.org
Thu Jan 31 21:25:17 UTC 2013


Author: pere
Date: 2013-01-31 21:25:17 +0000 (Thu, 31 Jan 2013)
New Revision: 78927

Modified:
   branches/wheezy/debian-edu-install/debian/po/ca.po
   branches/wheezy/debian-edu-install/debian/po/cs.po
   branches/wheezy/debian-edu-install/debian/po/da.po
   branches/wheezy/debian-edu-install/debian/po/de.po
   branches/wheezy/debian-edu-install/debian/po/el.po
   branches/wheezy/debian-edu-install/debian/po/es.po
   branches/wheezy/debian-edu-install/debian/po/eu.po
   branches/wheezy/debian-edu-install/debian/po/fi.po
   branches/wheezy/debian-edu-install/debian/po/fr.po
   branches/wheezy/debian-edu-install/debian/po/gl.po
   branches/wheezy/debian-edu-install/debian/po/id.po
   branches/wheezy/debian-edu-install/debian/po/it.po
   branches/wheezy/debian-edu-install/debian/po/ja.po
   branches/wheezy/debian-edu-install/debian/po/lv.po
   branches/wheezy/debian-edu-install/debian/po/nb.po
   branches/wheezy/debian-edu-install/debian/po/nl.po
   branches/wheezy/debian-edu-install/debian/po/nn.po
   branches/wheezy/debian-edu-install/debian/po/pl.po
   branches/wheezy/debian-edu-install/debian/po/pt.po
   branches/wheezy/debian-edu-install/debian/po/pt_BR.po
   branches/wheezy/debian-edu-install/debian/po/ru.po
   branches/wheezy/debian-edu-install/debian/po/se.po
   branches/wheezy/debian-edu-install/debian/po/sk.po
   branches/wheezy/debian-edu-install/debian/po/sv.po
   branches/wheezy/debian-edu-install/debian/po/templates.pot
   branches/wheezy/debian-edu-install/debian/po/tr.po
   branches/wheezy/debian-edu-install/debian/po/vi.po
   branches/wheezy/debian-edu-install/debian/po/zh_CN.po
   branches/wheezy/debian-edu-install/debian/po/zh_TW.po
Log:
Update .po files.

Modified: branches/wheezy/debian-edu-install/debian/po/ca.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/ca.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/ca.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: debaian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-12-06 16:05+0100\n"
 "Last-Translator: Hector Oron <zumbi at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -40,74 +40,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Servidor principal"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Estació de treball"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Estació de treball itinerant"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Servidor de clients lleugers"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Màquina aïllada"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Mínim"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Si us plau, seleccioneu el perfil adient per aquesta màquina:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -122,45 +109,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-"- Servidor principal: reservat per al servidor de Debian Edu. No\n"
-"                inclou cap GUI (Interfície Gràfica de Usuari). Nomes cal\n"
-"                un servidor principal a la xarxa de Debian Edu.\n"
-" - Estació de treball: per maquinari normal a la xarxa de Debian Edu.\n"
-" - Estació itinerant: per maquines d'usuari únic a la xarxa de Debian Edu\n"
-"                que surten fora de la xarxa de tant en tant.\n"
-" - Servidor de clients lleugers:\n"
-"                inclou 'Estació de treball' i requereix dues targetes de "
-"xarxa.\n"
-" - Màquina aïllada: per a maquines que es faran servir fora de la xarxa de\n"
-"                Debian Edu. Inclou GUI i fa conflictes amb altres perfils.\n"
-" "
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Mínim"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -181,14 +129,14 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../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"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -200,13 +148,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "La instal·lació de «Màquina aïllada» és parcialment manual."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -223,14 +171,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Voleu utilitzar l'eina de partició automàtica?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -247,14 +195,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Voleu participar a l'enquesta de popularitat dels paquets?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -268,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -281,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -292,60 +240,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Servidor principal de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Servidor de clients lleugers de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Estació de treball de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Servidor principal i de clients lleugers de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Estació de treball i servidor principal de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Mínim"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Instal·lació del paquet de Debian Edu ha fallat"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Instal·lació dels paquets requerits ha fallat"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -360,13 +308,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -375,7 +323,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -383,7 +331,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -415,6 +363,37 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Considereu informar-ne als desenvolupadors de Debian Edu. "
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ "- Servidor principal: reservat per al servidor de Debian Edu. No\n"
+#~ "                inclou cap GUI (Interfície Gràfica de Usuari). Nomes cal\n"
+#~ "                un servidor principal a la xarxa de Debian Edu.\n"
+#~ " - Estació de treball: per maquinari normal a la xarxa de Debian Edu.\n"
+#~ " - Estació itinerant: per maquines d'usuari únic a la xarxa de Debian "
+#~ "Edu\n"
+#~ "                que surten fora de la xarxa de tant en tant.\n"
+#~ " - Servidor de clients lleugers:\n"
+#~ "                inclou 'Estació de treball' i requereix dues targetes de "
+#~ "xarxa.\n"
+#~ " - Màquina aïllada: per a maquines que es faran servir fora de la xarxa "
+#~ "de\n"
+#~ "                Debian Edu. Inclou GUI i fa conflictes amb altres "
+#~ "perfils.\n"
+#~ " "
+
 #, fuzzy
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr ""

Modified: branches/wheezy/debian-edu-install/debian/po/cs.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/cs.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/cs.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-08 15:31+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -53,74 +53,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hlavní server"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Stanice"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Stanice na cestách"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Tenký klient server"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Samostatný"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimální"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profily, které se mají použít na tomto počítači:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -135,46 +122,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hlavní server: Vyhrazený pro Debian Edu server. Neobsahuje\n"
-"                  grafické rozhraní. V síti Debian Edu by se měl\n"
-"                  nacházet pouze jeden.\n"
-" - Stanice:       Pro běžné počítače v síti Debian Edu.\n"
-" - Stanice na cestách:\n"
-"                  Pro jednouživatelské počítače v síti Debian Edu,\n"
-"                  které občas cestují mimo síť.\n"
-" - Tenký klient server:\n"
-"                  Obsahuje profil „Stanice“ a vyžaduje dvě síťové\n"
-"                  karty.\n"
-" - Samostatný:    Pro počítače, které nejsou součástí sítě Debian Edu.\n"
-"                  Obsahuje grafické rozhraní, koliduje s ostatními\n"
-"                  profily."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimální"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -200,13 +147,13 @@
 # "                  výuku dětí.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profil „Samostatný“ není možno použít s jinými profily"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -218,13 +165,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Instalace samostatného počítače vyžaduje ruční zásah"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -241,14 +188,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Opravdu chcete použít automatické rozdělení disku?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -263,14 +210,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Připojit se k průzkumu o nejpopulárnější balíky?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -283,7 +230,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -295,7 +242,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -306,60 +253,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu Hlavní server"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu Tenký klient server"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu Stanice"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu Hlavní server a Tenký klient server"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu Hlavní server a Stanice"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Minimální"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Instalace balíku Debian Edu selhala"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Instalace vyžadovaných balíků selhala"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -373,35 +320,34 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Příliš málo místa na disku. Přerušit instalaci?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 ""
-"Dostupné volné místo je pro zvolené profily příliš malé. Rozhodněte "
-"se, zda přerušit instalaci, nebo zda pokračovat bez doporučeného rozdělení "
-"disku."
+"Dostupné volné místo je pro zvolené profily příliš malé. Rozhodněte se, zda "
+"přerušit instalaci, nebo zda pokračovat bez doporučeného rozdělení disku."
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
 msgstr ""
-"Instalátor Debian Edu již provedl některé příkazy pro rozdělení disku. "
-"Je možné, že tím už byl předchozí obsah disku smazán."
+"Instalátor Debian Edu již provedl některé příkazy pro rozdělení disku. Je "
+"možné, že tím už byl předchozí obsah disku smazán."
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -436,6 +382,35 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Nahlaste je prosím vývojářům Debian Edu."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hlavní server: Vyhrazený pro Debian Edu server. Neobsahuje\n"
+#~ "                  grafické rozhraní. V síti Debian Edu by se měl\n"
+#~ "                  nacházet pouze jeden.\n"
+#~ " - Stanice:       Pro běžné počítače v síti Debian Edu.\n"
+#~ " - Stanice na cestách:\n"
+#~ "                  Pro jednouživatelské počítače v síti Debian Edu,\n"
+#~ "                  které občas cestují mimo síť.\n"
+#~ " - Tenký klient server:\n"
+#~ "                  Obsahuje profil „Stanice“ a vyžaduje dvě síťové\n"
+#~ "                  karty.\n"
+#~ " - Samostatný:    Pro počítače, které nejsou součástí sítě Debian Edu.\n"
+#~ "                  Obsahuje grafické rozhraní, koliduje s ostatními\n"
+#~ "                  profily."
+
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Během instalace Debian Edu se něco nepovedlo"
 

Modified: branches/wheezy/debian-edu-install/debian/po/da.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/da.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/da.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-24 05:26+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -27,74 +27,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hovedserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Arbejdsstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Roamingarbejdsstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Tynd klient-server"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Enkeltstående"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profiler at anvende på denne maskine:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -109,47 +96,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hovedserver: reserveret for Debian Edu-serveren. Den inkluderer\n"
-"                ikke en GUI (Grafisk brugergrænseflade). Der bør\n"
-"                kun være en sådan server på et Debian Edu-netværk.\n"
-" - Arbejdsstation:\n"
-"                for normale maskiner på Debian Edu-netværket.\n"
-" - Roamingarbejdsstation:\n"
-"                for enlige brugermaskiner på Debian Edu-netværket\n"
-"                som undertiden rejser uden for netværket.\n"
-" - Tynd klient-server:\n"
-"                inkluderer 'Arbejdsstation' og kræver to netværkskort\n"
-" - Enkeltstående:\n"
-"                for maskiner der skal bruges uden for Debian\n"
-"                Edu-netværket. Den inkluderer en grafisk\n"
-"                brugergrænseflade og er i konflikt med andre profiler."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -174,13 +120,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profilen Enkeltstående kan ikke bruges med andre profiler"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -192,13 +138,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Den enkeltstående installation er delvist manuel"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -215,14 +161,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Vil du virkelig bruge det automatiske partitioneringsværktøj?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -238,14 +184,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Vil du deltage i undersøgelsen om brug af pakkerne?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -259,7 +205,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -271,7 +217,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -282,60 +228,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Hovedserver til Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Tynd klient-server til Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Arbejdsstation til Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Hovedserver og Tynd klient-server til Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Hovedserver og arbejdsstation til Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Minimal installation til Debian Edu"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Pakkeinstallation til Debian Edu mislykkedes"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installation af krævede pakker mislykkedes"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -349,25 +295,25 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Tilgængelig diskplads er for lille. Afbryd installationen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 ""
 "Den tilgængelige diskplads er for lille for de valgte profiler. Vælg "
-"venligst hvorvidt du ønsker at afbryde installationen eller fortsætte "
-"uden at sætte den anbefalede partitionsopsætning op."
+"venligst hvorvidt du ønsker at afbryde installationen eller fortsætte uden "
+"at sætte den anbefalede partitionsopsætning op."
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -378,7 +324,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -412,3 +358,33 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Overvej at rapportere dem til Debian Edu-udviklerne."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hovedserver: reserveret for Debian Edu-serveren. Den inkluderer\n"
+#~ "                ikke en GUI (Grafisk brugergrænseflade). Der bør\n"
+#~ "                kun være en sådan server på et Debian Edu-netværk.\n"
+#~ " - Arbejdsstation:\n"
+#~ "                for normale maskiner på Debian Edu-netværket.\n"
+#~ " - Roamingarbejdsstation:\n"
+#~ "                for enlige brugermaskiner på Debian Edu-netværket\n"
+#~ "                som undertiden rejser uden for netværket.\n"
+#~ " - Tynd klient-server:\n"
+#~ "                inkluderer 'Arbejdsstation' og kræver to netværkskort\n"
+#~ " - Enkeltstående:\n"
+#~ "                for maskiner der skal bruges uden for Debian\n"
+#~ "                Edu-netværket. Den inkluderer en grafisk\n"
+#~ "                brugergrænseflade og er i konflikt med andre profiler."

Modified: branches/wheezy/debian-edu-install/debian/po/de.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/de.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/de.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 0.682~svn61027\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-04 21:41+0100\n"
 "Last-Translator: Holger Levsen <holger at layer-acht.org>\n"
 "Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -34,74 +34,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hauptserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Arbeitsplatzrechner"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Mobiler Arbeitsplatzrechner"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Terminal-Server"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Einzelplatzrechner"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profil(e), die auf diesem Rechner installiert werden sollen:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -116,44 +103,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hauptserver: reserviert für den Debian-Edu-Server. Es enthält\n"
-"            keine GUI (graphische Benutzeroberfläche). Es darf nur\n"
-"            einen solchen Server im Debian-Edu-Netz geben.\n"
-" - Arbeitsplatzrechner: für normale Rechner im Debian-Edu-Netz.\n"
-" - Mobiler Arbeitsplatzrechner: für Rechner (»single user«), die sich\n"
-"            nur zeitweise im Debian-Edu-Netzwerk befinden.\n"
-" - Terminal-Server: schließt »Arbeitsplatzrechner« mit ein; der\n"
-"            betroffene Rechner benötigt zwei Netzwerkkarten.\n"
-" - Einzelplatzrechner: für Rechner, die außerhalb des Debian-Edu-\n"
-"            Netzes verwendet werden. Enthält eine GUI und kann nicht\n"
-"            mit anderen Profilen kombiniert werden."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -177,7 +126,7 @@
 # "                und Lernen von Kindern fördert.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 "Das Profil »Einzelplatzrechner« kann nicht mit anderen Profilen kombiniert "
@@ -185,7 +134,7 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -198,13 +147,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Die Installation des Einzelplatzrechners erfolgt teilweise manuell."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -221,14 +170,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Wollen Sie wirklich die automatische Partitionierung verwenden?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -245,14 +194,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "An der Erfassung der Paketverwendung teilnehmen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -265,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -277,7 +226,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -288,60 +237,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian-Edu-Hauptserver"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian-Edu-Terminal-Server"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian-Edu-Arbeitsplatzrechner"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian-Edu-Hauptserver und -Terminal-Server"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian-Edu-Hauptserver und -Arbeitsplatzrechner"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian-Edu-Minimal"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian-Edu-Paketinstallation fehlgeschlagen"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installation von benötigten Paketen fehlgeschlagen"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -356,13 +305,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Verfügbarer Plattenplatz ist zu klein. Installation abbrechen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -374,7 +323,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -385,7 +334,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -420,6 +369,33 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Bitte berichten Sie diese an die Debian-Edu-Entwickler."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hauptserver: reserviert für den Debian-Edu-Server. Es enthält\n"
+#~ "            keine GUI (graphische Benutzeroberfläche). Es darf nur\n"
+#~ "            einen solchen Server im Debian-Edu-Netz geben.\n"
+#~ " - Arbeitsplatzrechner: für normale Rechner im Debian-Edu-Netz.\n"
+#~ " - Mobiler Arbeitsplatzrechner: für Rechner (»single user«), die sich\n"
+#~ "            nur zeitweise im Debian-Edu-Netzwerk befinden.\n"
+#~ " - Terminal-Server: schließt »Arbeitsplatzrechner« mit ein; der\n"
+#~ "            betroffene Rechner benötigt zwei Netzwerkkarten.\n"
+#~ " - Einzelplatzrechner: für Rechner, die außerhalb des Debian-Edu-\n"
+#~ "            Netzes verwendet werden. Enthält eine GUI und kann nicht\n"
+#~ "            mit anderen Profilen kombiniert werden."
+
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Während der Installation von Debian Edu ist etwas schief gelaufen"
 

Modified: branches/wheezy/debian-edu-install/debian/po/el.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/el.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/el.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: popularity_el\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2007-11-30 16:55+0200\n"
 "Last-Translator: Faidon Liambotis <paravoid at debian.org>\n"
 "Language-Team: Greek translation team <debian-l10n-greek at lists.debian.org>\n"
@@ -39,11 +39,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Main Server"
@@ -51,21 +48,15 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Σταθμός Εργασίας"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Roaming Workstation"
@@ -73,11 +64,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Thin Client Server"
@@ -85,30 +73,28 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Αυτόνομο σύστημα"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Βασική"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 #, fuzzy
 msgid "Profile(s) to apply to this machine:"
 msgstr "Επιλέξτε ποια προφίλ θέλετε να χρησιμοποιήσετε για αυτό το σύστημα."
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Τα προφίλ αποφασίζουν το πώς ο υπολογιστής μπορεί να χρησιμοποιηθεί με τις "
@@ -116,6 +102,7 @@
 
 #. 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"
@@ -130,33 +117,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Βασική"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -164,14 +124,14 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Το αυτόνομο προφίλ δεν συνδυάζεται"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -183,14 +143,14 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 #, fuzzy
 msgid "Standalone installation is partly manual"
 msgstr "Η εγκατάσταση του Αυτόνομου συστήματος γίνεται μερικώς χειροκίνητα."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -208,14 +168,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Θέλετε να χρησιμοποιήσετε το εργαλείο αυτόματης διαμέρισης;"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -234,14 +194,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Θέλετε να συμμετάσχετε στην έρευνα χρήσης των πακέτων;"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -255,7 +215,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -268,7 +228,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -279,7 +239,7 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Debian Edu Main Server"
@@ -288,7 +248,7 @@
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Debian Edu Thin Client Server"
@@ -297,7 +257,7 @@
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Workstation"
@@ -306,7 +266,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Debian Edu Main Server and Thin Client Server"
@@ -315,7 +275,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Main Server and Workstation"
@@ -324,7 +284,7 @@
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 #, fuzzy
 #| msgid "Choose Debian Edu profile"
 msgid "Debian Edu Minimal"
@@ -332,7 +292,7 @@
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu package installation failed"
@@ -340,13 +300,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Η εγγατάσταση των απατιούμενων πακέτων απέτυχε"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -360,13 +320,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -375,7 +335,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -383,7 +343,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "

Modified: branches/wheezy/debian-edu-install/debian/po/es.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/es.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/es.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.517~svn68851\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-04 14:14-0600\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -51,69 +51,55 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Servidor principal"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Estación de trabajo itinerante"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Servidor de clientes ligeros"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Independiente"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Mínimo"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Escoja qué perfil/es aplicará en esta máquina:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Los perfiles determinan el uso qué podrá tener la máquina nada más finalizar "
@@ -121,6 +107,7 @@
 
 #. 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"
@@ -135,47 +122,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Servidor principal: reservado para el servidor de Debian Edu. No\n"
-"                incluye ninguna GUI (Interfaz Gráfico de Usuario).\n"
-"                Sólo debería haber un servidor de este tipo en una\n"
-"                red de Debian Edu.\n"
-" - Estación de trabajo: para máquinas normales en la red de Debian Edu.\n"
-" - Estación de trabajo itinerante: para máquinas de un único usuario\n"
-"                en la red de Debian Edu, pero que a veces sale fuera de la "
-"red.\n"
-" - Servidor de clientes ligeros:\n"
-"                incluye «Estación de trabajo» y necesita dos tarjetas\n"
-"                de red.\n"
-" - Independiente: para máquinas que se vayan a usar fuera de la\n"
-"                red de Debian Edu. Incluye una GUI y es incompatible\n"
-"                con otros perfiles."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Mínimo"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -202,13 +148,13 @@
 # "                colaborativo entre los niños.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "El perfil «Independiente» es incompatible con otros perfiles"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -220,13 +166,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "La instalación «Independiente» es en parte manual"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -242,14 +188,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "¿Realmente desea usar el particionado automático?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -266,14 +212,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "¿Desea participar en la encuesta de uso del paquete?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -287,7 +233,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -299,7 +245,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -310,60 +256,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Servidor principal de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Servidor de clientes ligeros de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Estación de trabajo de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Servidor principal y Servidor de clientes ligeros de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Servidor principal y Estación de trabajo de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu mínimo"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "La instalación del paquete de Debian Edu ha fallado"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "La instalación de los paquetes necesarios ha fallado"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -378,13 +324,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "El espacio disponible es insuficiente. Abortar la instalación?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -396,7 +342,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -407,7 +353,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -441,3 +387,33 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Considere notificarlos a los desarrolladores de Debian Edu."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Servidor principal: reservado para el servidor de Debian Edu. No\n"
+#~ "                incluye ninguna GUI (Interfaz Gráfico de Usuario).\n"
+#~ "                Sólo debería haber un servidor de este tipo en una\n"
+#~ "                red de Debian Edu.\n"
+#~ " - Estación de trabajo: para máquinas normales en la red de Debian Edu.\n"
+#~ " - Estación de trabajo itinerante: para máquinas de un único usuario\n"
+#~ "                en la red de Debian Edu, pero que a veces sale fuera de "
+#~ "la red.\n"
+#~ " - Servidor de clientes ligeros:\n"
+#~ "                incluye «Estación de trabajo» y necesita dos tarjetas\n"
+#~ "                de red.\n"
+#~ " - Independiente: para máquinas que se vayan a usar fuera de la\n"
+#~ "                red de Debian Edu. Incluye una GUI y es incompatible\n"
+#~ "                con otros perfiles."

Modified: branches/wheezy/debian-edu-install/debian/po/eu.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/eu.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/eu.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install_1.517~svn68851_eu\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-10-09 13:02+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
 "Language-Team: Basque <debian-l10n-basque at lists.debian.org>\n"
@@ -28,69 +28,55 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Zerbitzari nagusia"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Lanpostua"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Lanpostu ibiltaria"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Bezero arinentzako zerbitzaria"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Bakarkakoa"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Gutxienekoa"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profilak ordenagailu honi aplikatzeko:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Ordenagailuan aldaketarik egin gabe nola funtzionatuko duen zehazten dute "
@@ -98,6 +84,7 @@
 
 #. 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"
@@ -112,46 +99,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Zerbitzari nagusia: Debian Edu zerbitzariarentzat gordeta. Ez du\n"
-"                interfaze grafikorik. Zerbitzari bat bakarrik egon behar\n"
-"                da Debian Edu-ren sare bakoitzean.\n"
-" - Lanpostua: Debian Edu sareko makina arruntentzat.\n"
-" - Lanpostu ibiltaria: Debian Edu sareko erabiltzaile bakarreko "
-"makinentzako,\n"
-"                batzuetan saretik kanpo bidaiatzen dutenak.\n"
-" - Bezero arinentzako zerbitzaria:\n"
-"                lanpostua barneratzen du eta bi sare txartel behar\n"
-"                ditu.\n"
-" - Bakarkakoa:  Debian Edu saretik at erabiltzeko makinentzat. Interfaze\n"
-"                grafikoa barneratzen du eta beste profilekin elkarjotzen\n"
-"                du."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Gutxienekoa"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -175,13 +122,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Bakarkako profila ezin da beste profilekin batera erabili"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -193,13 +140,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Bakarkakoaren instalazioaren urrats batzuk eskuz egin behar dira"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -216,14 +163,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Benetan partizio automatikoaren tresna erabili?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -240,14 +187,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Paketeen erabilpen galdeketan parte hartzea nahi duzu?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -261,7 +208,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -273,7 +220,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -284,60 +231,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu zerbitzari nagusia"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu bezero arinentzako zerbitzaria"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu lanpostua"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu zerbitzari nagusia eta bezero arinentzako zerbitzaria"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu zerbitzari nagusia eta lanpostua"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu gutxienekoa"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu paketearen instalazioak huts egin du"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Huts egin du beharrezkoa den paketea instalatzean"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -352,13 +299,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -367,7 +314,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -375,7 +322,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -406,3 +353,32 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Pentsatu errore horien berri emateaz Debian Edu-ko garatzaileei."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Zerbitzari nagusia: Debian Edu zerbitzariarentzat gordeta. Ez du\n"
+#~ "                interfaze grafikorik. Zerbitzari bat bakarrik egon behar\n"
+#~ "                da Debian Edu-ren sare bakoitzean.\n"
+#~ " - Lanpostua: Debian Edu sareko makina arruntentzat.\n"
+#~ " - Lanpostu ibiltaria: Debian Edu sareko erabiltzaile bakarreko "
+#~ "makinentzako,\n"
+#~ "                batzuetan saretik kanpo bidaiatzen dutenak.\n"
+#~ " - Bezero arinentzako zerbitzaria:\n"
+#~ "                lanpostua barneratzen du eta bi sare txartel behar\n"
+#~ "                ditu.\n"
+#~ " - Bakarkakoa:  Debian Edu saretik at erabiltzeko makinentzat. Interfaze\n"
+#~ "                grafikoa barneratzen du eta beste profilekin elkarjotzen\n"
+#~ "                du."

Modified: branches/wheezy/debian-edu-install/debian/po/fi.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/fi.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/fi.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -41,7 +41,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-10-17 21:16+0300\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -61,69 +61,55 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Pääpalvelin"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Työasema"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Siirrettävä työasema"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Päätepalvelin"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Itsenäinen työasema"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimaalinen"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Tällä koneella käytettävät profiilit:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Profiilit määrittävät mihin konetta voidaan käyttää suoraan asennuksen "
@@ -131,6 +117,7 @@
 
 #. 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"
@@ -145,45 +132,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Pääpalvelin:   Varattu Debian Edu -palvelimelle. Ei sisällä graafista\n"
-"                  käyttöliittymää. Debian Edu -verkossa tulisi olla vain\n"
-"                  yksi tällainen palvelin.\n"
-" - Työasema:      Debian Edu -verkon tavalliset koneet.\n"
-" - Siirrettävä työasema:\n"
-"                  Debian Edu -verkon yhden käyttäjän koneet, joita\n"
-"                  käytetään välillä myös verkoin ulkopuolella.\n"
-" - Päätepalvelin: Sisältää ”työaseman” ja vaatii kaksi verkkokorttia.\n"
-" - Itsenäinen työasema:\n"
-"                  Tarkoitettu Debian Edu -verkon ulkopuolella\n"
-"                  käytettäville koneille. Tätä ei voida käyttää muiden\n"
-"                  profiilien kanssa. Sisältää graafisen käyttöliittymän."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimaalinen"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -205,14 +153,14 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../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."
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -224,13 +172,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Profiilin ”Itsenäinen työasema” asennus on tehtävä osaksi käsin."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -247,14 +195,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Haluatko varmasti käyttää automaattista osiointityökalua?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -270,14 +218,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Osallistutko Debianin pakettien käyttötutkimukseen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -291,7 +239,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -303,7 +251,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -314,60 +262,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edun pääpalvelin"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edun päätepalvelin"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu -työasema"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edun pääpalvelin ja päätepalvelin"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edun pääpalvelin ja työasema"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Minimaalinen Debian Edu"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Paketin ”Debian Edu” asennus epäonnistui"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Vaadittujen pakettien asennus epäonnistui"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -381,13 +329,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -396,7 +344,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -404,7 +352,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -435,3 +383,31 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Harkitse näiden raportoimista Debian Edu -kehittäjille."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Pääpalvelin:   Varattu Debian Edu -palvelimelle. Ei sisällä graafista\n"
+#~ "                  käyttöliittymää. Debian Edu -verkossa tulisi olla vain\n"
+#~ "                  yksi tällainen palvelin.\n"
+#~ " - Työasema:      Debian Edu -verkon tavalliset koneet.\n"
+#~ " - Siirrettävä työasema:\n"
+#~ "                  Debian Edu -verkon yhden käyttäjän koneet, joita\n"
+#~ "                  käytetään välillä myös verkoin ulkopuolella.\n"
+#~ " - Päätepalvelin: Sisältää ”työaseman” ja vaatii kaksi verkkokorttia.\n"
+#~ " - Itsenäinen työasema:\n"
+#~ "                  Tarkoitettu Debian Edu -verkon ulkopuolella\n"
+#~ "                  käytettäville koneille. Tätä ei voida käyttää muiden\n"
+#~ "                  profiilien kanssa. Sisältää graafisen käyttöliittymän."

Modified: branches/wheezy/debian-edu-install/debian/po/fr.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/fr.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/fr.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-24 22:56+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -30,69 +30,55 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Serveur principal"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Station de travail"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Station de travail mobile"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Serveur pour clients légers"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Autonome"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profils à utiliser sur cette machine :"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Les profils définissent la façon dont la machine pourra être utilisée une "
@@ -100,6 +86,7 @@
 
 #. 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"
@@ -114,47 +101,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Principal :  réservé au serveur Debian Edu. Ce profil n'installe\n"
-"                pas d'interface graphique. Il ne doit y avoir qu'un\n"
-"                seul serveur de ce type sur un réseau Debian Edu.\n"
-" - Station de travail :\n"
-"                pour les machines ordinaires du réseau Debian Edu.\n"
-" - Station de travail mobile :\n"
-"                pour les machines mono-utilisateur du réseau Debian Edu\n"
-"                qui sont utilisées ponctuellement de manière isolée.\n"
-" - Serveur pour clients légers :\n"
-"                inclut le profil « Station de travail » et nécessite\n"
-"                deux cartes réseau.\n"
-" - Autonome :   destiné aux machines utilisées en dehors du réseau\n"
-"                Debian Edu. Il comporte une interface graphique\n"
-"                et est incompatible avec les autres profils."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -182,13 +128,13 @@
 # "                enfants."
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Impossible d'utiliser le profil « Autonome » avec d'autres profils"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -200,13 +146,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "L'installation autonome est partiellement manuelle."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -224,14 +170,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Faut-il vraiment utiliser l'outil de partitionnement automatique ?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -249,14 +195,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Participer à l'étude statistique sur l'utilisation des paquets ?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -270,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -283,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -294,60 +240,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Serveur principal Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Serveur Debian Edu pour clients légers"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Station de travail Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Serveur Debian Edu principal et serveur pour clients légers"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Serveur Debian Edu principal et station de travail"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu minimal"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Échec de l'installation d'un paquet de Debian Edu"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Échec de l'installation de paquets requis"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -362,13 +308,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Espace disque trop faible. Interrompre l'installation ?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -380,7 +326,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -390,7 +336,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -426,6 +372,36 @@
 msgstr "Veuillez les signaler aux développeurs de Debian Edu."
 
 #~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Principal :  réservé au serveur Debian Edu. Ce profil n'installe\n"
+#~ "                pas d'interface graphique. Il ne doit y avoir qu'un\n"
+#~ "                seul serveur de ce type sur un réseau Debian Edu.\n"
+#~ " - Station de travail :\n"
+#~ "                pour les machines ordinaires du réseau Debian Edu.\n"
+#~ " - Station de travail mobile :\n"
+#~ "                pour les machines mono-utilisateur du réseau Debian Edu\n"
+#~ "                qui sont utilisées ponctuellement de manière isolée.\n"
+#~ " - Serveur pour clients légers :\n"
+#~ "                inclut le profil « Station de travail » et nécessite\n"
+#~ "                deux cartes réseau.\n"
+#~ " - Autonome :   destiné aux machines utilisées en dehors du réseau\n"
+#~ "                Debian Edu. Il comporte une interface graphique\n"
+#~ "                et est incompatible avec les autres profils."
+
+#~ msgid ""
 #~ "The available disk space is too small for the selected profiles.  Do you "
 #~ "want to continue without setting up the recommended partitioning setup, "
 #~ "or abort the installation?"

Modified: branches/wheezy/debian-edu-install/debian/po/gl.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/gl.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/gl.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2009-11-07 20:27+0100\n"
 "Last-Translator: Marce Villarino <mvillarino at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -27,11 +27,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Main Server"
@@ -39,21 +36,15 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Estación de traballo"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Roaming Workstation"
@@ -61,11 +52,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Thin Client Server"
@@ -73,34 +61,33 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Autónomo"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Mínimo"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Perfís a aplicar a esta máquina:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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 ""
@@ -114,56 +101,6 @@
 #| "                cards.\n"
 #| " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 #| "                network. It includes a GUI and conflicts with other\n"
-#| "                profiles."
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Servidor principal: reservado para o servidor de Debian Edu. Non inclúe\n"
-"                ningunha interface gráfica de usuario. Debe haber\n"
-"                un só servidor nunha rede Debian Edu.\n"
-" - Estación de traballo: para as máquinas normais na rede Debian Edu.\n"
-" - Servidor de clientes lixeiros: inclúe «estación de traballo» e precisa de "
-"dúas\n"
-"                tarxetas de rede.\n"
-" - Autónomo:    para as máquinas que se han empregar fóra da rede\n"
-"                Debian Edu. Inclúe interface de usuario e non se pode\n"
-"                combinar cos outros perfís."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Mínimo"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-#, fuzzy
-#| msgid ""
-#| " - Main-Server: reserved for the Debian Edu server. It does not\n"
-#| "                include any GUI (Graphical User Interface). There\n"
-#| "                should only be one such server on a Debian Edu\n"
-#| "                network.\n"
-#| " - Workstation: for normal machines on the Debian Edu network.\n"
-#| " - Thin-Client-Server:\n"
-#| "                includes 'Workstation' and requires two network\n"
-#| "                cards.\n"
-#| " - Standalone:  for machines meant to be used outside the Debian Edu\n"
-#| "                network. It includes a GUI and conflicts with other\n"
 #| "                profiles.\n"
 #| " - Minimal:     fully integrated into the Debian Edu network but\n"
 #| "                contains only a basic system without any GUI."
@@ -203,13 +140,13 @@
 # "                cooperativa entre os nenos.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Non se pode empregar o perfil autónomo cos outros perfís"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -221,13 +158,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "A instalación autónoma é manual en parte"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -243,14 +180,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Desexa realmente empregar a ferramenta de particionamento automático?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -267,14 +204,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Desexa participar na enquisa de utilización dos paquetes?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -288,7 +225,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -300,7 +237,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -311,7 +248,7 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 #, fuzzy
 #| msgid "Debian Edu Main-Server"
 msgid "Debian Edu Main Server"
@@ -320,7 +257,7 @@
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Debian Edu Thin-Client-Server"
 msgid "Debian Edu Thin Client Server"
@@ -329,14 +266,14 @@
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Estación de traballo de Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../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"
@@ -345,7 +282,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 #, fuzzy
 #| msgid "Debian Edu Main-Server and Workstation"
 msgid "Debian Edu Main Server and Workstation"
@@ -354,13 +291,13 @@
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu mínima"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 #, fuzzy
 #| msgid "Debian Edu Workstation"
 msgid "Debian Edu package installation failed"
@@ -368,13 +305,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -384,13 +321,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -399,7 +336,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -407,7 +344,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -439,6 +376,46 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Por favor, informe deles aos desenvolvedores de Debian Edu."
 
+#, fuzzy
+#~| msgid ""
+#~| " - Main-Server: reserved for the Debian Edu server. It does not\n"
+#~| "                include any GUI (Graphical User Interface). There\n"
+#~| "                should only be one such server on a Debian Edu\n"
+#~| "                network.\n"
+#~| " - Workstation: for normal machines on the Debian Edu network.\n"
+#~| " - Thin-Client-Server:\n"
+#~| "                includes 'Workstation' and requires two network\n"
+#~| "                cards.\n"
+#~| " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~| "                network. It includes a GUI and conflicts with other\n"
+#~| "                profiles."
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Servidor principal: reservado para o servidor de Debian Edu. Non "
+#~ "inclúe\n"
+#~ "                ningunha interface gráfica de usuario. Debe haber\n"
+#~ "                un só servidor nunha rede Debian Edu.\n"
+#~ " - Estación de traballo: para as máquinas normais na rede Debian Edu.\n"
+#~ " - Servidor de clientes lixeiros: inclúe «estación de traballo» e precisa "
+#~ "de dúas\n"
+#~ "                tarxetas de rede.\n"
+#~ " - Autónomo:    para as máquinas que se han empregar fóra da rede\n"
+#~ "                Debian Edu. Inclúe interface de usuario e non se pode\n"
+#~ "                combinar cos outros perfís."
+
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Houbo un problema durante o proceso de instalación de Debian Edu"
 

Modified: branches/wheezy/debian-edu-install/debian/po/id.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/id.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/id.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.524\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-11 22:18+0700\n"
 "Last-Translator: Kurniawan Haikal <conecones 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"
@@ -25,74 +26,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Server Utama"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Workstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Roaming Workstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Server Thin Client"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Standalone"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profil yang diterapkan untuk mesin ini:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -107,46 +95,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Server Utama : dicadangkan untuk server Debian Edu. Ini tidak\n"
-"                memiliki antar muka grafis (GUI). Seharusnya hanya\n"
-"                ada satu buah server di tiap jaringan Debian Edu.\n"
-" - Workstation: untuk mesin normal pada jaringan Debian edu.\n"
-" - Roaming Workstation: untuk mesin tunggal pengguna pada jaringan\n"
-"                Debian Edu yang kadang kala bepergian keluar dari\n"
-"                jaringan.\n"
-" - Server Thin Client :\n"
-"                termasuk 'Workstation' dan membutuhkan dua kartu\n"
-"                jaringan.\n"
-" - Standalone:  untuk mesin yang digunakan di luar jaringan Debian\n"
-"                Edu. Memiliki antar muka grafis dan bertentangan\n"
-"                dengan profil lainny."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -163,20 +111,21 @@
 "                jaringan.\n"
 " - Standalone:  untuk mesin yang digunakan di luar jaringan Debian\n"
 "                Edu. Memiliki antar muka grafis dan bertentangan\n"
-"                dengan profil lainny."
-" - Minimal:     terintegrasi penuh ke dalam jaringan Debian Edu\n"
+"                dengan profil lainny. - Minimal:     terintegrasi penuh ke "
+"dalam jaringan Debian Edu\n"
 "                tetapi hanya berisi sistem dasar tanpa antar muka\n"
 "                grafis (GUI)."
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../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
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -188,72 +137,72 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Pemasangan Standalone sebagian dilakukan secara manual"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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 "
 "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."
+"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."
 
 #. Type: text
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Benar-benar menggunakan perkakas partisi otomatis?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "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 ""
-"Ini akan merusak tabel partisi pada semua disk pada mesin. ULANG: "
-"INI AKAN MENGHAPUS BERSIH SELURUH DISK PADA MESIN! Jika anda memiliki "
-"data penting yang belum di-backup, "
+"Ini akan merusak tabel partisi pada semua disk pada mesin. ULANG: INI AKAN "
+"MENGHAPUS BERSIH SELURUH DISK PADA MESIN! Jika anda memiliki data penting "
+"yang belum di-backup, "
 
 #. Type: text
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Berpartisipasi dalam survei penggunaan paket?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "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 ""
-"Sistem dapat menyediakan statistika tentang paket yang paling sering "
-"dipakai pada sistem ini kepada pengembang distribusi secara anonim. "
-"Informasi ini mempengaruhi keputusan seperti paket mana yang harus "
-"berada pada CD pertama distribusi."
+"Sistem dapat menyediakan statistika tentang paket yang paling sering dipakai "
+"pada sistem ini kepada pengembang distribusi secara anonim. Informasi ini "
+"mempengaruhi keputusan seperti paket mana yang harus berada pada CD pertama "
+"distribusi."
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -261,75 +210,76 @@
 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:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "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
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Server Utama Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Server Thin Client Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Workstation Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Server Utama dan Server Thin Client Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Server Utama dan Workstation Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Minimal"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Pemasangan paket Debian Edu gagal"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Pemasangan paket-paket yang dibutuhkan gagal"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -343,25 +293,25 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Space disk yang tersedia terlalu kecil. Batalkan pemasangan?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 ""
-"Space disk yang tersedia terlalu kecil untuk profil yang dipilih. "
-"Silakan pilih apakah anda ingin membatalkan pemasangan atau melanjutkan "
-"tanpa mengatur pengaturan partisi yang dianjurkan"
+"Space disk yang tersedia terlalu kecil untuk profil yang dipilih. Silakan "
+"pilih apakah anda ingin membatalkan pemasangan atau melanjutkan tanpa "
+"mengatur pengaturan partisi yang dianjurkan"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -371,7 +321,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -405,3 +355,32 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Mempertimbangkan untuk melaporkan ke pengembang Debian Edu."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Server Utama : dicadangkan untuk server Debian Edu. Ini tidak\n"
+#~ "                memiliki antar muka grafis (GUI). Seharusnya hanya\n"
+#~ "                ada satu buah server di tiap jaringan Debian Edu.\n"
+#~ " - Workstation: untuk mesin normal pada jaringan Debian edu.\n"
+#~ " - Roaming Workstation: untuk mesin tunggal pengguna pada jaringan\n"
+#~ "                Debian Edu yang kadang kala bepergian keluar dari\n"
+#~ "                jaringan.\n"
+#~ " - Server Thin Client :\n"
+#~ "                termasuk 'Workstation' dan membutuhkan dua kartu\n"
+#~ "                jaringan.\n"
+#~ " - Standalone:  untuk mesin yang digunakan di luar jaringan Debian\n"
+#~ "                Edu. Memiliki antar muka grafis dan bertentangan\n"
+#~ "                dengan profil lainny."

Modified: branches/wheezy/debian-edu-install/debian/po/it.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/it.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/it.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -43,7 +43,7 @@
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-06 20:07+0100\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <kde-i18n-it at kde.org>\n"
@@ -63,74 +63,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Server Principale"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Workstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Roaming Workstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Server thin client"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Standalone"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimo"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Scegli quale tipo di profilo(i) utilizzare su questa macchina"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -145,45 +132,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Server-Principale: riservato per il server Debian Edu e non include\n"
-"                alcuna interfaccia grafica GUI. Ci dovrebbe essere\n"
-"                solo un server in una rete Debian Edu.\n"
-" - Workstation: per macchine di rete normali in una rete Debian Edu.\n"
-" - Roaming Workstation: per macchine usate da un singolo utente su una rete "
-"Debian Edu\n"
-"                che alcune volte lavora fuori dalla rete.\n"
-" - Server-Thin-Client: include il profilo 'Workstation' e richiede\n"
-"                due schede di rete.\n"
-" - Standalone:  per macchine che sono usate fuori della rete Debian Edu \n"
-"                Include un'interfaccia grafica e e non può\n"
-"                essere usato con gli altri profili."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimo"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -210,13 +158,13 @@
 # "                l'apprendimento collaborativo per i bambini.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Il profilo standalone non può essere usato con altri profili"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -228,13 +176,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "L'installazione 'Standalone' è parzialmente manuale."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -251,14 +199,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Sicuri di voler usare il partizionamento automatico?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -274,14 +222,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Si desidera partecipare all'indagine sull'uso dei pacchetti?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -295,7 +243,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -308,7 +256,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -319,60 +267,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Server Principale Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Server Thin Client Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu Workstation"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Server Principale e Server Thin Client Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Server Principale e Workstation Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Minimo"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "L'installazione del pacchetto Debian Edu è fallita"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "L'installazione dei pacchetti richiesti non è riuscita"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -386,7 +334,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 "Lo spazio disponibile su disco è troppo piccolo. Interrompere "
@@ -394,41 +342,38 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 ""
 "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"
+"Si prega di scegliere se si desidera interrompere l'installazione o "
+"continuare senza la configurazione di partizionamento consigliata"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
 msgstr ""
 "Il programma di installazione di Debian Edu ha già eseguito alcuni comandi "
-"di configurazione del disco.  "
-"Il contenuto precedente del disco potrebbe già essere stato distrutto. "
+"di configurazione del disco.  Il contenuto precedente del disco potrebbe già "
+"essere stato distrutto. "
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 ""
 "Se si sceglie di continuare, una singola partizione verrà utilizzata per "
-"tutto il sistema "
-"file di sistema e file utente.  Si noti che questo può causare problemi di "
-"stabilità dopo un "
-"po'. "
+"tutto il sistema file di sistema e file utente.  Si noti che questo può "
+"causare problemi di stabilità dopo un po'. "
 
 #. Type: text
 #. Description
@@ -455,3 +400,30 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Considera di inviarlo agli sviluppatori Debian Edu."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Server-Principale: riservato per il server Debian Edu e non include\n"
+#~ "                alcuna interfaccia grafica GUI. Ci dovrebbe essere\n"
+#~ "                solo un server in una rete Debian Edu.\n"
+#~ " - Workstation: per macchine di rete normali in una rete Debian Edu.\n"
+#~ " - Roaming Workstation: per macchine usate da un singolo utente su una "
+#~ "rete Debian Edu\n"
+#~ "                che alcune volte lavora fuori dalla rete.\n"
+#~ " - Server-Thin-Client: include il profilo 'Workstation' e richiede\n"
+#~ "                due schede di rete.\n"
+#~ " - Standalone:  per macchine che sono usate fuori della rete Debian Edu \n"
+#~ "                Include un'interfaccia grafica e e non può\n"
+#~ "                essere usato con gli altri profili."

Modified: branches/wheezy/debian-edu-install/debian/po/ja.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/ja.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/ja.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-26 18:56+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -35,74 +35,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "主サーバ"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "ワークステーション"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "ローミングワークステーション"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "シンクライアントサーバ"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "スタンドアロン"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "最小"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "このマシンに適用するプロファイル:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -117,45 +104,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - 主サーバ: Debian Edu サーバとして予約されます。GUI (グラフィカルユーザ\n"
-"             インターフェイス) を含んでいません。Debian Edu ネットワークで\n"
-"             このサーバは 1 つのみであるべきです。\n"
-" - ワークステーション: Debian Edu ネットワークの通常のマシンです。\n"
-" - ローミングワークステーション: Debian Edu ネットワークでの単一ユーザマシ"
-"ン\n"
-"             向けで、そのネットワークから外に出ることもあります。\n"
-" - シンクライアントサーバ:\n"
-"             'ワークステーション' を含み、2 枚のネットワークカードが必要で"
-"す。\n"
-" - スタンドアロン:  Debian Edu ネットワーク外で使われるマシンです。\n"
-"             GUI を含み、ほかのプロファイルとは競合します。"
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "最小"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -179,13 +127,13 @@
 # "             含む 'スタンドアロン' の一種です。\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "スタンドアロンプロファイルはほかのプロファイルと一緒には利用できません"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -197,13 +145,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "スタンドアロンインストールは部分的に手動です"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -219,14 +167,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "本当に自動パーティショニングツールを利用しますか?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -243,14 +191,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Debian パッケージ利用調査に参加しますか?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -264,7 +212,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -276,7 +224,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -287,60 +235,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu 主サーバ"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu シンクライアントサーバ"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu ワークステーション"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu 主サーバとシンクライアントサーバ"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu 主サーバとワークステーション"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu 最小構成"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu パッケージのインストールに失敗しました"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "必須パッケージのインストールに失敗"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -354,23 +302,26 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 "利用可能なディスクの空き容量が小さすぎます。インストールを中止しますか?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -381,7 +332,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -415,3 +366,33 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Debian Edu 開発者にこれを報告することを検討してください。"
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - 主サーバ: Debian Edu サーバとして予約されます。GUI (グラフィカルユー"
+#~ "ザ\n"
+#~ "             インターフェイス) を含んでいません。Debian Edu ネットワーク"
+#~ "で\n"
+#~ "             このサーバは 1 つのみであるべきです。\n"
+#~ " - ワークステーション: Debian Edu ネットワークの通常のマシンです。\n"
+#~ " - ローミングワークステーション: Debian Edu ネットワークでの単一ユーザマシ"
+#~ "ン\n"
+#~ "             向けで、そのネットワークから外に出ることもあります。\n"
+#~ " - シンクライアントサーバ:\n"
+#~ "             'ワークステーション' を含み、2 枚のネットワークカードが必要で"
+#~ "す。\n"
+#~ " - スタンドアロン:  Debian Edu ネットワーク外で使われるマシンです。\n"
+#~ "             GUI を含み、ほかのプロファイルとは競合します。"

Modified: branches/wheezy/debian-edu-install/debian/po/lv.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/lv.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/lv.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -42,7 +42,7 @@
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2006-12-01 18:14+0000\n"
 "Last-Translator: Aigars Mahinovs <aigarius at debian.org>\n"
 "Language-Team: Latvian <locale at laka.lv>\n"
@@ -62,11 +62,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Main Server"
@@ -74,21 +71,15 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Darbstacija"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Roaming Workstation"
@@ -96,11 +87,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Thin Client Server"
@@ -108,36 +96,35 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 msgid "Standalone"
 msgstr "Patstāvīgs Paplašināts"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 #, fuzzy
 msgid "Profile(s) to apply to this machine:"
 msgstr "Lūdzu izvelieties, kādus profilus pielietot šim datoram."
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -152,33 +139,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -186,13 +146,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -201,14 +161,14 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 #, fuzzy
 msgid "Standalone installation is partly manual"
 msgstr "Patstāvīgā profila instalācija ir daļēji manuāla."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -225,14 +185,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Tiešām izmantot automātisko dalīšanu?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -250,14 +210,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -267,7 +227,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -276,7 +236,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -285,7 +245,7 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Debian Edu Main Server"
@@ -294,7 +254,7 @@
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Debian Edu Thin Client Server"
@@ -303,7 +263,7 @@
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Workstation"
@@ -312,14 +272,14 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Main Server and Workstation"
@@ -328,7 +288,7 @@
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 #, fuzzy
 #| msgid "Choose Debian Edu profile"
 msgid "Debian Edu Minimal"
@@ -336,7 +296,7 @@
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu package installation failed"
@@ -344,13 +304,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -360,13 +320,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -375,7 +335,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -383,7 +343,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "

Modified: branches/wheezy/debian-edu-install/debian/po/nb.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/nb.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/nb.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -26,7 +26,7 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-01 13:27+0100\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -46,74 +46,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hovedtjener"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Vandrende arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Tynnklienttjener"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Frittstående"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profil(er) som skal anvendes på denne maskinen:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -128,44 +115,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hovedtjener: satt av for Debian Edus tjener.  Den inkluderer ikke\n"
-"                grafisk brukergrensesnitt. Det skal bare være en slik\n"
-"                tjener på et Debian Edu-nettverk\n"
-" - Arbeidsstasjon: for normale maskiner på Debian Edu-nettet.\n"
-" - Vandrende arbeidsstasjon: for enbrukermaskiner på Debian \n"
-"                Edu-nettet som av og til reiser utenfor nettet.\n"
-" - Tynnklienttjener:\n"
-"                inkluderer «Arbeidsstasjon» og krever to nettkort\n"
-" - Frittstående: for maskiner som er ment å brukes utenfor Debian\n"
-"                Edu-nettverket.  Det inkluderer grafisk bruker-\n"
-"                grensesnitt og er i konflikt med andre profiler."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -190,13 +139,13 @@
 # "                læring for barn\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profilen «Frittstående» kan ikke brukes sammen med andre profiler"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -208,13 +157,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Frittstående installasjon er delvis manuell"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -231,15 +180,15 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr ""
 "Er du sikker på at du vil bruke det automatiske partisjoneringsverktøyet?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -255,14 +204,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Delta i pakkebrukskartleggingen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -276,7 +225,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -288,7 +237,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -299,60 +248,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu hovedtjener"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu tynnklienttjener"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu arbeidsstasjon"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu hovedtjener og tynnklient-tjener"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu hovedtjener og arbeidsstasjon"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu minimal"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "feil under innstallasjonen av Debian-Edu pakken"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installasjonen av påkrevde pakker feilet"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -367,13 +316,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Tilgjengelig diskplass er for liten.  Avbryt installasjonen?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -385,7 +334,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -396,7 +345,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -430,3 +379,30 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Vurder om de skal rapporteres til utviklerne av Debian Edu"
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hovedtjener: satt av for Debian Edus tjener.  Den inkluderer ikke\n"
+#~ "                grafisk brukergrensesnitt. Det skal bare være en slik\n"
+#~ "                tjener på et Debian Edu-nettverk\n"
+#~ " - Arbeidsstasjon: for normale maskiner på Debian Edu-nettet.\n"
+#~ " - Vandrende arbeidsstasjon: for enbrukermaskiner på Debian \n"
+#~ "                Edu-nettet som av og til reiser utenfor nettet.\n"
+#~ " - Tynnklienttjener:\n"
+#~ "                inkluderer «Arbeidsstasjon» og krever to nettkort\n"
+#~ " - Frittstående: for maskiner som er ment å brukes utenfor Debian\n"
+#~ "                Edu-nettverket.  Det inkluderer grafisk bruker-\n"
+#~ "                grensesnitt og er i konflikt med andre profiler."

Modified: branches/wheezy/debian-edu-install/debian/po/nl.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/nl.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/nl.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.520\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-01-06 15:12+0100\n"
 "Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -26,75 +26,62 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hoofdserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Werkstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Zwervend werkstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Thin-clientserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Standalone"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimaal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Welke profielen wilt u op deze machine toepassen?"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "De profielen bepalen hoe de machine out-of-the-box gebruikt kan worden:"
 
 #. 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"
@@ -109,46 +96,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hoofdserver: Voorbehouden aan de Debian Edu-server. Deze bevat\n"
-"                geen enkele grafische gebruikersinterface (GUI).\n"
-"                Er is normaliter slechts één zo'n server in een\n"
-"                Debian Edu-netwerk.\n"
-" - Werkstation: Voor normale machines in het Debian Edu-netwerk.\n"
-" - Zwervend werkstation:\n"
-"                Voor machines met één gebruiker die soms ook buiten\n"
-"                het netwerk worden gebruikt.\n"
-" - Thin-clientserver:\n"
-"                Bevat 'Werkstation' en vereist twee netwerkkaarten.\n"
-" - Standalone:  Voor machines die buiten het Debian Edu-netwerk\n"
-"                worden gebruikt. Deze bevat een GUI en conflicteert\n"
-"                met de andere profielen."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimaal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -171,14 +118,14 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 "Het Standalone-profiel kan niet met andere profielen gecombineerd worden."
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -191,13 +138,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Installatie van het Standalone-profiel is niet volledig automatisch"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -214,14 +161,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Weet u zeker dat u de automatische schijfindeling wilt gebruiken?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -238,14 +185,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Wilt u meewerken aan het onderzoek naar het gebruik van pakketten?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -259,7 +206,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -271,7 +218,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -282,60 +229,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu hoofdserver"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu thin-clientserver"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu werkstation"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu hoofdserver en thin-clientserver"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu hoofdserver en werkstation"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu minimaal"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu pakketinstallatie is mislukt"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installatie van de vereiste pakketten is mislukt"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -349,13 +296,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Er is te weinig vrije schijfruimte. De installatie annuleren?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -367,7 +314,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -378,7 +325,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -414,3 +361,32 @@
 msgstr ""
 "We stellen het op prijs als u deze rapporteert aan de ontwikkelaars van "
 "Debian Edu."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hoofdserver: Voorbehouden aan de Debian Edu-server. Deze bevat\n"
+#~ "                geen enkele grafische gebruikersinterface (GUI).\n"
+#~ "                Er is normaliter slechts één zo'n server in een\n"
+#~ "                Debian Edu-netwerk.\n"
+#~ " - Werkstation: Voor normale machines in het Debian Edu-netwerk.\n"
+#~ " - Zwervend werkstation:\n"
+#~ "                Voor machines met één gebruiker die soms ook buiten\n"
+#~ "                het netwerk worden gebruikt.\n"
+#~ " - Thin-clientserver:\n"
+#~ "                Bevat 'Werkstation' en vereist twee netwerkkaarten.\n"
+#~ " - Standalone:  Voor machines die buiten het Debian Edu-netwerk\n"
+#~ "                worden gebruikt. Deze bevat een GUI en conflicteert\n"
+#~ "                met de andere profielen."

Modified: branches/wheezy/debian-edu-install/debian/po/nn.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/nn.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/nn.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-10-07 23:17+0200\n"
 "Last-Translator: Jan Roar Roed <janroed at gmail.com>\n"
 "Language-Team: American English <i18n-nb at lister.ping.uio.no>\n"
@@ -43,74 +43,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hovudtenar"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Vandrande Arbeidsstasjon"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Tynnklient-tenar"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Frittståande"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Vel kva for profilar du vil bruka på denne maskina:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr "Profila 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"
@@ -125,46 +112,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hovudtenar:  sat av for Debian Edus tenar. Han inkluderer ikkje\n"
-"                eit grafisk brukargrensesnitt. Det skal berre vere ein "
-"slik \n"
-"                tenar i eit Debian Edu-nettverk\n"
-" - Arbeidsstasjon: for normale maskinar på Debian Edu-netta.\n"
-" -Vandrande arbeidsstasjon: datamaskinar på Debian-Edu-netta\n"
-"                som nokon gonger brukast utanfor nettverket. Desse har "
-"gjerne ein brukar\n"
-" - Tynnklienttener:\n"
-"                inkluderar «Arbeidsstasjon» og krev to nettkort\n"
-" - Frittståande: for maskiner som er meint å bli brukt utanfor Debian\n"
-"                Edu-nettverka.  Dei inkluderer grafisk brukar-\n"
-"                grensesnitt, og kjem i konflikt med andre profilar."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -187,13 +134,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profilen «Frittståande» kan berre brukast åleine"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -205,13 +152,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Frittståande installasjon er delvis manuell"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -227,14 +174,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Vil du verkeleg bruke det automatiske partisjoneringsverktøyet?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -251,14 +198,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Delta i kartlegginga av pakkebruken i Debian?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -272,7 +219,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -284,7 +231,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -295,60 +242,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian-Edu Hovudtenar"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian-Edu Tynnklienttenar"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu Arbeidsstasjon"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian-Edu Hovudtenar og Tynnklienttenar"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian-Edu Hovudtenar og Arbeidsstasjon"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu minimal profil"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Innstallasjonen av Debian Edu pakken feila"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installasjonen av påkrevde pakker feila"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -362,13 +309,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -377,7 +324,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -385,7 +332,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -417,6 +364,35 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Du må gjerne rapportere dei til utviklarane av Debian Edu."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hovudtenar:  sat av for Debian Edus tenar. Han inkluderer ikkje\n"
+#~ "                eit grafisk brukargrensesnitt. Det skal berre vere ein "
+#~ "slik \n"
+#~ "                tenar i eit Debian Edu-nettverk\n"
+#~ " - Arbeidsstasjon: for normale maskinar på Debian Edu-netta.\n"
+#~ " -Vandrande arbeidsstasjon: datamaskinar på Debian-Edu-netta\n"
+#~ "                som nokon gonger brukast utanfor nettverket. Desse har "
+#~ "gjerne ein brukar\n"
+#~ " - Tynnklienttener:\n"
+#~ "                inkluderar «Arbeidsstasjon» og krev to nettkort\n"
+#~ " - Frittståande: for maskiner som er meint å bli brukt utanfor Debian\n"
+#~ "                Edu-nettverka.  Dei inkluderer grafisk brukar-\n"
+#~ "                grensesnitt, og kjem i konflikt med andre profilar."
+
 #, fuzzy
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Noko gjekk gale under installasjonen av Debian Edu."

Modified: branches/wheezy/debian-edu-install/debian/po/pl.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/pl.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/pl.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -56,7 +56,7 @@
 msgstr ""
 "Project-Id-Version: popularity-contest\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2007-11-30 11:43+0100\n"
 "Last-Translator: Bartosz Fenski <fenio at debian.org>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -84,11 +84,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Main Server"
@@ -96,21 +93,15 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Stacja robocza"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Roaming Workstation"
@@ -118,11 +109,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Thin Client Server"
@@ -130,35 +118,34 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Samodzielna stacja"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 #, fuzzy
 msgid "Profile(s) to apply to this machine:"
 msgstr "Proszę wybrać profile, które pasują do tego komputera."
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -173,33 +160,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -207,14 +167,14 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profil Samodzielnej stacji nie może być użyty z innym profilem."
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -226,14 +186,14 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 #, fuzzy
 msgid "Standalone installation is partly manual"
 msgstr "Instalacja Samodzielnej stacji jest częściowo ręczna."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -249,14 +209,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Naprawdę użyć automatycznego partycjonowania?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -272,14 +232,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Chcesz wziąć udział w konkursie na najpopularniejszy pakiet?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -293,7 +253,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -306,7 +266,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -317,7 +277,7 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Debian Edu Main Server"
@@ -326,7 +286,7 @@
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Debian Edu Thin Client Server"
@@ -335,7 +295,7 @@
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Workstation"
@@ -344,7 +304,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 #, fuzzy
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr ""
@@ -354,7 +314,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Main Server and Workstation"
@@ -363,7 +323,7 @@
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 #, fuzzy
 #| msgid "Choose Debian Edu profile"
 msgid "Debian Edu Minimal"
@@ -371,7 +331,7 @@
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu package installation failed"
@@ -379,13 +339,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -395,13 +355,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -410,7 +370,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -418,7 +378,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "

Modified: branches/wheezy/debian-edu-install/debian/po/pt.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/pt.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/pt.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: Debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-26 14:00+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -37,75 +37,62 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Servidor Principal"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Estação de Trabalho Roaming"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Servidor de Thin Client"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Individual"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Mínimo"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Perfil(s) a aplicar a esta máquina:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 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:"
 
 #. 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,47 +107,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Servidor Principal: reservado para o servidor Debian Edu. Não inclui\n"
-"\t\t qualquer GUI (interface gráfico). Deve existir apenas \n"
-"\t\t um desses servidores numa rede Debian Edu.\n"
-" - Estação de Trabalho: para máquinas normais na rede Debian Edu.\n"
-" - Estação de Trabalho Roaming: para utilizadores de máquinas com apenas\n"
-"\t\t um utilizador na rede Debian Edu que por vezes viajam fora\n"
-"\t\t da rede.\n"
-" - Servidor de Thin Client: inclui 'Estação de Trabalho' e necessita de "
-"duas\n"
-"\t\t placas de rede.\n"
-" - Individual:\t para máquinas que se destinam a ser utilizadas fora da "
-"rede\n"
-"\t\t Debian Edu. Inclui um interface gráfico e opõe-se aos\n"
-"\t\t outros perfis."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Mínimo"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -185,13 +131,13 @@
 # "\t\tem crianças.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "O perfil 'Individual' não pode ser utilizado com outros perfis"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -203,13 +149,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "A instalação 'Individual' é parcialmente manual"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -226,14 +172,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Deseja realmente usar a ferramenta de particionamento automático?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -250,14 +196,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Participar no inquérito de utilização de pacotes?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -271,7 +217,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -283,7 +229,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -294,60 +240,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Servidor Principal Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Servidor Thin Client Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Estação de Trabalho Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Servidor Principal Debian Edu e Servidor de Thin Client"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Servidor Principal Debian Edu e Estação de Trabalho"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Mínimo"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "A instalação do pacote Debian Edu falhou"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "A instalação dos pacotes necessários falhou"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -361,14 +307,14 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../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?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -380,7 +326,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -391,7 +337,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -426,6 +372,36 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Considere relatá-los aos criadores do Debian Edu."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Servidor Principal: reservado para o servidor Debian Edu. Não inclui\n"
+#~ "\t\t qualquer GUI (interface gráfico). Deve existir apenas \n"
+#~ "\t\t um desses servidores numa rede Debian Edu.\n"
+#~ " - Estação de Trabalho: para máquinas normais na rede Debian Edu.\n"
+#~ " - Estação de Trabalho Roaming: para utilizadores de máquinas com apenas\n"
+#~ "\t\t um utilizador na rede Debian Edu que por vezes viajam fora\n"
+#~ "\t\t da rede.\n"
+#~ " - Servidor de Thin Client: inclui 'Estação de Trabalho' e necessita de "
+#~ "duas\n"
+#~ "\t\t placas de rede.\n"
+#~ " - Individual:\t para máquinas que se destinam a ser utilizadas fora da "
+#~ "rede\n"
+#~ "\t\t Debian Edu. Inclui um interface gráfico e opõe-se aos\n"
+#~ "\t\t outros perfis."
+
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Algo correu mal durante o processo de instalação de Debian Edu"
 

Modified: branches/wheezy/debian-edu-install/debian/po/pt_BR.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/pt_BR.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/pt_BR.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -58,7 +58,7 @@
 msgstr ""
 "Project-Id-Version: popularity_contest\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2006-09-18 03:28-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -77,11 +77,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Main Server"
@@ -89,21 +86,15 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Estação de Trabalho"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Roaming Workstation"
@@ -111,11 +102,8 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Thin Client Server"
@@ -123,35 +111,34 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Autônomo"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr ""
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 #, fuzzy
 msgid "Profile(s) to apply to this machine:"
 msgstr "Por favor, selecione qual o perfil a ser aplicado para esta máquina."
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -166,33 +153,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -200,13 +160,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -215,14 +175,14 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 #, fuzzy
 msgid "Standalone installation is partly manual"
 msgstr "Parte da instalação 'Autônomo' é realizada manualmente."
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 #, fuzzy
 msgid ""
 "The Standalone install is currently not as automatic as the other profiles, "
@@ -240,14 +200,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Realmente utilizar a ferramenta de particionamento automático ?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -264,14 +224,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Participar do concurso de utilização de pacotes ?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -285,7 +245,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -298,7 +258,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -309,7 +269,7 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 #, fuzzy
 #| msgid "Main-Server"
 msgid "Debian Edu Main Server"
@@ -318,7 +278,7 @@
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 #, fuzzy
 #| msgid "Thin-Client-Server"
 msgid "Debian Edu Thin Client Server"
@@ -327,7 +287,7 @@
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Workstation"
@@ -336,7 +296,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 #, fuzzy
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr ""
@@ -346,7 +306,7 @@
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu Main Server and Workstation"
@@ -355,7 +315,7 @@
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 #, fuzzy
 #| msgid "Choose Debian Edu profile"
 msgid "Debian Edu Minimal"
@@ -363,7 +323,7 @@
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 #, fuzzy
 #| msgid "Workstation"
 msgid "Debian Edu package installation failed"
@@ -371,13 +331,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -387,13 +347,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -402,7 +362,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -410,7 +370,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "

Modified: branches/wheezy/debian-edu-install/debian/po/ru.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/ru.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/ru.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.522~svn75033\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-25 15:32+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -30,69 +30,55 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Основной сервер"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Рабочая станция"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Передвижная рабочая станция"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Сервер тонких клиентов"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Автономная машина"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Минимальная система"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Применяемые к этой машине профили:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr ""
 "Профили, определяющие как будет использоваться машина сразу после завершения "
@@ -100,6 +86,7 @@
 
 #. 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"
@@ -114,45 +101,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Основной сервер: используется для сервера Debian Edu. Не содержит\n"
-"                графического интерфейса (GUI). Должен быть настроен\n"
-"                только на одном сервере в сети Debian Edu.\n"
-" - Рабочая станция: для обычных машин в сети Debian Edu.\n"
-" - Передвижная рабочая станция: для отдельных пользовательских\n"
-"                машин из сети Debian Edu, которые иногда бывают вне сети.\n"
-" - Сервер тонких клиентов:\n"
-"                Включает профиль 'Рабочая станция' и требует две\n"
-"                сетевые карты.\n"
-" - Автономная машина: для машин, работающих вне сети Debian Edu.\n"
-"                Имеется графический интерфейс, конфликтует\n"
-"                с другими профилями."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Минимальная система"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -177,7 +125,7 @@
 # "                учёбе детей.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 "Профиль 'Автономная машина' не может использоваться одновременно с другими "
@@ -185,7 +133,7 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -197,13 +145,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Установка профиля 'Автономная машина' частично выполняется вручную"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -220,14 +168,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Действительно использовать утилиту автоматической разметки?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -243,14 +191,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Участвовать в изучении используемых пакетов?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -263,7 +211,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -275,7 +223,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -286,60 +234,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Основной сервер Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Сервер тонких клиентов Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Рабочая станция Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Основной сервер и Сервер тонких клиентов Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Основной сервер и Рабочая станция Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Минимальный Debian Edu"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Не удалось установить пакет Debian Edu"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Не удалось установить необходимые пакеты"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -353,13 +301,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Не хватает места на диске. Прервать установку?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -370,7 +318,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -380,7 +328,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -414,3 +362,32 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Рассмотрите возможность сообщить о них разработчикам Debian Edu."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Основной сервер: используется для сервера Debian Edu. Не содержит\n"
+#~ "                графического интерфейса (GUI). Должен быть настроен\n"
+#~ "                только на одном сервере в сети Debian Edu.\n"
+#~ " - Рабочая станция: для обычных машин в сети Debian Edu.\n"
+#~ " - Передвижная рабочая станция: для отдельных пользовательских\n"
+#~ "                машин из сети Debian Edu, которые иногда бывают вне "
+#~ "сети.\n"
+#~ " - Сервер тонких клиентов:\n"
+#~ "                Включает профиль 'Рабочая станция' и требует две\n"
+#~ "                сетевые карты.\n"
+#~ " - Автономная машина: для машин, работающих вне сети Debian Edu.\n"
+#~ "                Имеется графический интерфейс, конфликтует\n"
+#~ "                с другими профилями."

Modified: branches/wheezy/debian-edu-install/debian/po/se.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/se.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/se.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: se.po\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-10-12 21:18+0200\n"
 "Last-Translator: Børre Gaup <boerre at skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme at lister.ping.uio.no>\n"
@@ -35,74 +35,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Váldobálvá"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Bargostašuvdna"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Sirddihahtti bargostašuvdna"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Asehisklieantabálvá"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Oktonas mašiidna"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimála"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Vállje guđe profiilla dán mašiinnas galgá leat"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 msgstr "Profiillat mearridit man láhkai sáhttá geavahit mašiinna álgoálggus:"
 
 #. 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"
@@ -117,46 +104,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Váldobálvá: sisttisdoallá Debian Edu-bálvvá. Dás ii leat makkárge\n"
-"                GUI (Gráfalaš geavahanlakta). Berre dušše\n"
-"                leat okta dákkár bálvá Debian Edu-fierpmádagas.\n"
-" - Bargostašuvdna: dábálaš mašiinnat Debian Edu-fierpmádagas.\n"
-" - Sirddihahtti bargostašuvdna: mašiinnaide mas leat oktonas geavaheaddjit\n"
-"                Debian Edu-fierpmádagas mat muhtimin eai leat laktašuvvon "
-"dasa.\n"
-" - Asehisklieantabálvá:\n"
-"                sisttisdoallá «Bargostašuvdna» ja gáibida guokte\n"
-"                fierpmádatgoartta.\n"
-" - Oktonas: mašiinnaide mat geavahuvvot Debian Edu-fierpmádagaid\n"
-"                olggobealde. Sisttisdoallá GUI ja ii leat vejolaš geavahit\n"
-"                eará profiillaiguin."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimála"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -179,13 +126,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Ii leat vejolaš geavahit oktonas profiilla eará profiillaiguin"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -197,13 +144,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Oktonas profiilla sajáiduhttin ii leat áibbas automatiserejuvvon"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -220,14 +167,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Háliidatgo duođas geavahit automáhtalaš partišunerenreaiddu?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -243,14 +190,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Háliidatgo searvat páhkkageavaheami iskosii?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -263,7 +210,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -274,7 +221,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -285,60 +232,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu-váldobálvá"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu-asehisklieantabálvá"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu-bargostašuvdna"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu-váldo- ja -asehisklieantabálvá"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu-váldobálvá ja -bargostašuvdna"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu-minimála"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu-páhkkasajáiduhttin filtii"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Filtii sajáiduhttit muhtin gáibiduvvon páhkaid"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -353,13 +300,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -368,7 +315,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -376,7 +323,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -410,6 +357,37 @@
 "Livččii buorre jus dieđihivččet dáid meattáhusaid birra Debian Edu-"
 "ovdánahttiide."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Váldobálvá: sisttisdoallá Debian Edu-bálvvá. Dás ii leat makkárge\n"
+#~ "                GUI (Gráfalaš geavahanlakta). Berre dušše\n"
+#~ "                leat okta dákkár bálvá Debian Edu-fierpmádagas.\n"
+#~ " - Bargostašuvdna: dábálaš mašiinnat Debian Edu-fierpmádagas.\n"
+#~ " - Sirddihahtti bargostašuvdna: mašiinnaide mas leat oktonas "
+#~ "geavaheaddjit\n"
+#~ "                Debian Edu-fierpmádagas mat muhtimin eai leat laktašuvvon "
+#~ "dasa.\n"
+#~ " - Asehisklieantabálvá:\n"
+#~ "                sisttisdoallá «Bargostašuvdna» ja gáibida guokte\n"
+#~ "                fierpmádatgoartta.\n"
+#~ " - Oktonas: mašiinnaide mat geavahuvvot Debian Edu-fierpmádagaid\n"
+#~ "                olggobealde. Sisttisdoallá GUI ja ii leat vejolaš "
+#~ "geavahit\n"
+#~ "                eará profiillaiguin."
+
 #, fuzzy
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Miinu fiiltii Debian Edu sajáiduhtedettiin."

Modified: branches/wheezy/debian-edu-install/debian/po/sk.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/sk.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/sk.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-24 11:55+0100\n"
 "Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -26,75 +26,62 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Hlavný server"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Pracovná stanica"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Potulná pracovná stanica"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Server tenkých klientov"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Samostatný"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimálny"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Ktoré profily aplikovať na tento počítač:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 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:"
 
 #. 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"
@@ -109,45 +96,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Hlavný server: vyhradené pre server Debian Edu. Neobsahuje\n"
-"                Žiadne grafické používateľské rozhranie. Na sieti\n"
-"                Debian Edu by mal existovať iba jeden takýto server.\n"
-" - Pracovná stanica: bežné stanice na sieti Debian Edu.\n"
-" - Potulná pracovná stanica: pre jednopoužívateľské počítače\n"
-"                v Debian Edu.\n"
-" - Server tenkých klientov:\n"
-"                Obsahuje „Pracovnú stanica“ a vyžaduje dve sieťové\n"
-"                karty.\n"
-" - Samostatný:  pre počítače, ktoré sa majú používať mimo siete Debian\n"
-"                Edu. Obsahuje grafické používateľské rozhranie a je\n"
-"                v konflikte s ostatnými profilmi."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimálny"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -170,13 +118,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Samostatný profil nemožno použiť zároveň s inými profilmi"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -188,13 +136,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "„Samostatná“ inštalácia prebieha čiastočne manuálne"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -210,14 +158,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Skutočne použiť automatický nástroj na rozdeľovanie?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -234,14 +182,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Zúčastniť sa prieskumu používanosti balíkov?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -254,7 +202,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -266,7 +214,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -277,60 +225,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Hlavný server Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Server tenkých klientov Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Pracovná stanica Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Hlavný server a Server tenkých klientov Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Hlavný server a Pracovná stanica Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Minimálny Debian Edu"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Inštalácia balíka Debian Edu zlyhala"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Inštalácia požadovaných balíkov zlyhala"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -344,13 +292,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Dostupné miesto na disku je príliš malé. Zrušiť inštaláciu?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -362,7 +310,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -372,7 +320,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -406,3 +354,31 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Zvážte ich nahlásenie vývojárom Debian Edu."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Hlavný server: vyhradené pre server Debian Edu. Neobsahuje\n"
+#~ "                Žiadne grafické používateľské rozhranie. Na sieti\n"
+#~ "                Debian Edu by mal existovať iba jeden takýto server.\n"
+#~ " - Pracovná stanica: bežné stanice na sieti Debian Edu.\n"
+#~ " - Potulná pracovná stanica: pre jednopoužívateľské počítače\n"
+#~ "                v Debian Edu.\n"
+#~ " - Server tenkých klientov:\n"
+#~ "                Obsahuje „Pracovnú stanica“ a vyžaduje dve sieťové\n"
+#~ "                karty.\n"
+#~ " - Samostatný:  pre počítače, ktoré sa majú používať mimo siete Debian\n"
+#~ "                Edu. Obsahuje grafické používateľské rozhranie a je\n"
+#~ "                v konflikte s ostatnými profilmi."

Modified: branches/wheezy/debian-edu-install/debian/po/sv.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/sv.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/sv.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-26 16:47+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -30,74 +30,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Huvudserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Arbetsstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Flyttbar Arbetsstation"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Tunnklientserver"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Fristående"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Minimal"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Profil(er) att tillämpa på denna maskin:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -112,46 +99,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Huvudserver: reserverad för Debian Edu-servern. Den inkluderar\n"
-"                inte något grafiskt användargränssnitt. Det bör\n"
-"                endast finnas en sådan server på ett Debian Edu-\n"
-"                nätverk.\n"
-" - Arbetsstation: för vanliga maskiner på Debian Edu-nätverket.\n"
-" - Flyttbar Arbetsstation: för maskiner som används även utanför\n"
-"                Debian Edu-nätverket.\n"
-" - Tunnklientserver: inkluderar \"Arbetsstation\" och kräver två\n"
-"                nätverkskort.\n"
-" - Fristående:  för maskiner som är tänkta att användas utanför\n"
-"                Debian Edu-nätverket. Den inkluderar ett grafiskt\n"
-"                användargränssnitt och kan inte användas med andra\n"
-"                profiler."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Minimal"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -175,13 +122,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Profilen Fristående kan inte användas tillsammans med andra profiler"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -193,13 +140,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Fristående installation är delvis manuell"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -216,14 +163,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Verkligen använda det automatiska partitioneringsverktyget?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -240,14 +187,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Delta i en kartläggning om användandet av Debian-paket?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -261,7 +208,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -273,7 +220,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -284,60 +231,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu Huvudserver"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu Tunnklientserver"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Arbetsstation för Debian Edu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu Huvudserver och Tunnklient-server"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu Huvudserver och Arbetsstation"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Minimal Debian Edu"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Installationen av paketet Debian Edu misslyckades"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Installation av paket som måste finnas misslyckades"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -351,13 +298,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Tillgängligt diskutrymme är för litet. Ska installationen avbrytas?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -369,7 +316,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -380,7 +327,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -415,6 +362,35 @@
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Rapportera gärna in dem till Debian Edu-utvecklarna."
 
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Huvudserver: reserverad för Debian Edu-servern. Den inkluderar\n"
+#~ "                inte något grafiskt användargränssnitt. Det bör\n"
+#~ "                endast finnas en sådan server på ett Debian Edu-\n"
+#~ "                nätverk.\n"
+#~ " - Arbetsstation: för vanliga maskiner på Debian Edu-nätverket.\n"
+#~ " - Flyttbar Arbetsstation: för maskiner som används även utanför\n"
+#~ "                Debian Edu-nätverket.\n"
+#~ " - Tunnklientserver: inkluderar \"Arbetsstation\" och kräver två\n"
+#~ "                nätverkskort.\n"
+#~ " - Fristående:  för maskiner som är tänkta att användas utanför\n"
+#~ "                Debian Edu-nätverket. Den inkluderar ett grafiskt\n"
+#~ "                användargränssnitt och kan inte användas med andra\n"
+#~ "                profiler."
+
 #, fuzzy
 #~ msgid "Something went wrong during the Debian Edu install process"
 #~ msgstr "Någonting gick snett under installationen av Debian Edu."

Modified: branches/wheezy/debian-edu-install/debian/po/templates.pot
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/templates.pot	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/templates.pot	2013-01-31 21:25:17 UTC (rev 78927)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -26,74 +26,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr ""
 
 #. Type: multiselect
 #. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Standalone"
+msgstr ""
+
 #. Type: multiselect
 #. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Standalone"
+msgid "Minimal"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -108,33 +95,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -142,13 +102,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -157,13 +117,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -175,14 +135,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -194,14 +154,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -211,7 +171,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -220,7 +180,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -229,60 +189,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr ""
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr ""
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -292,13 +252,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -307,7 +267,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -315,7 +275,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "

Modified: branches/wheezy/debian-edu-install/debian/po/tr.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/tr.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/tr.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-29 16:59+0200\n"
 "Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
 "Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -26,75 +26,62 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Ana Sunucu"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "İş-istasyonu"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Gezici İş İstasyonu"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Hafif İstemci Sunucusu"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Kendibaşına"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Asgari"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "Bu makineye uygulanacak profil(ler):"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 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:"
 
 #. 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"
@@ -109,43 +96,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - Ana Sunucu:   Debian Edu sunucusuna mahsustur. Herhangi bir GUI\n"
-"                 (Grafik Kullanıcı Arabirimi) içermez. Bir Debian Edu\n"
-"                 ağında yalnızca bir adet Ana-sunucu olmalıdır.\n"
-" - İş istasyonu: Debian Edu ağındaki normal makineler içindir.\n"
-" - Gezici İş İstasyonu: Debian Edu ağındaki, arada sırada seyahate\n"
-"                 çıkan tek kullanıcılı makineler içindir.\n"
-" - Hafif İstemci-Sunucusu:\n"
-"                 'İş istasyonu'nu kapsar ve iki ağ kartı gerektirir.\n"
-" - Kendibaşına:  Debian Edu ağının dışında kullanılacak makineler\n"
-"                 içindir. GUI içerir ve diğer profillerle çakışır."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Asgari"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -168,13 +118,13 @@
 # "                 içeren bir çeşididir.\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Kendibaşına profili diğer profillerle kullanılamaz"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -186,13 +136,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Kendibaşına kurulumu kısmen elle yürütülür"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -209,14 +159,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Otomatik bölümleme aracını kullanmak istediğinizden emin misiniz?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -233,14 +183,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Paket kullanım anketine katılmak ister misiniz?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -254,7 +204,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -266,7 +216,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -277,60 +227,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu Ana Sunucu"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu Hafif İstemci Sunucusu"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu İş-istasyonu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu Ana Sunucu ve Hafif İstemci Sunucusu"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu Ana Sunucu ve İş İstasyonu"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu Asgari"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu paket kurulumu başarısız oldu"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Gerekli paketler kurulamadı"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -344,13 +294,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "Yeteri kadar boş disk alanı yok.  Kurulum iptal edilsin mi?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -362,7 +312,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -372,7 +322,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -406,3 +356,29 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Bu sorunları Debian Edu geliştiricilerine bildirmeyi düşünün."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - Ana Sunucu:   Debian Edu sunucusuna mahsustur. Herhangi bir GUI\n"
+#~ "                 (Grafik Kullanıcı Arabirimi) içermez. Bir Debian Edu\n"
+#~ "                 ağında yalnızca bir adet Ana-sunucu olmalıdır.\n"
+#~ " - İş istasyonu: Debian Edu ağındaki normal makineler içindir.\n"
+#~ " - Gezici İş İstasyonu: Debian Edu ağındaki, arada sırada seyahate\n"
+#~ "                 çıkan tek kullanıcılı makineler içindir.\n"
+#~ " - Hafif İstemci-Sunucusu:\n"
+#~ "                 'İş istasyonu'nu kapsar ve iki ağ kartı gerektirir.\n"
+#~ " - Kendibaşına:  Debian Edu ağının dışında kullanılacak makineler\n"
+#~ "                 içindir. GUI içerir ve diğer profillerle çakışır."

Modified: branches/wheezy/debian-edu-install/debian/po/vi.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/vi.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/vi.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 1.517~svn68851\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2010-10-08 16:52+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -26,74 +26,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "Máy phục vụ chính"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "Máy trạm"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "Máy trạm đi lang thang"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "Máy phục vụ khách mảnh"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "Độc lập"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "Nhỏ gọn"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "(Các) hồ sơ cần áp dụng vào máy này:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -108,44 +95,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" • Máy phục vụ chính\tdành riêng cho máy phục vụ Giáo dục Debian.\n"
-"\t\t\t\tKhông cung cấp giao diện người dùng đồ họa (GUI).\n"
-"\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"
-"\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"
-" • Độc lập\t\tcho máy nên sử dụng bên ngoài mạng Giáo dục Debian.\n"
-"\t\t\t\tBao gồm một GUI, và xung đột với các hồ sơ khác."
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "Nhỏ gọn"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -166,13 +115,13 @@
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "Hồ sơ « Độc lập » không thể dùng được với hồ sơ khác"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -183,13 +132,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "Cài đặt « Độc lập » thì thủ công một phần"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -205,14 +154,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "Thực sự dùng công cụ tự động phân vùng không?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -229,14 +178,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "Tham gia điều tra gói phổ biến không?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -250,7 +199,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -262,7 +211,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -273,60 +222,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Máy phục vụ chính Giáo dục Debian"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Máy phục vụ khách mảnh Giáo dục Debian"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Máy trạm Giáo dục Debian"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client 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
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Máy phục vụ chính và máy trạm của Giáo dục Debian"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Giao dục Debian nhỏ gọn"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Lỗi cài đặt gói Giáo dục Debian"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "Lỗi cài đặt gói cần thiết"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -340,13 +289,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The available disk space is too small for the selected profiles. Please "
 "choose whether you want to abort the installation or continue without "
@@ -355,7 +304,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -363,7 +312,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -394,3 +343,31 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "Hãy thông báo cho các nhà phát triển Giao dục Debian."
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " • Máy phục vụ chính\tdành riêng cho máy phục vụ Giáo dục Debian.\n"
+#~ "\t\t\t\tKhông cung cấp giao diện người dùng đồ họa (GUI).\n"
+#~ "\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"
+#~ "\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"
+#~ " • Độc lập\t\tcho máy nên sử dụng bên ngoài mạng Giáo dục Debian.\n"
+#~ "\t\t\t\tBao gồm một GUI, và xung đột với các hồ sơ khác."

Modified: branches/wheezy/debian-edu-install/debian/po/zh_CN.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/zh_CN.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/zh_CN.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: debian-edu-install 10n\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2012-02-14 20:54+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji at gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
@@ -25,74 +25,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "主服务器"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "工作站"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "移动工作站"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "瘦客户机/服务器"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "独立主机"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "最小安装"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "此电脑的安装方式:"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -107,45 +94,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - 主服务器:    专门用于 Debian 教育网的服务器。它不包含任何\n"
-"                图形界面。在一个 Debian 教育网中应该仅仅只有\n"
-"                一台这样的服务器。\n"
-".\n"
-" - 工作站:      用于 Debian 教育网中的普通机器。\n"
-" - 移动工作站:  用于 Debian 教育网的单用户机器,\n"
-"              但有时不在网络中。\n"
-" - 瘦客户机/服务器:\n"
-"                含有“工作站”的功能,但要求有两块网卡。\n"
-".\n"
-" - 独立主机:    用于不在 Debian 教育网中使用的机器。\n"
-"                它含有图形界面,且与其它安装方式冲突。"
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "最小安装"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -171,13 +119,13 @@
 # ".\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "独立主机安装方式不能与其它安装方式同时使用"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -188,13 +136,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "独立主机安装方式需要偶尔手工操作"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -209,14 +157,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "真的要使用自动分区工具吗?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -231,14 +179,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "是否参与软件包使用情况调查?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -250,7 +198,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -261,7 +209,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -270,60 +218,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian 教育网主服务器"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian 教育网瘦客户机/服务器"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian 教育网工作站"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian 教育网主服务器及瘦客户机/服务器"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian 教育网主服务器及工作站"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian 教育网最小化安装"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu 软件包安装失败"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "所需软件包的安装失败"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -336,35 +284,40 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "可用磁盘空间不足。退出安装?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
-msgstr "Debian Edu 安装程序已经执行了某些安装命令。您磁盘中原有内容可能已经被清除。"
+msgstr ""
+"Debian Edu 安装程序已经执行了某些安装命令。您磁盘中原有内容可能已经被清除。"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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
@@ -390,3 +343,31 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "可以考虑将这些错误报告给 Debian Edu 的开发人员。"
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - 主服务器:    专门用于 Debian 教育网的服务器。它不包含任何\n"
+#~ "                图形界面。在一个 Debian 教育网中应该仅仅只有\n"
+#~ "                一台这样的服务器。\n"
+#~ ".\n"
+#~ " - 工作站:      用于 Debian 教育网中的普通机器。\n"
+#~ " - 移动工作站:  用于 Debian 教育网的单用户机器,\n"
+#~ "              但有时不在网络中。\n"
+#~ " - 瘦客户机/服务器:\n"
+#~ "                含有“工作站”的功能,但要求有两块网卡。\n"
+#~ ".\n"
+#~ " - 独立主机:    用于不在 Debian 教育网中使用的机器。\n"
+#~ "                它含有图形界面,且与其它安装方式冲突。"

Modified: branches/wheezy/debian-edu-install/debian/po/zh_TW.po
===================================================================
--- branches/wheezy/debian-edu-install/debian/po/zh_TW.po	2013-01-31 21:23:14 UTC (rev 78926)
+++ branches/wheezy/debian-edu-install/debian/po/zh_TW.po	2013-01-31 21:25:17 UTC (rev 78927)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: debian-edu-install at packages.debian.org\n"
-"POT-Creation-Date: 2012-01-01 13:20+0100\n"
+"POT-Creation-Date: 2013-01-31 22:23+0100\n"
 "PO-Revision-Date: 2011-12-30 18:19+0800\n"
 "Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
 "Language-Team: zh_TW <zh-l10n at lists.linux.org.tw>\n"
@@ -26,74 +26,61 @@
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Main Server"
 msgstr "主伺服器(Main Server)"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Workstation"
 msgstr "工作站(Workstation)"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Roaming Workstation"
 msgstr "漫遊工作站(Workstation)"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Thin Client Server"
 msgstr "終端機伺服器(Thin Client Server)"
 
 #. Type: multiselect
 #. Choices
-#. Type: multiselect
-#. Choices
 #. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
 #: ../debian-edu-profile-udeb.templates:2001
-#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone"
 msgstr "獨立主機(Standalone)"
 
 #. Type: multiselect
-#. Description
+#. Choices
+#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
+#: ../debian-edu-profile-udeb.templates:2001
+msgid "Minimal"
+msgstr "最小安裝"
+
 #. Type: multiselect
 #. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profile(s) to apply to this machine:"
 msgstr "此電腦的安裝模式(profiles):"
 
 #. Type: multiselect
 #. Description
-#. Type: multiselect
-#. Description
 #: ../debian-edu-profile-udeb.templates:2002
-#: ../debian-edu-profile-udeb.templates:3002
 msgid "Profiles determine how the machine can be used out-of-the-box:"
 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"
@@ -108,44 +95,6 @@
 "                cards.\n"
 " - Standalone:  for machines meant to be used outside the Debian Edu\n"
 "                network. It includes a GUI and conflicts with other\n"
-"                profiles."
-msgstr ""
-" - 主伺服器:    保留給 Debian Edu 伺服器。不包含任何圖形介面。且\n"
-"                 一個 Debian Edu 網路中,只應該有一台這樣的伺服器。\n"
-".\n"
-" - 工作站:      在 Debian Edu 網路中的一般機器。\n"
-".\n"
-" - 漫遊工作站: 有時會漫遊到別的網路的個人電腦。\n"
-".\n"
-" - 終端機伺服器:包含“工作站”的功能,到要求有兩張網卡。\n"
-".\n"
-" - 獨立主機:    用於 Debian Edu 之外的機器。\n"
-"                 它有圖形介面,但與其他安裝模式衝突。 "
-
-#. Type: multiselect
-#. Choices
-#. __Choices: Main-Server, Workstation, Roaming-Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-#: ../debian-edu-profile-udeb.templates:3001
-msgid "Minimal"
-msgstr "最小安裝"
-
-#. Type: multiselect
-#. Description
-#. # Translators, do not translate "Sugar"
-#: ../debian-edu-profile-udeb.templates:3002
-msgid ""
-" - Main Server: reserved for the Debian Edu server. It does not\n"
-"                include any GUI (Graphical User Interface). There\n"
-"                should only be one such server on a Debian Edu\n"
-"                network.\n"
-" - 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"
-"                includes 'Workstation' and requires two network\n"
-"                cards.\n"
-" - Standalone:  for machines meant to be used outside the Debian Edu\n"
-"                network. It includes a GUI and conflicts with other\n"
 "                profiles.\n"
 " - Minimal:     fully integrated into the Debian Edu network but\n"
 "                contains only a basic system without any GUI."
@@ -164,13 +113,13 @@
 # "                 促進孩童在共享與合作的環境中學習。\n"
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid "Standalone profile cannot be used with other profiles"
 msgstr "獨立主機的安裝模式無法與其他安裝模式同時使用。"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:4001
+#: ../debian-edu-profile-udeb.templates:3001
 msgid ""
 "The Standalone profile cannot be installed together with any other profile "
 "on the same machine. Please either only choose Standalone or any other "
@@ -181,13 +130,13 @@
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../debian-edu-profile-udeb.templates:4001
 msgid "Standalone installation is partly manual"
 msgstr "獨立主機的安裝模式需要部份手動操作。"
 
 #. Type: note
 #. Description
-#: ../debian-edu-profile-udeb.templates:5001
+#: ../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-"
@@ -202,14 +151,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:6001
 #: ../debian-edu-profile-udeb.templates:7001
-#: ../debian-edu-profile-udeb.templates:8001
 msgid "Really use the automatic partitioning tool?"
 msgstr "確定要啟用自動磁碟分割工具?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:8001
+#: ../debian-edu-profile-udeb.templates:7001
 msgid ""
 "This will destroy the partition table on all disks in the machine. REPEAT: "
 "THIS WILL WIPE CLEAN ALL HARD DISKS IN THE MACHINE! If you have important "
@@ -224,14 +173,14 @@
 #. Description
 #. Type: boolean
 #. Description
+#: ../debian-edu-profile-udeb.templates:8001
 #: ../debian-edu-profile-udeb.templates:9001
-#: ../debian-edu-profile-udeb.templates:10001
 msgid "Participate in the package usage survey?"
 msgstr "是否參與套件使用情況勘查?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "The system may anonymously supply the distribution developers with "
 "statistics about the most used packages on this system.  This information "
@@ -243,7 +192,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "If you choose to participate, the automatic submission script will run once "
 "every week, sending statistics to the distribution developers. The collected "
@@ -254,7 +203,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:10001
+#: ../debian-edu-profile-udeb.templates:9001
 msgid ""
 "This choice can be later modified by running \"dpkg-reconfigure popularity-"
 "contest\"."
@@ -263,60 +212,60 @@
 #. Type: text
 #. Description
 #. Debian Edu main server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:11001
+#: ../debian-edu-profile-udeb.templates:10001
 msgid "Debian Edu Main Server"
 msgstr "Debian Edu 主伺服器(Main Server)"
 
 #. Type: text
 #. Description
 #. Debian Edu ltsp server menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:12001
+#: ../debian-edu-profile-udeb.templates:11001
 msgid "Debian Edu Thin Client Server"
 msgstr "Debian Edu 終端機伺服器(Thin Client Server)"
 
 #. Type: text
 #. Description
 #. Debian Edu workstation menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:13001
+#: ../debian-edu-profile-udeb.templates:12001
 msgid "Debian Edu Workstation"
 msgstr "Debian Edu 工作站(Workstation)"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ltsp menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:14001
+#: ../debian-edu-profile-udeb.templates:13001
 msgid "Debian Edu Main Server and Thin Client Server"
 msgstr "Debian Edu 主伺服器(Main-Server) 和終端機伺服器(Thin-Client-Server)"
 
 #. Type: text
 #. Description
 #. Debian Edu combo main+ws menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:15001
+#: ../debian-edu-profile-udeb.templates:14001
 msgid "Debian Edu Main Server and Workstation"
 msgstr "Debian Edu 主伺服器(Main-Server) 和工作站(Workstation)"
 
 #. Type: text
 #. Description
 #. Debian Edu minimal menu entry for partman recipe.
-#: ../debian-edu-profile-udeb.templates:16001
+#: ../debian-edu-profile-udeb.templates:15001
 msgid "Debian Edu Minimal"
 msgstr "Debian Edu 最小安裝"
 
 #. Type: title
 #. Description
-#: ../debian-edu-profile-udeb.templates:17001
+#: ../debian-edu-profile-udeb.templates:16001
 msgid "Debian Edu package installation failed"
 msgstr "Debian Edu 套件安裝失敗"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../debian-edu-profile-udeb.templates:17001
 msgid "Installation of required packages failed"
 msgstr "所需套件安裝失敗"
 
 #. Type: error
 #. Description
-#: ../debian-edu-profile-udeb.templates:18001
+#: ../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 "
@@ -329,13 +278,13 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid "Available disk space is too small.  Abort the installation?"
 msgstr "磁碟可用空間太少。要中斷安裝程序嗎?"
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 #, fuzzy
 #| msgid ""
 #| "The available disk space is too small for the selected profiles.  Do you "
@@ -351,7 +300,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 msgid ""
 "The Debian Edu installer already has executed some disk setup commands. "
 "Previous content of your disk might already have been destroyed by this."
@@ -361,7 +310,7 @@
 
 #. Type: boolean
 #. Description
-#: ../debian-edu-profile-udeb.templates:19001
+#: ../debian-edu-profile-udeb.templates:18001
 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 "
@@ -394,3 +343,30 @@
 #: ../debian-edu-install.templates:1001
 msgid "Consider reporting them to the Debian Edu developers."
 msgstr "請仔細考慮後將此錯誤回報給 Debian Edu 開發者。"
+
+#~ msgid ""
+#~ " - Main Server: reserved for the Debian Edu server. It does not\n"
+#~ "                include any GUI (Graphical User Interface). There\n"
+#~ "                should only be one such server on a Debian Edu\n"
+#~ "                network.\n"
+#~ " - 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"
+#~ "                includes 'Workstation' and requires two network\n"
+#~ "                cards.\n"
+#~ " - Standalone:  for machines meant to be used outside the Debian Edu\n"
+#~ "                network. It includes a GUI and conflicts with other\n"
+#~ "                profiles."
+#~ msgstr ""
+#~ " - 主伺服器:    保留給 Debian Edu 伺服器。不包含任何圖形介面。且\n"
+#~ "                 一個 Debian Edu 網路中,只應該有一台這樣的伺服器。\n"
+#~ ".\n"
+#~ " - 工作站:      在 Debian Edu 網路中的一般機器。\n"
+#~ ".\n"
+#~ " - 漫遊工作站: 有時會漫遊到別的網路的個人電腦。\n"
+#~ ".\n"
+#~ " - 終端機伺服器:包含“工作站”的功能,到要求有兩張網卡。\n"
+#~ ".\n"
+#~ " - 獨立主機:    用於 Debian Edu 之外的機器。\n"
+#~ "                 它有圖形介面,但與其他安裝模式衝突。 "




More information about the debian-edu-commits mailing list