[debian-edu-commits] debian-edu/ 01/01: Update manuals and images from the wiki.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Sat Oct 25 22:35:37 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 ff02702392e42966465e35453ef003783dbc4e4a
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Sun Oct 26 00:35:01 2014 +0200
Update manuals and images from the wiki.
---
.../debian-edu-jessie-manual.da.po | 13 +-
.../debian-edu-jessie-manual.de.po | 149 +++++++--------------
.../debian-edu-jessie-manual.es.po | 13 +-
.../debian-edu-jessie-manual.fr.po | 13 +-
.../debian-edu-jessie-manual.it.po | 13 +-
.../debian-edu-jessie-manual.nb.po | 15 +--
.../debian-edu-jessie-manual.nl.po | 13 +-
.../debian-edu-jessie/debian-edu-jessie-manual.pot | 6 +-
.../debian-edu-jessie/debian-edu-jessie-manual.xml | 2 -
.../debian-edu-jessie/images/de/worldmap.png | Bin 387298 -> 387300 bytes
.../debian-edu-jessie/images/es/worldmap.png | Bin 387409 -> 387414 bytes
.../debian-edu-jessie/images/fr/worldmap.png | Bin 387342 -> 387347 bytes
.../debian-edu-jessie/images/worldmap.png | Bin 387334 -> 387339 bytes
13 files changed, 87 insertions(+), 150 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 764994c..e7993c2 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2634,12 +2634,6 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.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>
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"
@@ -11840,5 +11834,10 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, 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"
+
#~ 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 518dfcd..cc5b593 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+0200\n"
"PO-Revision-Date: 2014-10-25 23:05+0200\n"
"Last-Translator: Jürgen Leibner <juergen at leibner.eu>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2690,12 +2690,6 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "./images/18-Build LTSP chroot.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"
msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -3478,8 +3472,7 @@ msgid ""
"net groupmap add unixgroup=NEW_GROUP type=domain ntgroup=\"NEW_GROUP\"\\\n"
" comment=\"DESCRIPTION OF NEW GROUP\""
msgstr ""
-"# Listen Sie die existierende Zuordnung zwischen UNIX und Windows-Gruppen "
-"auf.\n"
+"# Listen Sie die existierende Zuordnung zwischen UNIX und Windows-Gruppen auf.\n"
"net groupmap list\n"
"\n"
"# Fügen Sie Ihre neuen oder fehlenden Gruppen hinzu:\n"
@@ -3597,20 +3590,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"
@@ -5088,8 +5077,7 @@ msgid ""
msgstr ""
"$ sudo apt-get update\n"
" $ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
-" # Nach der Installation eine graphische Arbeitsumgebung für den "
-"Erstbenutzer starten\n"
+" # Nach der Installation eine graphische Arbeitsumgebung für den Erstbenutzer starten\n"
" $ startx"
#. type: Content of: <article><section><section><title>
@@ -5255,12 +5243,10 @@ msgstr "Die Nutzung von backports ist einfach:"
#. 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>
@@ -5863,8 +5849,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\""
@@ -5885,8 +5870,7 @@ msgstr ""
" 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 Verzeichnisse wurden angelegt\""
@@ -5962,8 +5946,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\""
@@ -5978,8 +5961,7 @@ msgstr ""
" 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\""
@@ -6117,8 +6099,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"
@@ -6128,14 +6109,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"
@@ -6145,8 +6124,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 ""
@@ -6321,10 +6299,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"
@@ -6334,12 +6310,9 @@ msgstr ""
"apt-get install debian-keyring\n"
"# Den Debian-Multimedia-Key ungesichert holen:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem "
-"APT-Keyring hinzufügen:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
-"# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen "
-"Spiegelservern konsultieren!\n"
+"# Gesichert die Korrektheit des Keys prüfen und diesen gegebenenfalls dem APT-Keyring hinzufügen:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# Das Depot der Datei sources.list hinzufügen - bitte die Homepages wegen Spiegelservern konsultieren!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# Die List der verfügbaren Pakete aktualisieren:\n"
"apt-get update"
@@ -6505,8 +6478,7 @@ msgstr ""
"\n"
"# Entscheiden, welches Paket für die Netzwerkarte(n) erforderlic ist.\n"
"# Höxhstwahrscheinlich wirde es das Paket firmware-linux-nonfree sein.\n"
-"# Die Änderungen müssen im LTSP-Chroot für die Architektur i386 vorgenommen "
-"werden.\n"
+"# Die Änderungen müssen im LTSP-Chroot für die Architektur i386 vorgenommen werden.\n"
"ltsp-chroot -a i386 apt-get update\n"
"ltsp-chroot -a i386 mkdir /tmp/user 2> /dev/null\n"
"ltsp-chroot -a i386 mkdir /tmp/user/0 2> /dev/null\n"
@@ -6598,8 +6570,7 @@ msgid ""
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"(1)Öffnen Sie die Datei /opt/ltsp/i386/etc/ltsp/update-kernels.conf mit einem "
-"Editor\n"
+"(1)Öffnen Sie die Datei /opt/ltsp/i386/etc/ltsp/update-kernels.conf mit einem Editor\n"
"und ersetzen Sie die Zeile\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
"durch\n"
@@ -6713,15 +6684,13 @@ 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 ""
"# Ein lokales Depot hinzufügen\n"
-"d-i apt-setup/local1/repository string http://example.com/debian "
-"stable main contrib non-free\n"
+"d-i apt-setup/local1/repository string http://example.com/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.com/key.asc"
@@ -6765,12 +6734,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 ""
@@ -6782,12 +6747,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 ""
@@ -6850,14 +6811,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 ""
@@ -7346,15 +7301,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 # dies bewirkt \"chroot /opt/ltsp/i386\" und verhindert "
-"dort zusätzlich den Start von Daemons\n"
+"ltsp-chroot -a i386 # dies bewirkt \"chroot /opt/ltsp/i386\" und verhindert dort zusätzlich den Start von Daemons\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
@@ -7747,8 +7700,8 @@ msgid ""
"<emphasis role=\"strong\">Note</emphasis> The examples are outdated since in "
"wheezy kerberos was configured for samba too!"
msgstr ""
-"<emphasis role=\"strong\">Hinweis</emphasis> Die Beispiele sind veraltet seit "
-"in Wheezy auch Kerberos für Samba konfiguriert wurde!"
+"<emphasis role=\"strong\">Hinweis</emphasis> Die Beispiele sind veraltet "
+"seit in Wheezy auch Kerberos für Samba konfiguriert wurde!"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
@@ -8789,8 +8742,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"
@@ -8799,8 +8751,7 @@ msgid ""
"# extract the file\n"
"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
msgstr ""
-"# Das tar.gz-Archiv verschieben in ein Depot-Verzeichnis des "
-"Schulnetz-Webservers (voreingestellt auf »tjener«):\n"
+"# Das tar.gz-Archiv verschieben in ein Depot-Verzeichnis des Schulnetz-Webservers (voreingestellt auf »tjener«):\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -8829,14 +8780,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:"
@@ -8903,18 +8852,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"
"# 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"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9824,7 +9769,7 @@ msgstr ""
"Übersetzungen aktualisieren wollen."
#. <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 "
@@ -9868,8 +9813,7 @@ msgstr "Anhang A - The GNU General Public Licence"
#. type: CDATA
#, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
msgstr "Für Übersetzer: Die GPL muss nicht übersetzt werden."
#. type: Content of: <article><section><section><title>
@@ -12166,6 +12110,11 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+#, 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}}"
+
#~ 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 "
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 630af48..87090ff 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2758,12 +2758,6 @@ msgstr "18-Build LTSP chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.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>
#, fuzzy
#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -11161,6 +11155,11 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, 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}}"
+
+#, 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"
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 48cfcb6..efd96bf 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2757,12 +2757,6 @@ msgstr "18-Build LTSP chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.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>
#, fuzzy
#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -12275,6 +12269,11 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#, 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}}"
+
+#, 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"
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 87c5821..da4ed34 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2663,12 +2663,6 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.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"
msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -11963,6 +11957,11 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, 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}}"
+
#~ 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 "
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 6c0b6c4..0385103 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2811,13 +2811,6 @@ msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"{{attachment:debian-"
"edu-}}squeeze-10-basesystem.png\"/></imageobject>"
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
-"arch.]png\"/></imageobject>"
-
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -12175,6 +12168,12 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid "{{attachment:19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png}}"
+#~ msgstr ""
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
+#~ "arch.]png\"/></imageobject>"
+
+#, fuzzy
#~ msgid "./images/19pre-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
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 83670dd..87f1572 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -2745,12 +2745,6 @@ msgstr "./images/18-Build+LTSP+chroot.png"
msgid "18-Build LTSP chroot.png"
msgstr "18-Build LTSP chroot.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"
msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
@@ -12371,6 +12365,11 @@ msgstr ""
"Meer informatie over nog oudere uitgaven vindt men op <ulink url=\"http://"
"developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#, 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}}"
+
#~ 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 "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index b220ba2..5e9c755 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-25 21:40+0200\n"
+"POT-Creation-Date: 2014-10-26 00:34+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"
@@ -1992,10 +1992,6 @@ msgstr ""
msgid "18-Build LTSP chroot.png"
msgstr ""
-#. 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>
msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
msgstr ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 5b3b2aa..e67c7bc 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -802,8 +802,6 @@ 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>{{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>
<para><inlinemediaobject><imageobject><imagedata fileref="./images/20-Finish_the_Installation.png"/></imageobject><textobject><phrase>20-Finish_the_Installation.png</phrase></textobject></inlinemediaobject>
diff --git a/documentation/debian-edu-jessie/images/de/worldmap.png b/documentation/debian-edu-jessie/images/de/worldmap.png
index b27a8ad..d1779a5 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 fc28301..f421db5 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 a6bac40..c552e3a 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 88f2f27..ee7dbe3 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