[debian-edu-commits] debian-edu/debian-edu-doc.git (#1475) - master (branch) updated: 1.5_20130228_7.0-11-gb6661cd
David Prévot
taffit at alioth.debian.org
Fri May 31 14:18:41 UTC 2013
The branch, master has been updated
via b6661cdaced0e9d6883b01213c1eee2d420d91fc (commit)
from 6a0d78dc748f112983147b02a99378fc5bf7f0c3 (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 b6661cdaced0e9d6883b01213c1eee2d420d91fc
Author: David Prévot <taffit at debian.org>
Date: Fri May 31 10:16:49 2013 -0400
Update Wheezy manual and images from the wiki
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386809 -> 386842 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386913 -> 386940 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386850 -> 386883 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386843 -> 386879 bytes
.../debian-edu-wheezy-manual.da.po | 10 +-
.../debian-edu-wheezy-manual.de.po | 34 +++--
.../debian-edu-wheezy-manual.es.po | 8 +-
.../debian-edu-wheezy-manual.fr.po | 163 +++++++------------
.../debian-edu-wheezy-manual.it.po | 38 +++--
.../debian-edu-wheezy-manual.nb.po | 112 +++++++-------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 8 +-
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 5 +-
documentation/debian-edu-wheezy/fixme-status.txt | 2 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386809 -> 386842 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386913 -> 386940 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386850 -> 386883 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386843 -> 386879 bytes
17 files changed, 185 insertions(+), 195 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 7cb5fe7..84d2811 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 f38113e..6f66451 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 c3433f6..3dcbdf2 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 ea77c11..c026f2c 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.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index d67fbdd..0842176 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-0400\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -8566,7 +8566,9 @@ msgstr ""
"installationen, i logindskærmen og som baggrundsbillede."
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#, fuzzy
+#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
#. type: Content of: <article><section><section><section><title>
@@ -8708,6 +8710,10 @@ msgid "Other changes"
msgstr "Andre ændringer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
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 f303958..1869788 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-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-0400\n"
"PO-Revision-Date: 2013-05-12 11:52+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -773,8 +773,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)."
@@ -2103,8 +2103,8 @@ msgstr ""
"Wenn Sie von einer DVD installieren, enthält die Datei <computeroutput>/etc/"
"apt/sources.list</computeroutput> nur Quellen von der DVD. Wenn Sie eine "
"Internetverbindung haben, wird dringend empfohlen, die folgenden Zeilen zu "
-"der Datei hinzuzufügen. Damit stellen Sie sicher, dass (Sicherheits-)"
-"Aktualisierungen installiert werden können."
+"der Datei hinzuzufügen. Damit stellen Sie sicher, dass "
+"(Sicherheits-)Aktualisierungen installiert werden können."
#. type: CDATA
#, no-wrap
@@ -2931,14 +2931,14 @@ msgstr ""
"nicht. (Die Generierung der Kennungen kann in der Datei <computeroutput>/etc/"
"gosa/gosa.conf</computeroutput> angepasst werden; es könnte z.B. die "
"Voreinstellung <computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
-"computeroutput> geändert werden in <computeroutput>idGenerator=\"{%givenName"
-"[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den Benutzer »Peter "
-"Muster« die Kennung <computeroutput>pmuster</computeroutput> und für einen "
-"weiteren Benutzer mit gleichem Namen <computeroutput>pmuster01</"
-"computeroutput> generiert; in diesem Fall wären Kennungen maximal 25 Zeichen "
-"lang. Weitere Details erhalten Sie mittels <computeroutput>man 5 gosa.conf</"
-"computeroutput>. Legen Sie eine Sicherheitskopie von gosa.conf an, bevor Sie "
-"diese verändern!)"
+"computeroutput> geändert werden in <computeroutput>idGenerator="
+"\"{%givenName[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den "
+"Benutzer »Peter Muster« die Kennung <computeroutput>pmuster</computeroutput> "
+"und für einen weiteren Benutzer mit gleichem Namen "
+"<computeroutput>pmuster01</computeroutput> generiert; in diesem Fall wären "
+"Kennungen maximal 25 Zeichen lang. Weitere Details erhalten Sie mittels "
+"<computeroutput>man 5 gosa.conf</computeroutput>. Legen Sie eine "
+"Sicherheitskopie von gosa.conf an, bevor Sie diese verändern!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8697,7 +8697,9 @@ msgstr ""
"Hintergrund der Arbeitsfläche."
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#, fuzzy
+#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
#. type: Content of: <article><section><section><section><title>
@@ -8837,6 +8839,10 @@ msgid "Other changes"
msgstr "Sonstige Änderungen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
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 2a25120..4b31d0f 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-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-0400\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -8349,7 +8349,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -8495,6 +8495,10 @@ msgid "Other changes"
msgstr "paquete en"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index da8c02a..11b0416 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-0400\n"
"PO-Revision-Date: 2013-05-14 00:39+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -3287,8 +3287,7 @@ msgstr ""
"net groupmap list\n"
"\n"
"# Ajouter vos nouveaux groupes ou les groupes manquants :\n"
-"net groupmap add unixgroup=NOUVEAU_GROUPE type=domain "
-"ntgroup=\"NOUVEAU_GROUPE\"\\\n"
+"net groupmap add unixgroup=NOUVEAU_GROUPE type=domain ntgroup=\"NOUVEAU_GROUPE\"\\\n"
" comment=\"DESCRIPTION DU NOUVEAU GROUPE\""
#. type: Content of: <article><section><section><section><para>
@@ -3380,11 +3379,9 @@ msgstr ""
#, no-wrap
msgid ""
"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id "
-"ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id "
-"ether-00:0d:59:99:d6:98.\n"
+"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
@@ -3392,11 +3389,9 @@ msgid ""
"enter password: █"
msgstr ""
"root at tjener:~# sitesummary2ldapdhcp -a\n"
-"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id "
-"ether-00:02:b3:20:e4:aa.\n"
+"info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
"info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id "
-"ether-00:0d:59:99:d6:98.\n"
+"info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
@@ -4795,8 +4790,7 @@ msgid ""
msgstr ""
"$ sudo apt-get update\n"
"$ sudo apt-get install gnome-session gnome-terminal iceweasel xorg\n"
-"# après l'installation, démarrer une session graphique pour le premier "
-"utilisateur\n"
+"# après l'installation, démarrer une session graphique pour le premier utilisateur\n"
"$ startx"
#. type: Content of: <article><section><section><title>
@@ -4863,8 +4857,8 @@ msgid ""
msgstr ""
"Si vous préférez une interface graphique pour manipuler la base de données "
"LDAP, regardez du côté du paquet <computeroutput>jxplorer</computeroutput>, "
-"qui est installé par défaut. Pour obtenir l'accès en écriture, connectez vous "
-"comme ceci :"
+"qui est installé par défaut. Pour obtenir l'accès en écriture, connectez "
+"vous comme ceci :"
#. type: CDATA
#, no-wrap
@@ -4965,12 +4959,10 @@ msgstr "L'utilisation des paquets rétroportés est simple :"
#. type: CDATA
#, no-wrap
msgid ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt "
-"sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> "
-"/etc/apt/sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt/sources.list\n"
"apt-get update"
#. type: Content of: <article><section><section><para>
@@ -5149,8 +5141,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\""
@@ -5245,8 +5236,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\""
@@ -5261,8 +5251,7 @@ msgstr ""
" ln -s /media/$home $chemin_home/$home/$repertoire_partage\n"
" ((dossiers_crees+=1))\n"
" else\n"
-" echo -e \"le dossier $chemin_home/$home/$repertoire_partage existe "
-"déjà.\\n\"\n"
+" echo -e \"le dossier $chemin_home/$home/$repertoire_partage existe déjà.\\n\"\n"
" fi\n"
" done\n"
" echo \"Le nombre de dossiers créés est $dossiers_crees\""
@@ -5763,10 +5752,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 wheezy main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -5776,12 +5763,9 @@ msgstr ""
"apt-get install debian-keyring\n"
"# récupérez la clé pour le dépôt deb-multimedia de manière non sûre :\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-"# vérifiez avec certitude que la clé est correcte et si tel est le cas, "
-"l'ajouter au trousseau utilisé par apt :\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && "
-"gpg --export 1F41B907 | apt-key add -\n"
-"# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un "
-"miroir près de chez vous !\n"
+"# vérifiez avec certitude que la clé est correcte et si tel est le cas, l'ajouter au trousseau utilisé par apt :\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
+"# ajoutez le dépôt au fichier sources.list — cherchez sur la page web un miroir près de chez vous !\n"
"echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
"# mettez à jour la liste des paquets disponibles :\n"
"apt-get update"
@@ -5920,8 +5904,7 @@ msgstr ""
"ltsp-chroot -a i386 mkdir /tmp/user/0 2> /dev/null\n"
"ltsp-chroot -d -a i386 apt-get -y -q install <nom_paquet>\n"
"\n"
-"# Copiez la nouvelle image initiale (« initrd ») dans le répertoire tftpboot "
-"du serveur\n"
+"# Copiez la nouvelle image initiale (« initrd ») dans le répertoire tftpboot du serveur\n"
"ltsp-update-kernels"
#. type: Content of: <article><section><section><para>
@@ -5930,8 +5913,8 @@ msgid ""
"the tftpboot directory -- you could execute:"
msgstr ""
"Il existe une méthode alternative plus rapide, à savoir l'installation de "
-"tous les micrologiciels disponibles et la mise à jour du répertoire tftpboot, "
-"avec la commande :"
+"tous les micrologiciels disponibles et la mise à jour du répertoire "
+"tftpboot, avec la commande :"
#. type: CDATA
#, no-wrap
@@ -5996,10 +5979,9 @@ msgid ""
"amount of RAM is sufficient. If all clients in this LTSP client subnet "
"should run as thin clients, the following has to be done."
msgstr ""
-"Grâce au menu PXE par défaut sur le sous-réseau "
-"principal 10.0.0.0/8, une machine peut être démarrée comme une "
-"station de travail sans disque ou comme un client léger . Par défaut, les "
-"clients dans le sous-réseau séparé "
+"Grâce au menu PXE par défaut sur le sous-réseau principal 10.0.0.0/8, une "
+"machine peut être démarrée comme une station de travail sans disque ou comme "
+"un client léger . Par défaut, les clients dans le sous-réseau séparé "
"192.168.0.0/24 fonctionneront comme des stations sans disque si la quantité "
"de mémoire vide disponible est suffisante. Si tous les clients dans le sous-"
"réseau doivent fonctionner comme des clients légers, les manipulations "
@@ -6015,12 +5997,10 @@ msgid ""
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"(1) ouvrir le fichier /opt/ltsp/i386/etc/ltsp/update-kernels.conf avec un "
-"éditeur\n"
+"(1) ouvrir le fichier /opt/ltsp/i386/etc/ltsp/update-kernels.conf avec un éditeur\n"
"et remplacer la ligne\n"
"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
-"par CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False "
-"quiet\"\n"
+"par CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=False quiet\"\n"
"(2) exécuter 'ltsp-update-kernels'"
#. type: Content of: <article><section><section><title>
@@ -6122,15 +6102,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 ""
"#ajout des dépôts locaux des projets skole \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 Dépôt Logiciel Example\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
@@ -6174,12 +6152,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 ""
@@ -6191,12 +6165,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 ""
@@ -6259,14 +6229,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 ""
@@ -6283,9 +6247,9 @@ msgid ""
"As an alternative, you could use <computeroutput>ldapvi</computeroutput>, "
"search for 'next server tjener' and replace tjener with ltspserver00."
msgstr ""
-"Alternativement, vous pouvez utiliser <computeroutput>ldapvi</computeroutput>"
-", chercher la chaîne « next server tjener » et remplacer tjener par "
-"ltspserver00."
+"Alternativement, vous pouvez utiliser <computeroutput>ldapvi</"
+"computeroutput>, chercher la chaîne « next server tjener » et remplacer "
+"tjener par ltspserver00."
#. type: Content of: <article><section><section><title>
msgid "Changing network settings"
@@ -6391,10 +6355,10 @@ msgid ""
"address or IP address like this: <computeroutput>[192.168.0.10]</"
"computeroutput>."
msgstr ""
-"Les valeurs par défaut sont définies dans la section <computeroutput>"
-"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
-"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
-"computeroutput>."
+"Les valeurs par défaut sont définies dans la section "
+"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
+"indiquez son adresse MAC ou son adresse IP de cette manière : "
+"<computeroutput>[192.168.0.10]</computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -6628,8 +6592,7 @@ msgid ""
" echo $SHUFFLED_LIST"
msgstr ""
"#!/bin/bash\n"
-"# Mélanger les éléments de la liste des serveurs contenue dans le paramètre "
-"MY_SERVER_LIST\n"
+"# Mélanger les éléments de la liste des serveurs contenue dans le paramètre MY_SERVER_LIST\n"
"LISTE_TMP=\"\"\n"
"LISTE_MELANGE=\"\"\n"
"for i in $MY_SERVER_LIST; do\n"
@@ -6750,15 +6713,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 # cela fait un « chroot /opt/ltsp/i386 » et plus, comme "
-"par exemple empêcher le démarrage des démons\n"
+"ltsp-chroot -a i386 # cela fait un « chroot /opt/ltsp/i386 » et plus, comme par exemple empêcher le démarrage des démons\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
@@ -8195,8 +8156,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"
@@ -8232,14 +8192,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 Dépôt SMART\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:"
@@ -8305,18 +8263,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://10.0.2.2/dists/swbuild.asc\n"
"ltsp-chroot -a i386 apt-key add swbuild.asc\n"
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# mettre à jour la base de données dpkg et installer les paquets souhaités\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 ""
@@ -8782,7 +8736,9 @@ msgstr ""
"l'installation, sur l'écran de connexion et sur le fond d'écran du bureau."
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#, fuzzy
+#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
#. type: Content of: <article><section><section><section><title>
@@ -8921,6 +8877,10 @@ msgid "Other changes"
msgstr "Autres changements"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
@@ -9196,7 +9156,7 @@ msgstr ""
"langue s'il n'existe pas déjà et comment mettre à jour les traductions."
#. <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 "
@@ -9240,11 +9200,8 @@ msgstr "Annexe A — La Licence Publique Générale GNU"
#. type: CDATA
#, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
-msgstr ""
-"Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la "
-"licence GPL."
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note aux traducteurs : il n'est pas nécessaire de traduire le texte de la licence GPL."
#. type: Content of: <article><section><section><para>
msgid ""
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 a2c8ee2..26acff7 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-0400\n"
"PO-Revision-Date: 2013-05-12 17:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -6213,8 +6213,8 @@ msgid ""
msgstr ""
"Il valore di default è definito 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 ""
@@ -8536,7 +8536,9 @@ msgstr ""
"durante la installazione, nella schermata di login e come sfondo del desktop."
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#, fuzzy
+#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
#. type: Content of: <article><section><section><section><title>
@@ -8676,6 +8678,10 @@ msgid "Other changes"
msgstr "Altre modifiche"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
@@ -15188,13 +15194,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 ""
@@ -15206,8 +15212,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"
@@ -15215,8 +15221,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"
@@ -15233,8 +15239,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"
@@ -15242,8 +15248,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 4c3bef0..a46963c 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-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-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"
@@ -870,10 +870,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>
@@ -2052,8 +2052,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "[attachment: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>
msgid ""
@@ -2931,29 +2931,29 @@ msgstr ""
#, fuzzy
msgid "[attachment: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>
#, fuzzy
msgid "[attachment: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>
#, fuzzy
msgid "[attachment: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>
#, 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>"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -2983,22 +2983,22 @@ msgstr "Sett passord"
#, fuzzy
msgid "[attachment: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>
#, fuzzy
msgid "[attachment: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>
#, fuzzy
msgid "[attachment: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>
msgid "[attachment:18-Build LTSP chroot.png]"
@@ -3015,15 +3015,15 @@ msgstr ""
#, fuzzy
msgid "[attachment: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>
#, 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>"
#. type: Content of: <article><section><section><para>
msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
@@ -3759,8 +3759,8 @@ msgstr ""
#, fuzzy
msgid "[attachment: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>
msgid "[attachment:gosa_systems_host_details.png]"
@@ -3774,8 +3774,8 @@ msgstr ""
#, fuzzy
msgid "[attachment: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>
msgid ""
@@ -4373,8 +4373,8 @@ msgstr ""
#, fuzzy
msgid "[attachment: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><title>
msgid "Server Monitoring"
@@ -6273,10 +6273,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>"
@@ -9287,7 +9287,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -9420,6 +9420,10 @@ msgid "Other changes"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
@@ -11820,8 +11824,8 @@ msgstr ""
#, 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>"
#, fuzzy
#~| msgid "Set passwords"
@@ -11852,8 +11856,8 @@ msgstr ""
#, 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>"
#, fuzzy
#~| msgid "Requirements for a network setup"
@@ -13076,8 +13080,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"
@@ -15404,13 +15408,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 ""
@@ -15422,8 +15426,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"
@@ -15431,8 +15435,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"
@@ -15448,8 +15452,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"
@@ -15457,8 +15461,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 78b8a39..793b526 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-05-11 18:29-0400\n"
+"POT-Creation-Date: 2013-05-31 09:58-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"
@@ -6282,7 +6282,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+msgid "FIXME: hopefully. h01ger is asking around."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -6403,6 +6403,10 @@ msgid "Other changes"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "New XFCE desktop task."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"LTSP clients start as diskless workstation / thin client can be configured "
"via command line argument -- or individually adding an entry in lts.conf or "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 75093de..87b6f68 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -2922,7 +2922,7 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
<para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper.
</para></listitem></itemizedlist>
<para>
-FIXME: hopefully. h01ger is one it to ask gismo.
+FIXME: hopefully. h01ger is asking around.
</para>
</section>
@@ -3020,6 +3020,9 @@ FIXME: hopefully. h01ger is one it to ask gismo.
</title>
<itemizedlist>
<listitem>
+<para>New XFCE desktop task.
+</para></listitem>
+<listitem>
<para>LTSP clients start as diskless workstation / thin client can be configured via command line argument -- or individually adding an entry in lts.conf or LDAP.
</para></listitem>
<listitem>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index c644e28..e0484af 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -17,7 +17,7 @@ FIXME: describe roaming profile key for the global policy editor here
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead.
-FIXME: hopefully. h01ger is one it to ask gismo.
+FIXME: hopefully. h01ger is asking around.
====================
11 FIXMEs left to fix
====================
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 7cb5fe7..84d2811 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 f38113e..6f66451 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 c3433f6..3dcbdf2 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 ea77c11..c026f2c 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