[debian-edu-commits] debian-edu/ 01/02: Update manuals and images from the wiki.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Sat Oct 25 19:42:42 UTC 2014
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-doc.
commit 4230868dc8f75bcf60b7021049af094d5a9a6111
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Sat Oct 25 21:38:51 2014 +0200
Update manuals and images from the wiki.
---
.../debian-edu-jessie-manual.da.po | 22 +--
.../debian-edu-jessie-manual.de.po | 42 ++--
.../debian-edu-jessie-manual.es.po | 36 ++--
.../debian-edu-jessie-manual.fr.po | 36 ++--
.../debian-edu-jessie-manual.it.po | 160 ++++------------
.../debian-edu-jessie-manual.nb.po | 38 ++--
.../debian-edu-jessie-manual.nl.po | 211 +++++++--------------
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 17 +-
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 5 +-
.../debian-edu-jessie/images/de/worldmap.png | Bin 387288 -> 387298 bytes
.../debian-edu-jessie/images/es/worldmap.png | Bin 387402 -> 387409 bytes
.../debian-edu-jessie/images/fr/worldmap.png | Bin 387335 -> 387342 bytes
.../debian-edu-jessie/images/worldmap.png | Bin 387327 -> 387334 bytes
13 files changed, 189 insertions(+), 378 deletions(-)
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index f7faa2b..205f952 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-10-21 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2078,13 +2078,6 @@ msgstr ""
"adgangskode vil blive accepteret af installationsprogrammet)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Hyg dig"
@@ -2641,12 +2634,10 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
msgstr "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
@@ -11848,3 +11839,6 @@ msgid ""
msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 62893ff..1baa72c 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-10-16 21:16+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2130,16 +2130,6 @@ msgstr ""
"Passwörter akzeptiert werden)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-"Installation des Grub-Bootloaders: Zur Zeit muss am Ende der Installation "
-"manuell das Gerät gewählt werden. Dies ist auch dann der Fall, wenn das "
-"System nur eine Festplatte hat."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Freuen Sie sich!"
@@ -2700,13 +2690,11 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "./images/18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -12128,6 +12116,21 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#~ msgid ""
+#~ "Grub bootloader installation: Currently one has to manually select the "
+#~ "device in the installer at the end of the installation. This is the case "
+#~ "even if the system has only one disk."
+#~ msgstr ""
+#~ "Installation des Grub-Bootloaders: Zur Zeit muss am Ende der Installation "
+#~ "manuell das Gerät gewählt werden. Dies ist auch dann der Fall, wenn das "
+#~ "System nur eine Festplatte hat."
+
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
@@ -12195,9 +12198,6 @@ msgstr ""
#~ msgid "{{attachment:17-Select_and_install_software.png}}"
#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 81fc1b0..33a1eb1 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2013-12-02 00:31-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -2149,13 +2149,6 @@ msgstr ""
"el instalador acepte una contraseña menor)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Sonríe :)"
@@ -2765,17 +2758,11 @@ msgstr "18-Build LTSP chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -11173,6 +11160,16 @@ msgstr ""
"Más información sobre versiones más anteriores puede encontrarse en <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
@@ -11240,9 +11237,6 @@ msgstr ""
#~ msgid "{{attachment:17-Select_and_install_software.png}}"
#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index fdc2507..580a14b 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-09-23 07:24+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2152,13 +2152,6 @@ msgstr ""
"si un mot de passe plus court serait accepté par l'installateur)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Détendez-vous"
@@ -2764,17 +2757,11 @@ msgstr "18-Build LTSP chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -12287,6 +12274,16 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#, fuzzy
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
@@ -12354,9 +12351,6 @@ msgstr ""
#~ msgid "{{attachment:17-Select_and_install_software.png}}"
#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index d5d1639..0ccafd6 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-10-23 23:32+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -179,7 +179,6 @@ msgid "Network"
msgstr "La rete"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/Debian_Edu_Network_Wheezy.png"
msgid "./images/Debian_Edu_Network_Jessie.png"
msgstr "./images/Debian_Edu_Network_Jessie.png"
@@ -1558,7 +1557,6 @@ msgid "Select type of installation"
msgstr "Selezionare il tipo d'installazione"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "01-Installer_boot_menu.png"
msgid "./images/01-Installer_boot_menu.png"
msgstr "./images/01-Installer_boot_menu.png"
@@ -1615,7 +1613,6 @@ msgstr ""
"sull'utilizzo dell'installatore"
#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "{{attachment:Installer_advanced_options_a.png}}"
msgid "./images/Installer_advanced_options_a.png"
msgstr "./images/Installer_advanced_options_a.png"
@@ -1741,7 +1738,6 @@ msgstr ""
"bisogno di un file di preconfigurazione."
#. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/alert.png"
msgid "./images/Installer_help.png"
msgstr "./images/Installer_help.png"
@@ -1862,10 +1858,6 @@ msgstr ""
"avvio del kernel."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
-#| "parameters."
msgid ""
"And to install the <emphasis role=\"strong\">MATE</emphasis> desktop "
"instead, add <computeroutput>desktop=mate</computeroutput> to the kernel "
@@ -2118,16 +2110,6 @@ msgstr ""
"password più breve sarà accettata dal programma di installazione.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-"Installazione del bootloader Grub: attualmente si deve selezionare il "
-"dispositivo manualmente al termine dell'installazione. Questo anche se il "
-"sistema ha un solo disco."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Godetevi la vostra Debian Edu"
@@ -2522,7 +2504,6 @@ msgid "01-Installer_boot_menu.png"
msgstr "01-Installer_boot_menu.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "02-select_a_language.png"
msgid "./images/02-select_a_language.png"
msgstr "./images/02-select_a_language.png"
@@ -2531,7 +2512,6 @@ msgid "02-select_a_language.png"
msgstr "02-select_a_language.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "03-select_your_location.png"
msgid "./images/03-select_your_location.png"
msgstr "./images/03-select_your_location.png"
@@ -2540,7 +2520,6 @@ msgid "03-select_your_location.png"
msgstr "03-select_your_location.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "04-Configure_the_keyboard.png"
msgid "./images/04-Configure_the_keyboard.png"
msgstr "./images/04-Configure_the_keyboard.png"
@@ -2549,7 +2528,6 @@ msgid "04-Configure_the_keyboard.png"
msgstr "04-Configure_the_keyboard.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "05-Detect_and_mount_CD-ROM.png"
msgid "./images/05-Detect_and_mount_CD-ROM.png"
msgstr "./images/05-Detect_and_mount_CD-ROM.png"
@@ -2558,7 +2536,6 @@ msgid "05-Detect_and_mount_CD-ROM.png"
msgstr "05-Detect_and_mount_CD-ROM.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "06-Load_installer_components_from_CD.png"
msgid "./images/06-Load_installer_components_from_CD.png"
msgstr "./images/06-Load_installer_components_from_CD.png"
@@ -2567,7 +2544,6 @@ msgid "06-Load_installer_components_from_CD.png"
msgstr "06-Load_installer_components_from_CD.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "07-Detect_network_hardware.png"
msgid "./images/07-Detect_network_hardware.png"
msgstr "./images/07-Detect_network_hardware.png"
@@ -2576,7 +2552,6 @@ msgid "07-Detect_network_hardware.png"
msgstr "07-Detect_network_hardware.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "08-Choose_Debian_Edu_profile.png"
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr "./images/08-Choose_Debian_Edu_profile.png"
@@ -2585,7 +2560,6 @@ msgid "08-Choose_Debian_Edu_profile.png"
msgstr "08-Choose_Debian_Edu_profile.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
@@ -2594,7 +2568,6 @@ msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr "09-Really_use_the_automatic_partitioning_tool.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
@@ -2603,7 +2576,6 @@ msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "11-Participate_in_the_package_usage_survey.png"
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr "./images/11-Participate_in_the_package_usage_survey.png"
@@ -2612,7 +2584,6 @@ msgid "11-Participate_in_the_package_usage_survey.png"
msgstr "11-Participate_in_the_package_usage_survey.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12-Set_up_users_and_passwords.png"
msgid "./images/12-Set_up_users_and_passwords.png"
msgstr "./images/12-Set_up_users_and_passwords.png"
@@ -2621,7 +2592,6 @@ msgid "12-Set_up_users_and_passwords.png"
msgstr "12-Set_up_users_and_passwords.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12a-Set_up_users_and_passwords.png"
msgid "./images/12a-Set_up_users_and_passwords.png"
msgstr "./images/12a-Set_up_users_and_passwords.png"
@@ -2630,7 +2600,6 @@ msgid "12a-Set_up_users_and_passwords.png"
msgstr "12a-Set_up_users_and_passwords.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12b-Set_up_users_and_passwords.png"
msgid "./images/12b-Set_up_users_and_passwords.png"
msgstr "./images/12b-Set_up_users_and_passwords.png"
@@ -2639,7 +2608,6 @@ msgid "12b-Set_up_users_and_passwords.png"
msgstr "12b-Set_up_users_and_passwords.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12c-Set_up_users_and_passwords.png"
msgid "./images/12c-Set_up_users_and_passwords.png"
msgstr "./images/12c-Set_up_users_and_passwords.png"
@@ -2648,7 +2616,6 @@ msgid "12c-Set_up_users_and_passwords.png"
msgstr "12c-Set_up_users_and_passwords.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12d-Setting-up-the-partitioner.png"
msgid "./images/12d-Setting-up-the-partitioner.png"
msgstr "./images/12d-Setting-up-the-partitioner.png"
@@ -2657,7 +2624,6 @@ msgid "12d-Setting-up-the-partitioner.png"
msgstr "12d-Setting-up-the-partitioner.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "12e-creating_ext4.png"
msgid "./images/12e-creating_ext4.png"
msgstr "./images/12e-creating_ext4.png"
@@ -2666,7 +2632,6 @@ msgid "12e-creating_ext4.png"
msgstr "12e-creating_ext4.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "13-Install the base system.png"
msgid "./images/13-Install+the+base+system.png"
msgstr "./images/13-Install+the+base+system.png"
@@ -2675,7 +2640,6 @@ msgid "13-Install the base system.png"
msgstr "13-Install the base system.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "14-Select_and_install_software.png"
msgid "./images/14-Select_and_install_software.png"
msgstr "./images/14-Select_and_install_software.png"
@@ -2684,7 +2648,6 @@ msgid "14-Select_and_install_software.png"
msgstr "14-Select_and_install_software.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "17-Select_and_install_software.png"
msgid "./images/17-Select_and_install_software.png"
msgstr "./images/17-Select_and_install_software.png"
@@ -2693,7 +2656,6 @@ msgid "17-Select_and_install_software.png"
msgstr "17-Select_and_install_software.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "18-Build LTSP chroot.png"
msgid "./images/18-Build+LTSP+chroot.png"
msgstr "./images/18-Build+LTSP+chroot.png"
@@ -2701,18 +2663,13 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -2721,7 +2678,6 @@ msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "20-Finish_the_Installation.png"
msgid "./images/20-Finish_the_Installation.png"
msgstr "./images/20-Finish_the_Installation.png"
@@ -2730,7 +2686,6 @@ msgid "20-Finish_the_Installation.png"
msgstr "20-Finish_the_Installation.png"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
@@ -4190,7 +4145,6 @@ msgstr ""
"della pagina di backup e selezionare l'istantanea più vecchia da conservare:"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "{{attachment:slbackup-php_maintenance.png}}"
msgid "./images/slbackup-php_maintenance.png"
msgstr "./images/slbackup-php_maintenance.png"
@@ -4553,12 +4507,6 @@ msgid "General notes on upgrading"
msgstr "Indicazioni generali sull'aggiornamento"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Upgrading Debian from one distribution to the next is generally rather "
-#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
-#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
-#| "url=\"https://bugs.debian.org/311188#\">311188</ulink> for more "
-#| "information.) Upgrading is still possible but may require some work."
msgid ""
"Upgrading Debian from one distribution to the next is generally rather easy. "
"For Debian Edu this is unfortunately not yet true as we modify configuration "
@@ -4733,14 +4681,6 @@ msgstr ""
"Wheezy)"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "To upgrade from any older release, you will need to upgrade to the Wheezy-"
-#| "based Debian Edu release first, before you can follow the instructions "
-#| "provided above. Instructions are given in the <ulink url=\"https://wiki."
-#| "debian.org/DebianEdu/Documentation/Wheezy#\">Manual for Debian Edu "
-#| "Wheezy</ulink> about how to upgrade to Wheezy from the previous release, "
-#| "Squeeze, and the Squeeze manual covers the one before that! (Lenny was "
-#| "it's name.)"
msgid ""
"To upgrade from any older release, you will need to upgrade to the Wheezy "
"based Debian Edu release first, before you can follow the instructions "
@@ -5287,10 +5227,6 @@ msgid "Upgrading with a CD or similar image"
msgstr "Aggiornamento da CD o immagine simile"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Jessie 8.0~alpha+edu0 to 7.3+edu1) but you do not have Internet "
-#| "connectivity, only physical media, follow these steps:"
msgid ""
"If you want to upgrade from one version to another (for example from Jessie "
"8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only "
@@ -6004,10 +5940,6 @@ msgstr ""
"\">Getting started</link> di questo manuale."
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "This example uses 'nas-server.intern' as the server name. Once 'nas-"
-#| "server.intern' ist configured, check if the NFS export points on the new "
-#| "storage server are exported to the relevant subnets or machines:"
msgid ""
"This example uses 'nas-server.intern' as the server name. Once 'nas-server."
"intern' is configured, check if the NFS export points on the new storage "
@@ -6926,8 +6858,8 @@ msgid ""
msgstr ""
"I valori predefiniti sono definiti in <computeroutput>[default]</"
"computeroutput>; per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: <computeroutput>[192.168.0.10]"
-"</computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: "
+"<computeroutput>[192.168.0.10]</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -8168,11 +8100,6 @@ msgid "Samba in Debian Edu"
msgstr "Samba in Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Samba (v3) in Debian Edu Wheezy has been fully prepared for use as an NT4-"
-#| "style domain controller with Windows XP, Windows Vista and Windows 7 as "
-#| "clients. After a machine has joined the domain, this machine can be fully "
-#| "managed with GOsa²."
msgid ""
"Samba (v3), since Debian Edu Wheezy (the previous release), has been fully "
"prepared for use as an NT4-style domain controller with Windows XP, Windows "
@@ -9290,9 +9217,6 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nuove caratteristiche in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released "
-#| "2013-09-28"
msgid ""
"New features for Debian Edu 8.0~alpha+edu0 Codename Jessie released 2015-XX-"
"YY"
@@ -9339,15 +9263,10 @@ msgid "Everything which is new in Debian Jessie 8.0, eg:"
msgstr "Tutto ciò che è nuovo in Debian Jessie 8.0, ad esempio:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Linux kernel 3.2.x"
msgid "Linux kernel 3.16.x"
msgstr "Linux kernel 3.16.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and "
-#| "LXDE 0.5.5 (KDE \"Plasma\" is installed by default; to choose GNOME, Xfce "
-#| "or LXDE: see manual.)"
msgid ""
"Desktop environments KDE \"Plasma\" 4.11.12, GNOME 3.14, Xfce 4.10, LXDE "
"0.5.6 and MATE 1.8 (KDE \"Plasma\" is installed by default; to choose one of "
@@ -9358,22 +9277,18 @@ msgstr ""
"degli altri vedere il manuale.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Web browser Iceweasel 17 ESR"
msgid "the browsers Iceweasel 31 ESR and Chromium 38"
msgstr "i browser web sono Iceweasel 31 ESR e Chromium 38"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "LibreOffice 3.5.4"
msgid "LibreOffice 4.3.2"
msgstr "LibreOffice 4.3.2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Educational toolbox GCompris 12.01"
msgid "Educational toolbox GCompris 14.07"
msgstr "Software educativo GCompris 14.07"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid "Music creator Rosegarden 10.04.2"
msgid "Music creator Rosegarden 14.02"
msgstr "Editor musicale Rosegarden 14.02"
@@ -9388,11 +9303,6 @@ msgid "LTSP 5.5.3"
msgstr "LTSP 5.5.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "More information about Debian Wheezy 7.1 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
-#| "installmanual\">installation manual</ulink>."
msgid ""
"new boot framework: systemd. More information is available in the Debian "
"<ulink url=\"https://wiki.debian.org/systemd\">systemd wiki page</ulink> and "
@@ -9405,8 +9315,6 @@ msgstr ""
"Software/systemd/\">manuale di systemd</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "Debian Jessie includes about 37000 packages available for installation."
msgid "Debian Jessie includes about 42000 packages available for installation."
msgstr ""
"Debian Jessie comprende circa 42000 pacchetti disponibili per "
@@ -9437,10 +9345,6 @@ msgstr ""
"modelli sono disponibili in 29 lingue."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#| msgid ""
-#| "The Debian Edu Jessie Manual is fully translated to German, French, "
-#| "Italian and Danish. Partly translated versions exist for Norwegian Bokmal "
-#| "and Spanish."
msgid ""
"The Debian Edu Jessie Manual is fully translated to German, French, Italian, "
"Danish and Dutch. Partly translated versions exist for Norwegian Bokmal and "
@@ -9739,7 +9643,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -10562,8 +10466,6 @@ msgid "Appendix C - Features in older releases"
msgstr "Appendice C - Caratteristiche dei rilasci più vecchi"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgid "New features in Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
"Nuove caratteristiche in Debian Edu 7.1+edu0 nome in codice Wheezy "
@@ -12061,6 +11963,23 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "Grub bootloader installation: Currently one has to manually select the "
+#~ "device in the installer at the end of the installation. This is the case "
+#~ "even if the system has only one disk."
+#~ msgstr ""
+#~ "Installazione del bootloader Grub: attualmente si deve selezionare il "
+#~ "dispositivo manualmente al termine dell'installazione. Questo anche se il "
+#~ "sistema ha un solo disco."
+
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
@@ -12128,9 +12047,6 @@ msgstr ""
#~ msgid "{{attachment:17-Select_and_install_software.png}}"
#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
@@ -16755,13 +16671,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -16773,8 +16689,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -16782,8 +16698,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -16800,8 +16716,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -16809,8 +16725,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
-#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
+#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index d225018..6dc7086 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-06-15 16:48+0200\n"
"Last-Translator: Ole-Erik Yrvin <oeyrvin at hagan.no>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -2179,13 +2179,6 @@ msgstr ""
"installereren)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Vær glad"
@@ -2818,16 +2811,9 @@ msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"{{attachment:debian-"
"edu-}}squeeze-10-basesystem.png\"/></imageobject>"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
-"arch.]png\"/></imageobject>"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#. type: Content of: <article><section><section><para>
#, fuzzy
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
"arch.]png\"/></imageobject>"
@@ -12189,6 +12175,18 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+#~ "arch.]png\"/></imageobject>"
+
+#, fuzzy
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+#~ "arch.]png\"/></imageobject>"
+
+#, fuzzy
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
@@ -12263,12 +12261,6 @@ msgstr ""
#~ "getting-]started.png\"/></imageobject>"
#, fuzzy
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
-#~ "arch.]png\"/></imageobject>"
-
-#, fuzzy
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index bad0b14..029a48d 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\n"
"PO-Revision-Date: 2014-10-24 14:51+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -2174,16 +2174,6 @@ msgstr ""
"zal het installatieprogramma een korter wachtwoord aanvaarden)."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-"Installatie van de bootloader van Grub: Momenteel moet men op het einde van "
-"de installatie het apparaat handmatig selecteren. Dit is zelfs het geval als "
-"het systeem slechts een schijf heeft."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr "Verheug u"
@@ -2755,13 +2745,11 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -3562,13 +3550,11 @@ msgid ""
"net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
" comment=\"DESCRIPTION OF NEW GROUP\""
msgstr ""
-"# Toon de lijst van bestaande UNIX-groepen en de overeenkomstige "
-"Windowsgroepen.\n"
+"# Toon de lijst van bestaande UNIX-groepen en de overeenkomstige Windowsgroepen.\n"
"net groupmap list\n"
"\n"
"# Voeg uw nieuwe groepen of andere ontbrekende groepen toe:\n"
-"net groupmap add unixgroup=NIEUWE_GROEP type=domain "
-"ntgroup=\"NIEUWE_GROEP\"\\\n"
+"net groupmap add unixgroup=NIEUWE_GROEP type=domain ntgroup=\"NIEUWE_GROEP\"\\\n"
" comment=\"BESCHRIJVING VAN DE NIEUWE_GROEP\""
#. type: Content of: <article><section><section><section><para>
@@ -3688,20 +3674,16 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t "
-"workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] "
-"id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
"enter password:"
msgstr ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t "
-"workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] "
-"id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
@@ -4670,12 +4652,6 @@ msgid "General notes on upgrading"
msgstr "Algemene opmerkingen over opwaarderingen"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "Upgrading Debian from one distribution to the next is generally rather "
-#| "easy. For Debian Edu this is unfortunately not yet true as we heavily "
-#| "modify configuration files in ways we shouldn't. (See Debian bug <ulink "
-#| "url=\"https://bugs.debian.org/311188#\">311188</ulink> for more "
-#| "information.) Upgrading is still possible but may require some work."
msgid ""
"Upgrading Debian from one distribution to the next is generally rather easy. "
"For Debian Edu this is unfortunately not yet true as we modify configuration "
@@ -4683,13 +4659,12 @@ msgid ""
"org/311188#\">311188</ulink> for more information.) Upgrading is still "
"possible but may require some work."
msgstr ""
-"Meestal verloopt het opwaarderen van een uitgave naar de volgende "
-"redelijk gemakkelijk. Jammer genoeg is dit bij Debian Edu nog niet het "
-"geval, omdat we configuratiebestanden aanpassen op manieren"
-"die we eigenlijk niet zou mogen gebruiken. (Meer informatie vindt u in het "
-"bugrapport nummer <ulink url=\"https://bugs.debian.org/311188#\">311188</"
-"ulink> van Debian.) Toch blijft opwaarderen wel mogelijk, maar het vraagt "
-"wat werk."
+"Meestal verloopt het opwaarderen van een uitgave naar de volgende redelijk "
+"gemakkelijk. Jammer genoeg is dit bij Debian Edu nog niet het geval, omdat "
+"we configuratiebestanden aanpassen op manierendie we eigenlijk niet zou "
+"mogen gebruiken. (Meer informatie vindt u in het bugrapport nummer <ulink "
+"url=\"https://bugs.debian.org/311188#\">311188</ulink> van Debian.) Toch "
+"blijft opwaarderen wel mogelijk, maar het vraagt wat werk."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -5213,8 +5188,7 @@ msgid ""
msgstr ""
"$ sudo apt-get update\n"
" $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
-" # na de installatie een grafische sessie voor de eerste gebruiker opstarten "
-"\n"
+" # na de installatie een grafische sessie voor de eerste gebruiker opstarten \n"
" $ startx"
#. type: Content of: <article><section><section><title>
@@ -5388,12 +5362,10 @@ msgstr "Backports gebruiken is zeer eenvoudig:"
#. type: CDATA
#, no-wrap
msgid ""
-"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
#. type: Content of: <article><section><section><para>
@@ -6007,8 +5979,7 @@ msgid ""
" chown $user:$group $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders have been created\""
@@ -6107,8 +6078,7 @@ msgid ""
" ln -s /media/$home $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already "
-"exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders has been created\""
@@ -6263,8 +6233,7 @@ msgid ""
"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: nas-server\n"
-" automountInformation: -fstype=autofs --timeout=60 "
-"ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
"\n"
" add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: top\n"
@@ -6274,14 +6243,12 @@ msgid ""
" add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: /\n"
-" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard"
-",nodev,nosuid,noatime nas-server.intern:/&"
+" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
msgstr ""
"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: nas-server\n"
-" automountInformation: -fstype=autofs --timeout=60 "
-"ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
"\n"
" add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: top\n"
@@ -6291,8 +6258,7 @@ msgstr ""
" add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: /\n"
-" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard"
-",nodev,nosuid,noatime nas-server.intern:/&"
+" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -6467,10 +6433,8 @@ msgid ""
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT "
-"if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
+"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6480,12 +6444,9 @@ msgstr ""
"apt-get install debian-keyring\n"
"# de sleutel van deb-multimedia veilig ophalen:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# ga op een veilige manier na of de sleutel echt is en voeg hem in voorkomend "
-"geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
-"# voeg de pakketbron toe in het bestand sources.list - gelieve op de "
-"homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
+"# ga op een veilige manier na of de sleutel echt is en voeg hem in voorkomend geval toe aan de sleutelbos die door APT gebruikt wordt:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# voeg de pakketbron toe in het bestand sources.list - gelieve op de homepagina na te gaan of u een spiegelserver kunt gebruiken!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# werk de lijst van beschikbare pakketten bij:\n"
"apt-get update"
@@ -6749,8 +6710,7 @@ msgid ""
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"(1)Open het bestand /opt/ltsp/i386/etc/ltsp/update-kernels.conf met een "
-"editor\n"
+"(1)Open het bestand /opt/ltsp/i386/etc/ltsp/update-kernels.conf met een editor\n"
"en vervang de regel\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"door\n"
@@ -6869,17 +6829,14 @@ msgstr ""
#, no-wrap
msgid ""
"#add the skole projects local repository\n"
-"d-i apt-setup/local1/repository string http://example.org/debian "
-"stable main contrib non-free\n"
+"d-i apt-setup/local1/repository string http://example.org/debian stable main contrib non-free\n"
"d-i apt-setup/local1/comment string Example Software Repository\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
msgstr ""
"#voeg een pakketbron van example.org toe\n"
-"d-i apt-setup/local1/repository string http://example.org/debian "
-"stable main contrib non-free\n"
-"d-i apt-setup/local1/comment string pakketbron met programmatuur "
-"afkomstig van example\n"
+"d-i apt-setup/local1/repository string http://example.org/debian stable main contrib non-free\n"
+"d-i apt-setup/local1/comment string pakketbron met programmatuur afkomstig van example\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
@@ -6925,12 +6882,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -6942,12 +6895,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg "
-"/var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -7010,14 +6959,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
-msgstr ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img "
-"nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet "
-"ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7395,8 +7338,7 @@ msgid ""
" echo $SHUFFLED_LIST"
msgstr ""
"#!/bin/bash\n"
-" # Plaats de lijst van servers die voorkomt in de parameter MY_SERVER_LIST in "
-"willekeurige volgorde\n"
+" # Plaats de lijst van servers die voorkomt in de parameter MY_SERVER_LIST in willekeurige volgorde\n"
" TMP_LIST=\"\"\n"
" SHUFFLED_LIST=\"\"\n"
" for i in $MY_SERVER_LIST; do\n"
@@ -7524,15 +7466,13 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -a i386 # this does \"chroot /opt/ltsp/i386\" and more, ie it "
-"also prevents daemons from being started\n"
+"ltsp-chroot -a i386 # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
"exit"
msgstr ""
-"ltsp-chroot -a i386 # dit doet \"chroot /opt/ltsp/i386\" en meer: het "
-"verhindert namelijk ook dat achtergronddiensten opgestart worden\n"
+"ltsp-chroot -a i386 # dit doet \"chroot /opt/ltsp/i386\" en meer: het verhindert namelijk ook dat achtergronddiensten opgestart worden\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
@@ -9002,8 +8942,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"# move the tar.gz file to a repository directory on the school network's "
-"webroot (by default located on tjener):\n"
+"# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9012,9 +8951,7 @@ msgid ""
"# extract the file\n"
"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
msgstr ""
-"# verplaats het tar.gz-bestand naar een map voor pakketbronnen in de hoofdmap "
-"voor webpagina's (de webroot - standaard bevindt die zich op tjener) van het "
-"netwerk van de school :\n"
+"# verplaats het tar.gz-bestand naar een map voor pakketbronnen in de hoofdmap voor webpagina's (de webroot - standaard bevindt die zich op tjener) van het netwerk van de school :\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9041,14 +8978,12 @@ msgid ""
"d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
"d-i apt-setup/local1/comment string SMART Repo\n"
"d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
msgstr ""
"d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
"d-i apt-setup/local1/comment string SMART Repo\n"
"d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
#. type: Content of: <article><section><section><section><para>
msgid "Update the preseed file:"
@@ -9116,18 +9051,14 @@ msgid ""
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# update the dpkg database and install the wanted packages\n"
"ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
msgstr ""
"ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
"ltsp-chroot -a i386 apt-key add swbuild.asc\n"
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# werk de database van dpkg bij en installeer de gewenste pakketten\n"
"ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9696,21 +9627,16 @@ msgid "LTSP 5.5.3"
msgstr "LTSP 5.5.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#| msgid ""
-#| "new boot framework: systemd. More information is available in the <ulink "
-#| "url=\"http://www.freedesktop.org/wiki/Software/systemd/\">systemd manual</"
-#| "ulink>."
msgid ""
"new boot framework: systemd. More information is available in the Debian "
"<ulink url=\"https://wiki.debian.org/systemd\">systemd wiki page</ulink> and "
"in the<ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
"\">systemd manual</ulink>."
msgstr ""
-"nieuw opstartraamwerk systemd. Meer informatie is te vinden in de <ulink "
-"url=\"https://wiki.debian.org/systemd\">systemd wiki pagina</ulink> van "
-"Debian en in de <ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
-"\">handleiding van "
-"systemd</ulink>."
+"nieuw opstartraamwerk systemd. Meer informatie is te vinden in de <ulink url="
+"\"https://wiki.debian.org/systemd\">systemd wiki pagina</ulink> van Debian "
+"en in de <ulink url=\"http://www.freedesktop.org/wiki/Software/systemd/"
+"\">handleiding van systemd</ulink>."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Debian Jessie includes about 42000 packages available for installation."
@@ -10054,7 +9980,7 @@ msgstr ""
"over hoe u vertalingen moet bijwerken."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -10098,11 +10024,8 @@ msgstr "Bijlage A - De GNU Algemene Gebruikerslicentie"
#. type: CDATA
#, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
-msgstr ""
-"Noot voor vertalers: het is niet nodig om de tekst van de GPL-licentie te "
-"vertalen."
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Noot voor vertalers: het is niet nodig om de tekst van de GPL-licentie te vertalen."
#. type: Content of: <article><section><section><title>
msgid "Manual for Debian Edu 8.0~alpha+edu0 Codename \"Jessie\""
@@ -12448,6 +12371,21 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "Grub bootloader installation: Currently one has to manually select the "
+#~ "device in the installer at the end of the installation. This is the case "
+#~ "even if the system has only one disk."
+#~ msgstr ""
+#~ "Installatie van de bootloader van Grub: Momenteel moet men op het einde "
+#~ "van de installatie het apparaat handmatig selecteren. Dit is zelfs het "
+#~ "geval als het systeem slechts een schijf heeft."
+
+#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
+#~ msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#~ msgstr "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+
#~ msgid "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
#~ msgstr "{{attachment:11-Participate_in_the_package_usage_survey.png}}"
@@ -12515,9 +12453,6 @@ msgstr ""
#~ msgid "{{attachment:17-Select_and_install_software.png}}"
#~ msgstr "{{attachment:17-Select_and_install_software.png}}"
-#~ msgid "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-#~ msgstr "{{attachment:19-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-
#~ msgid "{{attachment:20-Finish_the_Installation.png}}"
#~ msgstr "{{attachment:20-Finish_the_Installation.png}}"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index 3806096..eacfe50 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-10-23 08:53+0000\n"
+"POT-Creation-Date: 2014-10-25 21:38+0200\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"
@@ -1555,13 +1555,6 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
-"Grub bootloader installation: Currently one has to manually select the "
-"device in the installer at the end of the installation. This is the case "
-"even if the system has only one disk."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid "Be happy"
msgstr ""
@@ -1999,12 +1992,8 @@ msgstr ""
msgid "18-Build LTSP chroot.png"
msgstr ""
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr ""
-
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+#. type: Content of: <article><section><section><para>
+msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
msgstr ""
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 8823d6e..5b3b2aa 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -651,9 +651,6 @@
<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The password for this user <emphasis role="strong">must</emphasis> have a length of <emphasis role="strong">at least 5 characters</emphasis> - otherwise login will not be possible (even though a shorter password will be accepted by the installer).
</para></listitem>
<listitem>
-<para>Grub bootloader installation: Currently one has to manually select the device in the installer at the end of the installation. This is the case even if the system has only one disk.
-</para></listitem>
-<listitem>
<para>Be happy
</para></listitem></itemizedlist>
</section>
@@ -805,7 +802,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/18-Build+LTSP+chroot.png"/></imageobject><textobject><phrase>18-Build LTSP chroot.png</phrase></textobject></inlinemediaobject>
</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"/></imageobject><textobject><phrase>19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png</phrase></textobject></inlinemediaobject>
+<para>{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}
</para>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"/></imageobject><textobject><phrase>19-Install_the_GRUB_boot_loader_on_a_hard_disk.png</phrase></textobject></inlinemediaobject>
</para>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index 9e354e5..b27a8ad 100644
Binary files a/documentation/debian-edu-jessie/images/de/worldmap.png and b/documentation/debian-edu-jessie/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/es/worldmap.png b/documentation/debian-edu-jessie/images/es/worldmap.png
index 11ed46d..fc28301 100644
Binary files a/documentation/debian-edu-jessie/images/es/worldmap.png and b/documentation/debian-edu-jessie/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/fr/worldmap.png b/documentation/debian-edu-jessie/images/fr/worldmap.png
index fc79817..a6bac40 100644
Binary files a/documentation/debian-edu-jessie/images/fr/worldmap.png and b/documentation/debian-edu-jessie/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-jessie/images/worldmap.png b/documentation/debian-edu-jessie/images/worldmap.png
index 3df25f3..88f2f27 100644
Binary files a/documentation/debian-edu-jessie/images/worldmap.png and b/documentation/debian-edu-jessie/images/worldmap.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list