[debian-edu-commits] debian-edu/debian-edu-doc.git (#1619) - master (branch) updated: 1.5_20130920_7.1-9-gf46638d
David Prévot
taffit at alioth.debian.org
Mon Sep 30 23:53:28 UTC 2013
The branch, master has been updated
via f46638d8e9d33480cb920eed215a9e262e90b3d4 (commit)
from a66fb168038183e550c70481635c6194d971df07 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f46638d8e9d33480cb920eed215a9e262e90b3d4
Author: David Prévot <taffit at debian.org>
Date: Mon Sep 30 19:31:46 2013 -0400
Update manual and images from the wiki
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386843 -> 386831 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386951 -> 386939 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386893 -> 386881 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386894 -> 386882 bytes
.../debian-edu-wheezy-manual.de.po | 10 +-
.../debian-edu-wheezy-manual.es.po | 50 +++---
.../debian-edu-wheezy-manual.it.po | 62 ++-----
.../debian-edu-wheezy-manual.nb.po | 177 ++++++++++----------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 4 +-
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 4 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386843 -> 386831 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386951 -> 386939 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386893 -> 386881 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386894 -> 386882 bytes
14 files changed, 133 insertions(+), 174 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 117ad8e..05bd6d3 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 5d68ff7..e24af17 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 0edb657..5c881a3 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 3716b0f..34f892d 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index bb7c6be..6b90ddc 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-17 17:52-0400\n"
+"POT-Creation-Date: 2013-09-30 19:15-0400\n"
"PO-Revision-Date: 2013-09-23 11:59+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -780,8 +780,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
-"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
+"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -9558,8 +9558,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <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 "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index b707242..32b37a3 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-19 08:51-0400\n"
+"POT-Creation-Date: 2013-09-30 19:15-0400\n"
"PO-Revision-Date: 2013-09-20 17:08-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -51,9 +51,8 @@ msgid ""
"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
"Wheezy\"/> is a wiki and updated frequently."
msgstr ""
-"La versión en <ulink "
-"url=\"http://wiki.debian.org/DebianEdu/Documentation/Wheezy\"/> es un wiki "
-"actualizado frecuentemente."
+"La versión en <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+"Wheezy\"/> es un wiki actualizado frecuentemente."
#. type: Content of: <article><section><para>
msgid ""
@@ -64,8 +63,8 @@ msgid ""
msgstr ""
"Las <link linkend=\"Translations\">Traducciones</link>son parte del paquete "
"<computeroutput>debian-edu-doc</computeroutput> que puede ser instalado en "
-"un servidor web, y que está disponible <ulink "
-"url=\"http://maintainer.skolelinux.org/debian-edu-doc/\">en línea</ulink>."
+"un servidor web, y que está disponible <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">en línea</ulink>."
#. type: Content of: <article><section><title>
msgid "About Debian Edu and Skolelinux"
@@ -95,9 +94,9 @@ msgid ""
msgstr ""
"Inmediatamente después de la instalación, el servidor de la escuela "
"ejecutará todos los servicios necesarios para que la red escolar sea "
-"funcional (vea el siguiente capítulo <link linkend=\"Architecture\">detalles "
-"de la arquitectura de esta configuración</link>), y estará lista para "
-"agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
+"funcional (vea el siguiente capítulo <link linkend=\"Architecture"
+"\">detalles de la arquitectura de esta configuración</link>), y estará lista "
+"para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
"cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
"preparado usando PXE, así, después de la instalación inicial del servidor "
"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
@@ -133,8 +132,8 @@ msgstr ""
"<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> es una "
"distribución de Linux, hecha por el proyecto Debian Edu. Siendo una "
"distribución <ulink url=\"http://wiki.debian.org/DebianPureBlends\">mezclada "
-"de Debian</ulink> es un sub-proyecto oficial de <ulink "
-"url=\"http://www.debian.org\">Debian</ulink> "
+"de Debian</ulink> es un sub-proyecto oficial de <ulink url=\"http://www."
+"debian.org\">Debian</ulink> "
#. type: Content of: <article><section><section><para>
msgid ""
@@ -156,8 +155,8 @@ msgstr ""
"El proyecto Skolelinux fué fundado en Noruega el 2 de julio de 2001, y casi "
"a la vez Raphaël Hertzog iniciaba el proyecto Debian Edu en Francia. Desde "
"el 2003, ambos proyectos trabajaron unidos, aunque los nombres permanecieron "
-"separados. \"Skole\" y (Debian-)\"Educativo\" son dos términos bien conocidos "
-"en estas regiones."
+"separados. \"Skole\" y (Debian-)\"Educativo\" son dos términos bien "
+"conocidos en estas regiones."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -263,10 +262,6 @@ msgstr ""
"sin disco, prueba de memoria o iniciar desde disco local. "
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change next-server in DHCP "
-#| "to have clients directly boot via PXE from the terminal server."
msgid ""
"This is designed to be modified - that is, you can have the NFS-root in "
"syslinux point to one of the LTSP servers or change the DHCP next-server "
@@ -279,9 +274,6 @@ msgstr ""
"puedan arrancar por medio de PXE desde el servidor de terminales."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated 192.168.0.0/24 network "
-#| "on the second interface and should seldom need to be changed."
msgid ""
"DHCPD on the LTSP servers only serves a dedicated network on the second "
"interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -307,9 +299,9 @@ msgid ""
"possible (but not required) to also select and install the thin-client-"
"server and workstation profiles in addition to the main server profile."
msgstr ""
-"Una red Skolelinux necesita un servidor principal (también llamado \"tjener\" "
-"que significa \"servidor\" en Noruego) que por defecto tenga la dirección IP "
-"10.0.2.2 y sea instalado seleccionando el perfil servidor principal. Es "
+"Una red Skolelinux necesita un servidor principal (también llamado \"tjener"
+"\" que significa \"servidor\" en Noruego) que por defecto tenga la dirección "
+"IP 10.0.2.2 y sea instalado seleccionando el perfil servidor principal. Es "
"posible (pero no requerido) seleccionar e instalar también los perfiles de "
"servidor de cliente ligero y estación de trabajo al perfil de servidor "
"principal."
@@ -449,7 +441,6 @@ msgid "Electronic Post Office"
msgstr "Correo Electrónico"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#| msgid "IMAP/POP3 (Dovecot)"
msgid "IMAP (Dovecot)"
msgstr "IMAP (Dovecot)"
@@ -586,11 +577,10 @@ msgid ""
"NFS for Unix clients, SMB for Windows and Macintosh clients."
msgstr ""
"Cada usuario almacena sus archivos personales en su directorio home que está "
-"disponible en el servidor. Los directorios Home están accesibles desde "
-"todas las máquinas, dando a los usuarios acceso independientemente del "
-"puesto que estén usando. El servidor opera sin importar el sistema "
-"operativo. Ofrece tanto NFS para clientes UNIX, como SMB para Windows y "
-"clientes Macintosh."
+"disponible en el servidor. Los directorios Home están accesibles desde todas "
+"las máquinas, dando a los usuarios acceso independientemente del puesto que "
+"estén usando. El servidor opera sin importar el sistema operativo. Ofrece "
+"tanto NFS para clientes UNIX, como SMB para Windows y clientes Macintosh."
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -8765,7 +8755,7 @@ msgstr "Nuevas características en Debin Edu Wheezy"
#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
#| "2012-03-11"
msgid ""
-"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-21"
+"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
"Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
"publicado el 11-03-2012"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 68bcc9d..ecffb36 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-09-30 19:15-0400\n"
"PO-Revision-Date: 2013-09-29 09:58+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -76,17 +76,6 @@ msgstr ""
"configurata per una scuola."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "Immediatly after installation a school server running all services needed "
-#| "for a school network is set up (see the next chapter <link linkend="
-#| "\"Architecture\">details of the architecture of this setup</link>), just "
-#| "waiting for users and machines being added via GOsa², a comfortable Web-"
-#| "UI, or any other LDAP editor. A netbooting environment is prepared using "
-#| "PXE, so after initial installation of the main server from CD, Blue-ray "
-#| "disc or USB flash drive all other machines can be installed via the "
-#| "network, this includes \"roaming workstations\" (ones that can be taken "
-#| "away from the school network, usually laptops or netbooks) as well as PXE "
-#| "booting for diskless machines like tradional thin-clients."
msgid ""
"Immediatly after installation a school server running all services needed "
"for a school network is set up (see the next chapter <link linkend="
@@ -198,15 +187,6 @@ msgid "The Debian Edu network topology"
msgstr "La topologia della rete Debian Edu"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "The figure is a sketch of the assumed network topology. The default setup "
-#| "of a Skolelinux network assumes that there is one (and only one) main-"
-#| "server, while allowing the inclusion of both normal workstations and thin-"
-#| "client-servers (with associated thin-clients). The number of workstations "
-#| "can be as large or small as you want (starting from none to a lot). The "
-#| "same goes for the thin-client servers, each of which is on a separate "
-#| "network so that the traffic between the thin-clients and the thin-client "
-#| "server doesn't affect the rest of the network services."
msgid ""
"The figure is a sketch of the assumed network topology. The default setup of "
"a Skolelinux network assumes that there is one (and only one) main-server, "
@@ -757,9 +737,6 @@ msgid "LTSP server(s) (Thin client server(s))"
msgstr "Server LTSP (server di thin-client)"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "A Skolelinux network can have many LTSP servers (also called thin client "
-#| "servers), which are installed by selecting the LTSP server profile."
msgid ""
"A Skolelinux network can have many LTSP servers (also called thin client "
"servers), which are installed by selecting the Thin client server profile."
@@ -920,10 +897,6 @@ msgid "Installation"
msgstr "Installazione"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Currently there are three kinds of installation media images: netinstall "
-#| "(CD) and i386-only DVD and multi-arch USB flash drive. All of these "
-#| "images can also be booted from USB sticks."
msgid ""
"Currently there are two kinds of installation media images: netinstall (CD) "
"and multi-arch USB flash drive. Both images can also be booted from USB "
@@ -6636,8 +6609,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 ""
@@ -8974,8 +8947,6 @@ msgid "New features in Debian Edu Wheezy"
msgstr "Nuove caratteristiche in Debian Edu Wheezy"
#. type: Content of: <article><section><section><title>
-#| msgid ""
-#| "New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-??-??"
msgid ""
"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
@@ -9172,7 +9143,6 @@ msgstr ""
"l'amministratore GOsa."
#. type: Content of: <article><section><section><section><title>
-#| msgid "Known issues with the image"
msgid "Known issues"
msgstr "Problemi noti"
@@ -9458,7 +9428,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 "
@@ -15863,13 +15833,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 ""
@@ -15881,8 +15851,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"
@@ -15890,8 +15860,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"
@@ -15908,8 +15878,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"
@@ -15917,8 +15887,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-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 723d48a..521d6f6 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-09-17 22:53+0300\n"
+"POT-Creation-Date: 2013-09-30 19:15-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -768,10 +768,10 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
"Terminal Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
@@ -1436,8 +1436,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"CD.iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-CD."
+"iso\">debian-edu-7.1+edu0-CD.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1445,8 +1445,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1479,8 +1479,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
-"USB.iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-USB."
+"iso\">debian-edu-7.1+edu0-USB.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1488,8 +1488,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"USB.iso|debian-edu-7.1+edu0-USB.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1529,9 +1529,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</"
-"computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1778,8 +1777,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "./images/Installer_help.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -2591,57 +2590,57 @@ msgstr ""
#, fuzzy
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2706,43 +2705,43 @@ msgstr ""
#, fuzzy
msgid "./images/13-Install+the+base+system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "13-Install the base system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<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/14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2773,29 +2772,29 @@ msgstr ""
#, fuzzy
msgid "./images/20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3579,8 +3578,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_list.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
@@ -3590,8 +3589,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_host_details.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
@@ -3612,8 +3611,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_add_netgroup.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
@@ -4135,8 +4134,8 @@ msgstr ""
#, fuzzy
msgid "./images/slbackup-php_maintenance.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -5972,10 +5971,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
-"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
-"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
-"harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
+"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
+"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
+"lokal harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -8684,7 +8683,7 @@ msgstr ""
#. type: Content of: <article><section><section><title>
#, fuzzy
msgid ""
-"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-21"
+"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Squeeze - utgitt 08.02.2010"
@@ -11140,16 +11139,16 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
-#~ "edu-7.1+edu0-DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
#, fuzzy
#~ msgid ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#~ "edu-7.1+edu0-DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+#~ "DVD.iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -11242,8 +11241,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-#~ "started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "getting-]started.png\"/></imageobject>"
#, fuzzy
#~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11266,8 +11265,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -12530,8 +12529,8 @@ msgstr ""
#~ "workstation server(s):"
#~ msgstr ""
#~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
-#~ "(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på "
+#~ "arbeidsstasjonstjener(ne):"
#~ msgid ""
#~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -14858,13 +14857,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 ""
@@ -14876,8 +14875,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"
@@ -14885,8 +14884,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"
@@ -14902,8 +14901,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"
@@ -14911,8 +14910,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-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 7383581..0c2baa0 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-09-19 08:51-0400\n"
+"POT-Creation-Date: 2013-09-30 19:15-0400\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"
@@ -6591,7 +6591,7 @@ msgstr ""
#. type: Content of: <article><section><section><title>
msgid ""
-"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-21"
+"New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28"
msgstr ""
#. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 2b1c4b4..f1d9fa4 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -2963,8 +2963,8 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<title>New features in Debian Edu Wheezy
</title>
-<section id="Features--New_features_for_Debian_Edu_7.1.2B-edu0_Codename_Wheezy_released_2013-09-21">
-<title>New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-21
+<section id="Features--New_features_for_Debian_Edu_7.1.2B-edu0_Codename_Wheezy_released_2013-09-28">
+<title>New features for Debian Edu 7.1+edu0 Codename Wheezy released 2013-09-28
</title>
<section id="Features--User_visible_changes">
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 117ad8e..05bd6d3 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 5d68ff7..e24af17 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 0edb657..5c881a3 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 3716b0f..34f892d 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list