[debian-edu-commits] debian-edu/debian-edu-doc.git (#1558) - master (branch) updated: 1.5_20130727_7.1-7-g2b74ec6

Holger Levsen holger at alioth.debian.org
Sun Aug 25 22:31:21 UTC 2013


The branch, master has been updated
       via  2b74ec6e42212d65ae01fba2de566e45ef30287d (commit)
      from  1756525f209a3ab594bbc913cc532bd81af4c44a (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 2b74ec6e42212d65ae01fba2de566e45ef30287d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 26 00:31:11 2013 +0200

    Update manual and images from the wiki

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    1 +
 documentation/audacity/audacity-manual.pot         |    2 +-
 .../debian-edu-squeeze-manual.pot                  |    2 +-
 .../debian-edu-squeeze/images/de/worldmap.png      |  Bin 386753 -> 386844 bytes
 .../debian-edu-squeeze/images/es/worldmap.png      |  Bin 386852 -> 386944 bytes
 .../debian-edu-squeeze/images/fr/worldmap.png      |  Bin 386793 -> 386884 bytes
 .../debian-edu-squeeze/images/worldmap.png         |  Bin 386788 -> 386880 bytes
 .../debian-edu-wheezy-manual.da.po                 |  643 ++++++++------
 .../debian-edu-wheezy-manual.de.po                 |  662 ++++++++------
 .../debian-edu-wheezy-manual.es.po                 |  440 ++++++----
 .../debian-edu-wheezy-manual.fr.po                 |  902 ++++++++++++--------
 .../debian-edu-wheezy-manual.it.po                 |  882 +++++++++++--------
 .../debian-edu-wheezy-manual.nb.po                 |  554 +++++++-----
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot |  422 +++++----
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml |  245 +++---
 .../debian-edu-wheezy/images/de/worldmap.png       |  Bin 386760 -> 386844 bytes
 .../debian-edu-wheezy/images/es/worldmap.png       |  Bin 386858 -> 386944 bytes
 .../debian-edu-wheezy/images/fr/worldmap.png       |  Bin 386800 -> 386884 bytes
 .../debian-edu-wheezy/images/worldmap.png          |  Bin 386795 -> 386880 bytes
 documentation/rosegarden/rosegarden-manual.es.po   |   60 +-
 documentation/rosegarden/rosegarden-manual.fr.po   |   59 +-
 documentation/rosegarden/rosegarden-manual.nb.po   |   64 +-
 documentation/rosegarden/rosegarden-manual.pot     |   17 +-
 documentation/rosegarden/rosegarden-manual.xml     |   10 +-
 24 files changed, 2978 insertions(+), 1987 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7ad70fc..bd23b5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-edu-doc (1.5~20130XXX~7.1) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * Update German images
   * Update manual and images from the wiki
 
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index c69f85e..f1dd340 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-07 16:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:25+0300\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"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 6b7f6a0..5d0e49e 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-07 16:01+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\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"
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 7e05ea4..f1c9029 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 184d3b5..6d0f063 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 5ad677c..43fceec 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 f64d95f..8aa2cb1 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 929fafb..c599eb5 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-08-07 15:13+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\n"
 "PO-Revision-Date: 2013-07-18 11:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1802,14 +1802,6 @@ msgstr ""
 "yderligere installationer udføres via PXE, da dette automatisk vil bruge "
 "proxyen for hovedserveren."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-"Opstartsparametre tilgængelige under installation med cd-aftryk for "
-"netinstallation, ikke under installation med aftryk for flere arkitekturer."
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
@@ -2966,13 +2958,27 @@ msgstr ""
 "til LDAP-datatræet for Debian Edus hovedserver."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A default Debian Edu main server installation currently provides two "
+#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
+#| "tree. Student accounts are intended to be added to the \"Students\" "
+#| "department, teachers to the \"Teachers\" department; systems (servers, "
+#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
+#| "added to the base level. Find your own scheme for customising this "
+#| "structure."
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 "En standardinstallation af hovedserveren for Debian Edu tilbyder aktuelt to "
 "»afdelinger« (departments): Lærere og studenter, plus basisniveauet for LDAP-"
@@ -3055,29 +3061,8 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
-msgstr ""
-"Hvis du ikke bryder dig om det oprettede brugernavn, så kan du vælge et "
-"andet brugernavn tilbudt i rullegardinboksen, men du har ikke frit valg her "
-"i guiden. (Brugernavnsoprettelse kan tilpasses i <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, ændring af f.eks. standardposten "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"til <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> vil oprette brugernavnet <computeroutput>pmuster</"
-"computeroutput> for brugeren »Peter Muster« og <computeroutput>pmuster01</"
-"computeroutput> for den næste bruger med det samme navn. Maksimumlængden for "
-"brugernavne i dette tilfælde ville være 25; se <computeroutput>man 5 gosa."
-"conf</computeroutput> for yderligere detaljer. Lav en sikkerhedskopi af gosa."
-"conf før du ændrer i den!)"
+"wizard."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -3766,6 +3751,16 @@ msgstr ""
 "internetproxy kan dette være brugbart ved eksamener."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Another important part of machine configuration is the 'Samba host' flag "
+#| "(in the 'Host information' area). If you plan to add existing Windows "
+#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
+#| "to the LDAP tree and set this flag to be able to join the Windows host to "
+#| "the domain. For more information about adding Windows hosts to the "
+#| "Skolelinux network see the <link linkend=\"NetworkClients--"
+#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -3773,8 +3768,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "En anden vigtig del af maskinkonfigurationen er flaget »Samba host« (i "
 "området »Host information«). Hvis du planlægger at tilføje eksisterende "
@@ -4384,10 +4379,16 @@ msgid "More information about Debian Edu customisations"
 msgstr "Yderligere information om Debian Edu-tilpasninger"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Edu customisations useful for system "
+#| "administrators can be found in the <link linkend=\"Administration"
+#| "\">Administration Howto chapter</link>."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Yderligere information om Debian Edu-tilpasninger, der er brugbare for "
 "systemadministratorer, kan ses i <link linkend=\"Administration"
@@ -4605,6 +4606,16 @@ msgstr ""
 "Hjælp for <link linkend=\"Administration\">generel administration</link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"Hjælp for <link linkend=\"Administration\">generel administration</link>"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr "Hjælp for <link linkend=\"Desktop\">skrivebordet</link>"
 
@@ -5182,217 +5193,6 @@ msgstr ""
 "apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr "kørsel af uafhængige Javaprogrammer"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-"Uafhængige Javaprogrammer understøttes direkte af kørselstiden OpenJDK Java."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr "Kørsel af Javaprogrammer i internetbrowseren"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-"Kørsel af Javaminiprogrammer i browseren er understøttet direkte af OpenJDK "
-"Java-kørselstiden."
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Oprette mapper i hjemmemapperne for alle brugere"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-"Med dette skript kan administratoren oprette en mappe i hver brugers "
-"hjemmemappe og angive adgangsrettigheder og ejerskab."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-"I eksemplet vist nedenfor med gruppe=lærere (group=teachers) og "
-"rettigheder=2770 kan en bruger indlevere en opgave ved at gemme filen i "
-"mappen »assignments« (opgaver) hvor lærere har fået skriveadgang så de kan "
-"lave kommentarer."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        chown $user:$group $home_path/$home/$shared_folder\n"
-"        ((created_dir+=1))\n"
-"    else\n"
-"        echo -e \"the folder $home_path/$home/$shared_folder findes allerede.\\n\"\n"
-"    fi\n"
-" done\n"
-" echo \"$created_dir mapper er blevet oprettet\""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Nem adgang til USB-drev og cd-rom'er/dvd'er"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-"Når brugere indsætter et USB-drev eller en dvd/cdrom til en (diskløs) "
-"arbejdsstation, så vises et pop op-vindue på samme måde som i enhver anden "
-"normal installation."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-"Når brugere indsætter et USB-drev eller en dvd/cdrom i en tynd klient, så er "
-"der kun et påmindelsesvindue, der vises i et par sekunder. Mediet monteres "
-"automatisk og det kan tilgås ved at gå til mappen /media/$user. Dette er ret "
-"så svært for mange uerfarne brugere."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-"Det er muligt at vise den normale KDE-filhåndtering Dolphin hvis KDE (eller "
-"LDXE, såfremt installeret parallelt med KDE) er i brug som skrivebordsmiljø. "
-"For at konfigurere dette, så kør <computeroutput>/usr/share/debian-edu-"
-"config/ltspfs-mounter-kde enable</computeroutput> på terminalserveren. (Når "
-"der bruges Gnome, så vil enhedsikoner blive placeret på skrivebordet hvilket "
-"giver nem adgang)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-"Derudover kan det følgende skript bruges til at oprette den symbolske "
-"henvisning »media« for alle brugere i deres hjemmemappe for nem adgang til "
-"USB-drev, cdrom/dvd eller hvad for et medie som nu tilfældigvis er "
-"tilsluttet til den tynde klient. Dette kan være nyttigt, hvis brugere ønsker "
-"at redigere filer direkte på deres tilsluttede medie."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        ln -s /media/$home $home_path/$home/$shared_folder\n"
-"        ((created_dir+=1))\n"
-"    else\n"
-"        echo -e \"mappen $home_path/$home/$shared_folder findes allerede.\\n\"\n"
-"    fi\n"
-" done\n"
-" echo \"$created_dir mapper er blevet oprettet\""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr "En advarsel om flytbart medie på LTSP-servere"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-"Advarsel: Når isat en LTSP-server så giver USB-drev og andre eksterne medier "
-"pop op-beskeder på eksterne LTSP-klienter."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-"Hvis eksterne brugere accepterer pop op'en eller bruger pmount fra "
-"konsollen, så kan de endda montere de flytbare enheder og tilgå filerne."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dette spores som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu "
-"bug #1376</ulink>."
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisk oprydning af tilbageværende processer"
 
@@ -5712,6 +5512,293 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Administration"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid "User Management with GOsa²"
+msgid "User Customisations with GOsa²"
+msgstr "Brugerhåndtering med GOsa²"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role=\"strong\">Almindeligt navn</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Minimal</emphasis>"
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role=\"strong\">Minimal</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Oprette mapper i hjemmemapperne for alle brugere"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+"Med dette skript kan administratoren oprette en mappe i hver brugers "
+"hjemmemappe og angive adgangsrettigheder og ejerskab."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+"I eksemplet vist nedenfor med gruppe=lærere (group=teachers) og "
+"rettigheder=2770 kan en bruger indlevere en opgave ved at gemme filen i "
+"mappen »assignments« (opgaver) hvor lærere har fået skriveadgang så de kan "
+"lave kommentarer."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        chown $user:$group $home_path/$home/$shared_folder\n"
+"        ((created_dir+=1))\n"
+"    else\n"
+"        echo -e \"the folder $home_path/$home/$shared_folder findes allerede.\\n\"\n"
+"    fi\n"
+" done\n"
+" echo \"$created_dir mapper er blevet oprettet\""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Nem adgang til USB-drev og cd-rom'er/dvd'er"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
+msgstr ""
+"Når brugere indsætter et USB-drev eller en dvd/cdrom til en (diskløs) "
+"arbejdsstation, så vises et pop op-vindue på samme måde som i enhver anden "
+"normal installation."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
+msgstr ""
+"Når brugere indsætter et USB-drev eller en dvd/cdrom i en tynd klient, så er "
+"der kun et påmindelsesvindue, der vises i et par sekunder. Mediet monteres "
+"automatisk og det kan tilgås ved at gå til mappen /media/$user. Dette er ret "
+"så svært for mange uerfarne brugere."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
+msgstr ""
+"Det er muligt at vise den normale KDE-filhåndtering Dolphin hvis KDE (eller "
+"LDXE, såfremt installeret parallelt med KDE) er i brug som skrivebordsmiljø. "
+"For at konfigurere dette, så kør <computeroutput>/usr/share/debian-edu-"
+"config/ltspfs-mounter-kde enable</computeroutput> på terminalserveren. (Når "
+"der bruges Gnome, så vil enhedsikoner blive placeret på skrivebordet hvilket "
+"giver nem adgang)."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
+msgstr ""
+"Derudover kan det følgende skript bruges til at oprette den symbolske "
+"henvisning »media« for alle brugere i deres hjemmemappe for nem adgang til "
+"USB-drev, cdrom/dvd eller hvad for et medie som nu tilfældigvis er "
+"tilsluttet til den tynde klient. Dette kan være nyttigt, hvis brugere ønsker "
+"at redigere filer direkte på deres tilsluttede medie."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+msgstr ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        ln -s /media/$home $home_path/$home/$shared_folder\n"
+"        ((created_dir+=1))\n"
+"    else\n"
+"        echo -e \"mappen $home_path/$home/$shared_folder findes allerede.\\n\"\n"
+"    fi\n"
+" done\n"
+" echo \"$created_dir mapper er blevet oprettet\""
+
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
+msgstr "En advarsel om flytbart medie på LTSP-servere"
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
+msgstr ""
+"Advarsel: Når isat en LTSP-server så giver USB-drev og andre eksterne medier "
+"pop op-beskeder på eksterne LTSP-klienter."
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
+msgstr ""
+"Hvis eksterne brugere accepterer pop op'en eller bruger pmount fra "
+"konsollen, så kan de endda montere de flytbare enheder og tilgå filerne."
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
+msgstr ""
+"Dette spores som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian Edu "
+"bug #1376</ulink>."
+
+#. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "Hjælp for skrivebordet"
 
@@ -8387,6 +8474,33 @@ msgstr ""
 "logindet, så skal du også ændre adgangskoden med GOsa²."
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr "kørsel af uafhængige Javaprogrammer"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+"Uafhængige Javaprogrammer understøttes direkte af kørselstiden OpenJDK Java."
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr "Kørsel af Javaprogrammer i internetbrowseren"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+"Kørsel af Javaminiprogrammer i browseren er understøttet direkte af OpenJDK "
+"Java-kørselstiden."
+
+#. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr "Brug af e-post"
 
@@ -11332,6 +11446,41 @@ msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "Boot parameters available when installing from the netinstall CD image, "
+#~ "not when installing from the multi-arch image"
+#~ msgstr ""
+#~ "Opstartsparametre tilgængelige under installation med cd-aftryk for "
+#~ "netinstallation, ikke under installation med aftryk for flere "
+#~ "arkitekturer."
+
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard. (Username generation can be customized in <computeroutput>/"
+#~ "etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> would generate the username "
+#~ "<computeroutput>pmuster</computeroutput> for a user \"Peter Muster\" and "
+#~ "<computeroutput>pmuster01</computeroutput> for the next user with the "
+#~ "same full name.  The maximum length for usernames in this case would be "
+#~ "25; see <computeroutput>man 5 gosa.conf</computeroutput> for more "
+#~ "details. Backup gosa.conf before editing it!)"
+#~ msgstr ""
+#~ "Hvis du ikke bryder dig om det oprettede brugernavn, så kan du vælge et "
+#~ "andet brugernavn tilbudt i rullegardinboksen, men du har ikke frit valg "
+#~ "her i guiden. (Brugernavnsoprettelse kan tilpasses i <computeroutput>/etc/"
+#~ "gosa/gosa.conf</computeroutput>, ændring af f.eks. standardposten "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> til <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> vil oprette brugernavnet "
+#~ "<computeroutput>pmuster</computeroutput> for brugeren »Peter Muster« og "
+#~ "<computeroutput>pmuster01</computeroutput> for den næste bruger med det "
+#~ "samme navn. Maksimumlængden for brugernavne i dette tilfælde ville være "
+#~ "25; se <computeroutput>man 5 gosa.conf</computeroutput> for yderligere "
+#~ "detaljer. Lav en sikkerhedskopi af gosa.conf før du ændrer i den!)"
+
 #~ msgid "./images/30-ThinClient-LDM_Login.png"
 #~ msgstr "./images/30-ThinClient-LDM_Login.png"
 
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 cee26a2..4883007 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-08-07 15:13+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\n"
 "PO-Revision-Date: 2013-07-09 23:59+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1843,14 +1843,6 @@ msgstr ""
 "haben, sollten weitere Installationen via PXE erfolgen, da dann automatisch "
 "der Proxy des Hauptservers benutzt wird."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-"Boot-Parameter, die bei einer Installation von der »netinst«-CD, aber nicht "
-"mittels Multi-Arch-Image verfügbar sind "
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
@@ -3027,13 +3019,27 @@ msgstr ""
 "abzubilden. "
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A default Debian Edu main server installation currently provides two "
+#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
+#| "tree. Student accounts are intended to be added to the \"Students\" "
+#| "department, teachers to the \"Teachers\" department; systems (servers, "
+#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
+#| "added to the base level. Find your own scheme for customising this "
+#| "structure."
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 "Eine Standardinstallation von Debian Edu stellt gegenwärtig die beiden "
 "»Abteilungen« Teachers und Students zur Verfügung; hinzu kommt die "
@@ -3118,30 +3124,8 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
-msgstr ""
-"Wenn Ihnen die generierte Kennung nicht gefällt, können Sie aus dem Drop-"
-"Down-Menü eine andere wählen - eine freie Wahl bietet der Assistent jedoch "
-"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!)"
+"wizard."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -3851,6 +3835,16 @@ msgstr ""
 "den Web-Proxy könnte dies während Prüfungen Verwendung finden."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Another important part of machine configuration is the 'Samba host' flag "
+#| "(in the 'Host information' area). If you plan to add existing Windows "
+#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
+#| "to the LDAP tree and set this flag to be able to join the Windows host to "
+#| "the domain. For more information about adding Windows hosts to the "
+#| "Skolelinux network see the <link linkend=\"NetworkClients--"
+#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -3858,8 +3852,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "Ein weiterer wichtiger Punkt der Maschinen-Konfiguration ist die Option "
 "»Samba host« (im Bereich »Host Information«).Falls Sie vorhaben, bereits "
@@ -4484,10 +4478,16 @@ msgid "More information about Debian Edu customisations"
 msgstr "Weitergehende Informationen über Anpassungen von Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Edu customisations useful for system "
+#| "administrators can be found in the <link linkend=\"Administration"
+#| "\">Administration Howto chapter</link>."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Für Systemadministratoren finden sich Informationen über Anpassungen von "
 "Debian Edu im Kapitel <link linkend=\"Administration\">Administration-Howto</"
@@ -4717,6 +4717,17 @@ msgstr ""
 "Allgemeinen</link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"HowTos für die <link linkend=\"Administration\">Administration im "
+"Allgemeinen</link>"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr "HowTos für <link linkend=\"Desktop\">die Arbeitsfläche</link>"
 
@@ -5308,225 +5319,6 @@ msgstr ""
 "apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr "Java-Anwendungen ausführen"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-"Java-Anwendungen werden durch die OpenJDK-Java-Laufzeitumgebung "
-"voreingestellt unterstützt."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr "Java-Anwendungen im Webbrowser ausführen"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-"Java-Anwendungen im Browser werden durch die OpenJDK-Java-Laufzeitumgebung "
-"voreingestellt unterstützt."
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Ordner in den Home-Verzeichnissen aller Nutzer erstellen"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-"Mit diesem Skript kann der Administrator einen Ordner im Home-Verzeichnis "
-"eines jeden Nutzers erstellen und Zugriffsrechte sowie den Besitzer "
-"einstellen."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-"Im Beispiel unten mit group=teachers (die Gruppe Lehrer) und "
-"permissions=2770 (die Zugriffsrechte des Ordners für die gemeinsame Ablage) "
-"kann ein Nutzer eine Arbeit abgeben, indem er die Datei im Ordner »Arbeiten« "
-"speichert. In diesem Ordner besitzen Lehrer (genauer: alle Nutzer in der "
-"Gruppe teachers) Schreibrechte, um beispielsweise Kommentare hinzuzufügen."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"Arbeiten\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        # Richtige Gruppe und richtigen Benutzer setzen\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir Verzeichnisse wurden angelegt\""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Einfacher Zugriff auf USB-Laufwerke und CD-ROMs/DVDs"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-"Wenn Benutzer an einem Arbeitsplatzrechner oder einer Diskless Workstation "
-"ein USB-Laufwerk anschließen oder eine DVD/CD-ROM  einlegen, erscheint ein "
-"Popup-Fenster mit der Frage, was damit passieren soll - genau wie bei jeder "
-"normalen Installation."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-"Wenn Benutzer ein USB-Laufwerk an ein Terminal anschließen oder dort eine "
-"DVD/CD-ROM in ein Laufwerk einlegen, dann erscheint lediglich für einige "
-"Sekunden eine Benachrichtigung auf dem Bildschirm. Der Datenträger wird "
-"automatisch eingebunden und steht im Ordner /media/$user zum Zugriff bereit. "
-"Für unerfahrene Nutzer ist es recht schwierig, dies zu verstehen."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-"Wenn KDE (oder LXDE, falls zusätzlich zu KDE installiert) als graphische "
-"Benutzerumgebung verwendet wird, dann ist es möglich, das System so "
-"einzurichten, dass (voreingestellt) der KDE-Dateimanager Dolphin startet. "
-"Führen Sie dazu einfach <computeroutput>/usr/share/debian-edu-config/ltspfs-"
-"mounter-kde enable</computeroutput> auf dem Terminal-Server aus. (Falls "
-"Gnome verwendet wird, werden Gerätesymbole auf der Arbeitsfläche erscheinen, "
-"wodurch ein einfacher Zugriff gegeben ist.)"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-"Mit dem folgenden Skript wird ein symbolischer Verweis »media« für alle "
-"Nutzer im Home-Verzeichnis angelegt. Dieser ermöglicht den einfachen Zugriff "
-"auf USB-Laufwerke, CD-ROMs oder andere ähnliche Medien, die an ein Terminal "
-"angeschlossen werden. Dies könnte nützlich sein, wenn ein Benutzer Dateien "
-"direkt auf dem angeschlossenen Gerät bearbeiten will."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr "Warnhinweis zu Wechseldatenträgern auf LTSP-Servern"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-"Achtung: Wenn ein USB-Laufwerk oder ein anderer Wechseldatenträger an einen "
-"LTSP-Server angeschlossen wird, löst das eine Popup-Meldung auf den "
-"angeschlossenen LTSP-Clients aus."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-"Wenn ein entfernter Nutzer das Popup-Fenster entsprechend quittiert oder in "
-"der Konsole pmount verwendet, kann er sogar das Gerät einhängen und hat "
-"Zugriff auf die Dateien."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dieser Fehler wird unter <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian-Edu-Fehler #1376</ulink> verfolgt."
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisches Aufräumen übrig gebliebener Prozesse"
 
@@ -5850,6 +5642,300 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Administration"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid "User Management with GOsa²"
+msgid "User Customisations with GOsa²"
+msgstr "Benutzerverwaltung mit GOsa²"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role=\"strong\">Üblicher Name</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Minimal</emphasis>"
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role=\"strong\">Minimal</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Ordner in den Home-Verzeichnissen aller Nutzer erstellen"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+"Mit diesem Skript kann der Administrator einen Ordner im Home-Verzeichnis "
+"eines jeden Nutzers erstellen und Zugriffsrechte sowie den Besitzer "
+"einstellen."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+"Im Beispiel unten mit group=teachers (die Gruppe Lehrer) und "
+"permissions=2770 (die Zugriffsrechte des Ordners für die gemeinsame Ablage) "
+"kann ein Nutzer eine Arbeit abgeben, indem er die Datei im Ordner »Arbeiten« "
+"speichert. In diesem Ordner besitzen Lehrer (genauer: alle Nutzer in der "
+"Gruppe teachers) Schreibrechte, um beispielsweise Kommentare hinzuzufügen."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"Arbeiten\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        # Richtige Gruppe und richtigen Benutzer setzen\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir Verzeichnisse wurden angelegt\""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Einfacher Zugriff auf USB-Laufwerke und CD-ROMs/DVDs"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
+msgstr ""
+"Wenn Benutzer an einem Arbeitsplatzrechner oder einer Diskless Workstation "
+"ein USB-Laufwerk anschließen oder eine DVD/CD-ROM  einlegen, erscheint ein "
+"Popup-Fenster mit der Frage, was damit passieren soll - genau wie bei jeder "
+"normalen Installation."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
+msgstr ""
+"Wenn Benutzer ein USB-Laufwerk an ein Terminal anschließen oder dort eine "
+"DVD/CD-ROM in ein Laufwerk einlegen, dann erscheint lediglich für einige "
+"Sekunden eine Benachrichtigung auf dem Bildschirm. Der Datenträger wird "
+"automatisch eingebunden und steht im Ordner /media/$user zum Zugriff bereit. "
+"Für unerfahrene Nutzer ist es recht schwierig, dies zu verstehen."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
+msgstr ""
+"Wenn KDE (oder LXDE, falls zusätzlich zu KDE installiert) als graphische "
+"Benutzerumgebung verwendet wird, dann ist es möglich, das System so "
+"einzurichten, dass (voreingestellt) der KDE-Dateimanager Dolphin startet. "
+"Führen Sie dazu einfach <computeroutput>/usr/share/debian-edu-config/ltspfs-"
+"mounter-kde enable</computeroutput> auf dem Terminal-Server aus. (Falls "
+"Gnome verwendet wird, werden Gerätesymbole auf der Arbeitsfläche erscheinen, "
+"wodurch ein einfacher Zugriff gegeben ist.)"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
+msgstr ""
+"Mit dem folgenden Skript wird ein symbolischer Verweis »media« für alle "
+"Nutzer im Home-Verzeichnis angelegt. Dieser ermöglicht den einfachen Zugriff "
+"auf USB-Laufwerke, CD-ROMs oder andere ähnliche Medien, die an ein Terminal "
+"angeschlossen werden. Dies könnte nützlich sein, wenn ein Benutzer Dateien "
+"direkt auf dem angeschlossenen Gerät bearbeiten will."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+msgstr ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
+msgstr "Warnhinweis zu Wechseldatenträgern auf LTSP-Servern"
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
+msgstr ""
+"Achtung: Wenn ein USB-Laufwerk oder ein anderer Wechseldatenträger an einen "
+"LTSP-Server angeschlossen wird, löst das eine Popup-Meldung auf den "
+"angeschlossenen LTSP-Clients aus."
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
+msgstr ""
+"Wenn ein entfernter Nutzer das Popup-Fenster entsprechend quittiert oder in "
+"der Konsole pmount verwendet, kann er sogar das Gerät einhängen und hat "
+"Zugriff auf die Dateien."
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
+msgstr ""
+"Dieser Fehler wird unter <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian-Edu-Fehler #1376</ulink> verfolgt."
+
+#. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "HowTos für die graphische Arbeitsumgebung"
 
@@ -8583,6 +8669,34 @@ msgstr ""
 "sollten Sie dies sofort ebenfalls mit GOsa² durchführen."
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr "Java-Anwendungen ausführen"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+"Java-Anwendungen werden durch die OpenJDK-Java-Laufzeitumgebung "
+"voreingestellt unterstützt."
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr "Java-Anwendungen im Webbrowser ausführen"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+"Java-Anwendungen im Browser werden durch die OpenJDK-Java-Laufzeitumgebung "
+"voreingestellt unterstützt."
+
+#. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr "Verwendung von E-Mail"
 
@@ -11596,6 +11710,42 @@ msgstr ""
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
 "werden."
 
+#~ msgid ""
+#~ "Boot parameters available when installing from the netinstall CD image, "
+#~ "not when installing from the multi-arch image"
+#~ msgstr ""
+#~ "Boot-Parameter, die bei einer Installation von der »netinst«-CD, aber "
+#~ "nicht mittels Multi-Arch-Image verfügbar sind "
+
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard. (Username generation can be customized in <computeroutput>/"
+#~ "etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> would generate the username "
+#~ "<computeroutput>pmuster</computeroutput> for a user \"Peter Muster\" and "
+#~ "<computeroutput>pmuster01</computeroutput> for the next user with the "
+#~ "same full name.  The maximum length for usernames in this case would be "
+#~ "25; see <computeroutput>man 5 gosa.conf</computeroutput> for more "
+#~ "details. Backup gosa.conf before editing it!)"
+#~ msgstr ""
+#~ "Wenn Ihnen die generierte Kennung nicht gefällt, können Sie aus dem Drop-"
+#~ "Down-Menü eine andere wählen - eine freie Wahl bietet der Assistent "
+#~ "jedoch 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!)"
+
 #~ msgid "./images/30-ThinClient-LDM_Login.png"
 #~ msgstr "./images/30-ThinClient-LDM_Login.png"
 
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 59eea1c..56a2d9a 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-08-07 15:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\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"
@@ -2283,12 +2283,6 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 #| msgid ""
@@ -3670,7 +3664,12 @@ msgid ""
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3725,16 +3724,7 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
+"wizard."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -4455,8 +4445,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "Esto se explica detalladamente en el capítulo <ulink url=\"http://wiki."
 "debian.org/DebianEdu/Documentation/Wheezy/GettingStarted/DebianEdu/"
@@ -4961,7 +4951,8 @@ msgstr "Más información sobre personalizaciones de Debian Edu"
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "<ulink url=\"/DebianEdu/Documentation/Lenny/Requirements\">Requisitos</"
 "ulink>para usar Debian-Edu"
@@ -5177,6 +5168,15 @@ msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
+"ulink> de este documento"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr ""
 "<ulink url='/DebianEdu/Documentation/Lenny/Translations'>Traducciones</"
@@ -5711,151 +5711,6 @@ msgstr ""
 "apt-get dist-upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Creando directorios en el directorio home de los usuarios"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Fácil acceso a dispositivos USB y CDROMs/DVDs"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-msgid "A warning about removable media on LTSP servers"
-msgstr "Configurando el menú PXE"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr ""
 
@@ -6130,6 +5985,231 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Administración"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid "User Management with GOsa²"
+msgid "User Customisations with GOsa²"
+msgstr "Gestión de usuarios con GOsa²"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role=\"strong\">nombre común</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">role</emphasis>"
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role=\"strong\">rol</emphasis>,"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+msgid "Other User Customisations"
+msgstr "Otros temas"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Creando directorios en el directorio home de los usuarios"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Fácil acceso a dispositivos USB y CDROMs/DVDs"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><title>
+#, fuzzy
+msgid "A warning about removable media on LTSP servers"
+msgstr "Configurando el menú PXE"
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><title>
+#, fuzzy
 msgid "HowTos for the desktop"
 msgstr "Administración de Usuarios"
 
@@ -8290,6 +8370,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid "Using email"
 msgstr "Usar correo electrónico"
@@ -14971,10 +15075,6 @@ msgstr ""
 #~ "promocionar <ulink url='http://www.deb-multimedia.org/'>http://www.deb-"
 #~ "multimedia.org/</ulink> o algún otro sitio?"
 
-#, fuzzy
-#~ msgid "Other solutions"
-#~ msgstr "Otros temas"
-
 #~ msgid "FIXME: describe Groups, Machine and Machine Administration here."
 #~ msgstr ""
 #~ "POR CORREGIR: describir Grupos, Máquinas y Administración de las Máquinas "
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 7b387c9..bf838cb 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: debian-edu-doc\n"
-"POT-Creation-Date: 2013-08-07 15:13+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\n"
 "PO-Revision-Date: 2013-07-23 16:13+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1855,14 +1855,6 @@ msgstr ""
 "installations futures seront faites à l'aide de PXE, car elles utiliseront "
 "automatiquement le mandataire du serveur principal."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-"Paramètres d’amorçage disponibles en installant à partir du CD, pas à partir "
-"de l’image multiarchitecture"
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
@@ -3047,13 +3039,27 @@ msgstr ""
 "données LDAP du serveur principal Debian Edu."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "A default Debian Edu main server installation currently provides two "
+#| "\"departments\": Teachers and Students, plus the base level of the LDAP "
+#| "tree. Student accounts are intended to be added to the \"Students\" "
+#| "department, teachers to the \"Teachers\" department; systems (servers, "
+#| "Skolelinux workstations, Windows machines, printers etc.) are currently "
+#| "added to the base level. Find your own scheme for customising this "
+#| "structure."
 msgid ""
 "A default Debian Edu main server installation currently provides two "
 "\"departments\": Teachers and Students, plus the base level of the LDAP "
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 "Une installation par défaut du serveur Debian Edu fournit actuellement deux "
 "« départements » : Enseignants et Étudiants, en plus du niveau de base de "
@@ -3139,31 +3145,8 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
-msgstr ""
-"Si vous n'aimez pas l'identifiant créé automatiquement, vous pouvez en "
-"choisir un autre dans le menu déroulant, mais vous ne pouvez pas choisir "
-"librement dans l'assistant. (La création d'identifiant peut être "
-"personnalisée dans <computeroutput>/etc/gosa/gosa.conf</computeroutput>, en "
-"modifiant par exemple l'entrée par défaut <computeroutput>idGenerator="
-"\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> en "
-"<computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput>, ce qui créerait l'identifiant <computeroutput>pmuster</"
-"computeroutput> pour l'utilisateur « Peter Muster » et "
-"<computeroutput>pmuster01</computeroutput> pour le prochain utilisateur "
-"portant le même nom. La taille maximum pour les identifiants serait dans ce "
-"cas 25 ; Veuillez consulter <computeroutput>man 5 gosa.conf</computeroutput> "
-"pour de plus amples renseignements. Faites une sauvegarde de gosa.conf avant "
-"de l'éditer !)"
+"wizard."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -3874,6 +3857,16 @@ msgstr ""
 "mandataire web, cela peut être utilisé durant les examens."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Another important part of machine configuration is the 'Samba host' flag "
+#| "(in the 'Host information' area). If you plan to add existing Windows "
+#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
+#| "to the LDAP tree and set this flag to be able to join the Windows host to "
+#| "the domain. For more information about adding Windows hosts to the "
+#| "Skolelinux network see the <link linkend=\"NetworkClients--"
+#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -3881,8 +3874,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "Un autre point important de la configuration de la machine est le drapeau "
 "« Samba host » (dans la section « Host information »). Si vous envisagez "
@@ -4513,10 +4506,16 @@ msgstr ""
 "Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Edu customisations useful for system "
+#| "administrators can be found in the <link linkend=\"Administration"
+#| "\">Administration Howto chapter</link>."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Des informations supplémentaires sur les personnalisations de Debian Edu, "
 "utiles aux administrateurs système, sont disponibles dans le chapitre "
@@ -4744,6 +4743,16 @@ msgstr ""
 "Manuels d'<link linkend=\"Administration\">administration générale</link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"Manuels d'<link linkend=\"Administration\">administration générale</link>"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr "Manuels pour <link linkend=\"Desktop\">le bureau</link>"
 
@@ -5339,223 +5348,6 @@ msgstr ""
 "apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr "Exécuter des applications Java indépendantes"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-"Les applications indépendantes Java sont pris en charge par défaut par "
-"l'environnement d'exécution Java OpenJDK."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr "Exécuter des applications Java dans le navigateur Internet"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-"L'exécution d'applications Java dans le navigateur est prise en charge par "
-"défaut par l'environnement d'exécution Java OpenJDK."
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Créer un répertoire dans le répertoire personnel de chaque utilisateur"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-"Grâce à ce script, l'administrateur peut créer un répertoire dans le "
-"répertoire personnel de chaque utilisateur et en modifier les permissions et "
-"droits d'accès."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-"Dans l'exemple ci-dessous, avec group=teachers et permissions=2770 un "
-"utilisateur peut remettre un devoir en déposant le fichier dans le "
-"répertoire « assignments » dans lequel les professeurs ont des droits "
-"d'écriture pour pouvoir donner des commentaires."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-"#!/bin/bash\n"
-" chemin_home=\"/skole/tjener/home0\"\n"
-" dossier=\"devoirs\"\n"
-" permissions=\"2770\"\n"
-" dossiers_crees=0\n"
-" for home in $(ls $chemin_home); do\n"
-"    if [ ! -d \"$chemin_home/$home/$dossier\" ]; then\n"
-"        mkdir $chemin_home/$home/$dossier\n"
-"        chmod $permissions $chemin_home/$home/$dossier\n"
-"        #définir le bon propriétaire et le bon groupe\n"
-"        utilisateur=$home\n"
-"        groupe=enseignants\n"
-"        chown $utilisateur:$groupe $chemin_home/$home/$dossier\n"
-"        ((dossiers_crees+=1))\n"
-"    else\n"
-"        echo -e \"Le dossier $chemin_home/$home/$dossier existe déjà.\\n\"\n"
-"    fi\n"
-" done\n"
-" echo \"Le nombre de répertoires créés est $dossiers_crees.\""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Accès facile aux disques USB et aux CD et DVD"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans une "
-"station de travail (sans disque dur), une fenêtre apparaît et demande quoi "
-"faire avec, comme dans toute autre installation."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans un "
-"client léger, seule une fenêtre de notification apparaît pour quelques "
-"secondes. Le média est automatiquement monté et il est possible d'y accéder "
-"en naviguant dans le répertoire /media/$user. C'est assez difficile pour de "
-"nombreux utilisateurs non expérimentés."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-"Il est possible de faire en sorte que Dolphin, le gestionnaire de fichiers "
-"par défaut de KDE, s'affiche si KDE (ou LDXE, s'il est installé "
-"conjointement avec KDE) est utilisé comme environnement de bureau. Pour "
-"configurer ce comportement, exécutez simplement <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> sur le serveur "
-"de terminaux. (Si c'est Gnome qui est utilisé, des icônes seront placés sur "
-"le bureau permettant un accès facile)."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-"Grâce au script suivant, un lien symbolique appelé  « media » est créé pour "
-"chaque utilisateur dans le répertoire personnel pour faciliter l'accès aux "
-"disques USB, CD, ou tout autre support connecté au client léger. Cela peut "
-"s'avérer utile si des utilisateurs veulent éditer des fichiers directement "
-"sur les périphériques connectés."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-"#!/bin/bash\n"
-" chemin_home=\"/skole/tjener/home0\"\n"
-" repertoire_partage=\"media\"\n"
-" permissions=\"775\"\n"
-" dossiers_crees=0;\n"
-" for home in $(ls $chemin_home); do\n"
-"    if [ ! -d \"$chemin_home/$home/$repertoire_partage\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"Le nombre de dossiers créés est $dossiers_crees\""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr ""
-"Avertissement à propos des périphériques amovibles sur les serveurs LTSP"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-"Avertissement : quand vous insérez un disque USB ou tout autre périphérique "
-"amovible dans un serveur LTSP, une fenêtre apparaît sur les clients LTSP "
-"distants."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-"Quand les utilisateurs distants confirment le message ou utilisent pmount "
-"depuis la console, ils sont capables de monter le périphérique amovible et "
-"d'accéder à son contenu."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Ce problème est suivi dans le <ulink url=\"http://bugs.skolelinux."
-"org/1376\">bogue Debian Edu nº 1376</ulink>."
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr "Nettoyage automatique des processus résiduels"
 
@@ -5730,155 +5522,447 @@ msgstr ""
 "Voici un exemple <computeroutput>/etc/shutdown-at-night/clients-generator</"
 "computeroutput> à utiliser avec sitesummary :"
 
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  sitesummary-nodes -w"
-msgstr ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  sitesummary-nodes -w"
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  sitesummary-nodes -w"
+msgstr ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  sitesummary-nodes -w"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"An alternative if the netgroup is used to activate shutdown-at-night on "
+"clients is this script using the netgroup tool from the <computeroutput>ng-"
+"utils</computeroutput> package:"
+msgstr ""
+"Si le groupe réseau est utilisé pour activer shutdown-at-night sur les "
+"clients, il est possible d'utiliser ce script en utilisant l'utilitaire "
+"netgroup du paquet <computeroutput>ng-utils</computeroutput>."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  netgroup -h shutdown-at-night-hosts"
+msgstr ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  netgroup -h shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><title>
+msgid "Access Debian-Edu servers located behind a firewall"
+msgstr "Accéder à un serveur Debian-Edu situé derrière un pare-feu"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To access machines behind a firewall from the Internet, consider installing "
+"the package <computeroutput>autossh</computeroutput>.  It can be used to set "
+"up an SSH tunnel to a machine on the Internet that you have access to. From "
+"that machine, you can access the server behind the firewall via the SSH "
+"tunnel."
+msgstr ""
+"Pour accéder à des machines derrière un pare-feu depuis Internet, vous "
+"pouvez installer le paquet <computeroutput>autossh</computeroutput>. Il peut "
+"être utilisé pour préparer un tunnel SSH vers une machine à laquelle vous "
+"avez accès. À partir de cette machine, vous pouvez accéder au serveur "
+"derrière le pare-feu via le tunnel SSH"
+
+#. type: Content of: <article><section><section><title>
+msgid ""
+"Installing additional service machines for spreading the load from main-"
+"server"
+msgstr ""
+"Installer d'autres machines fournissant un service additionnel pour "
+"décharger le serveur principal"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In the default installation, all services are running on the main-server, "
+"tjener. To simplify moving some to another machine, there is a "
+"<emphasis>minimal</emphasis> installation profile available. Installing with "
+"this profile will lead to a machine, which is part of the Debian Edu "
+"network, but which doesn't have any services running (yet)."
+msgstr ""
+"Dans l'installation par défaut, tous les services tournent sur tjener, le "
+"serveur principal. Pour simplifier le déplacement d'un service vers une "
+"autre machine, il existe un profil d'installation <emphasis>minimal</"
+"emphasis>. L'installation de ce profil donnera une machine faisant partie du "
+"réseau Debian Edu, mais n'exécutant aucun service (pour le moment)."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"These are the required steps to setup a machine dedicated to some services:"
+msgstr ""
+"Voici les étapes à suivre pour configurer une machine dédiée à certains "
+"services :"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"install the <emphasis>minimal</emphasis> profile using the <emphasis>debian-"
+"edu-expert</emphasis> boot-option"
+msgstr ""
+"Installez le profil <emphasis>minimal</emphasis> en utilisant l'option de "
+"démarrage <emphasis>debian-edu-expert</emphasis>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "install the packages for the service"
+msgstr "installer les paquets requis pour le service"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "configure the service"
+msgstr "configurer le service"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "disable the service on main-server"
+msgstr "désactiver le service sur le serveur principal"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "update DNS (via LDAP/GOsa²) on main-server"
+msgstr "mettre à jour le DNS (à l'aide de LDAP/GOsa²) sur le serveur principal"
+
+#. type: Content of: <article><section><section><title>
+msgid "HowTos from wiki.debian.org"
+msgstr "Manuels de wiki.debian.org"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
+"either user- or developer-specific. Let's move the user-specific HowTos over "
+"here (and delete them over there)! (But first ask the authors (see the "
+"history of those pages to find them) if they are fine with moving the howto "
+"and putting it under the GPL.)"
+msgstr ""
+"Les manuels de <ulink url='http://wiki.debian.org/DebianEdu/HowTo/'>http://"
+"wiki.debian.org/DebianEdu/HowTo/</ulink> sont destinés soit aux "
+"utilisateurs, soit aux développeurs. Déplaçons les manuels utilisateur ici ! "
+"(Mais, demandons avant aux auteurs — consulter l'historique de ces pages "
+"pour les trouver — s'ils sont d'accord pour déplacer les manuels et les "
+"placer sous GPL.)"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
+msgstr ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
+
+#. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Administration"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid "User Management with GOsa²"
+msgid "User Customisations with GOsa²"
+msgstr "Gestion des utilisateurs avec GOsa²"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role=\"strong\">Nom usuel</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Minimal</emphasis>"
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role=\"strong\">Minimal</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Créer un répertoire dans le répertoire personnel de chaque utilisateur"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+"Grâce à ce script, l'administrateur peut créer un répertoire dans le "
+"répertoire personnel de chaque utilisateur et en modifier les permissions et "
+"droits d'accès."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+"Dans l'exemple ci-dessous, avec group=teachers et permissions=2770 un "
+"utilisateur peut remettre un devoir en déposant le fichier dans le "
+"répertoire « assignments » dans lequel les professeurs ont des droits "
+"d'écriture pour pouvoir donner des commentaires."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+"#!/bin/bash\n"
+" chemin_home=\"/skole/tjener/home0\"\n"
+" dossier=\"devoirs\"\n"
+" permissions=\"2770\"\n"
+" dossiers_crees=0\n"
+" for home in $(ls $chemin_home); do\n"
+"    if [ ! -d \"$chemin_home/$home/$dossier\" ]; then\n"
+"        mkdir $chemin_home/$home/$dossier\n"
+"        chmod $permissions $chemin_home/$home/$dossier\n"
+"        #définir le bon propriétaire et le bon groupe\n"
+"        utilisateur=$home\n"
+"        groupe=enseignants\n"
+"        chown $utilisateur:$groupe $chemin_home/$home/$dossier\n"
+"        ((dossiers_crees+=1))\n"
+"    else\n"
+"        echo -e \"Le dossier $chemin_home/$home/$dossier existe déjà.\\n\"\n"
+"    fi\n"
+" done\n"
+" echo \"Le nombre de répertoires créés est $dossiers_crees.\""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Accès facile aux disques USB et aux CD et DVD"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"An alternative if the netgroup is used to activate shutdown-at-night on "
-"clients is this script using the netgroup tool from the <computeroutput>ng-"
-"utils</computeroutput> package:"
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
 msgstr ""
-"Si le groupe réseau est utilisé pour activer shutdown-at-night sur les "
-"clients, il est possible d'utiliser ce script en utilisant l'utilitaire "
-"netgroup du paquet <computeroutput>ng-utils</computeroutput>."
+"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans une "
+"station de travail (sans disque dur), une fenêtre apparaît et demande quoi "
+"faire avec, comme dans toute autre installation."
 
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts"
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
 msgstr ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts"
-
-#. type: Content of: <article><section><section><title>
-msgid "Access Debian-Edu servers located behind a firewall"
-msgstr "Accéder à un serveur Debian-Edu situé derrière un pare-feu"
+"Quand les utilisateurs insèrent un disque USB, un CD ou un DVD dans un "
+"client léger, seule une fenêtre de notification apparaît pour quelques "
+"secondes. Le média est automatiquement monté et il est possible d'y accéder "
+"en naviguant dans le répertoire /media/$user. C'est assez difficile pour de "
+"nombreux utilisateurs non expérimentés."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"To access machines behind a firewall from the Internet, consider installing "
-"the package <computeroutput>autossh</computeroutput>.  It can be used to set "
-"up an SSH tunnel to a machine on the Internet that you have access to. From "
-"that machine, you can access the server behind the firewall via the SSH "
-"tunnel."
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
 msgstr ""
-"Pour accéder à des machines derrière un pare-feu depuis Internet, vous "
-"pouvez installer le paquet <computeroutput>autossh</computeroutput>. Il peut "
-"être utilisé pour préparer un tunnel SSH vers une machine à laquelle vous "
-"avez accès. À partir de cette machine, vous pouvez accéder au serveur "
-"derrière le pare-feu via le tunnel SSH"
+"Il est possible de faire en sorte que Dolphin, le gestionnaire de fichiers "
+"par défaut de KDE, s'affiche si KDE (ou LDXE, s'il est installé "
+"conjointement avec KDE) est utilisé comme environnement de bureau. Pour "
+"configurer ce comportement, exécutez simplement <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> sur le serveur "
+"de terminaux. (Si c'est Gnome qui est utilisé, des icônes seront placés sur "
+"le bureau permettant un accès facile)."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"Installing additional service machines for spreading the load from main-"
-"server"
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
 msgstr ""
-"Installer d'autres machines fournissant un service additionnel pour "
-"décharger le serveur principal"
+"Grâce au script suivant, un lien symbolique appelé  « media » est créé pour "
+"chaque utilisateur dans le répertoire personnel pour faciliter l'accès aux "
+"disques USB, CD, ou tout autre support connecté au client léger. Cela peut "
+"s'avérer utile si des utilisateurs veulent éditer des fichiers directement "
+"sur les périphériques connectés."
 
-#. type: Content of: <article><section><section><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"In the default installation, all services are running on the main-server, "
-"tjener. To simplify moving some to another machine, there is a "
-"<emphasis>minimal</emphasis> installation profile available. Installing with "
-"this profile will lead to a machine, which is part of the Debian Edu "
-"network, but which doesn't have any services running (yet)."
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
 msgstr ""
-"Dans l'installation par défaut, tous les services tournent sur tjener, le "
-"serveur principal. Pour simplifier le déplacement d'un service vers une "
-"autre machine, il existe un profil d'installation <emphasis>minimal</"
-"emphasis>. L'installation de ce profil donnera une machine faisant partie du "
-"réseau Debian Edu, mais n'exécutant aucun service (pour le moment)."
+"#!/bin/bash\n"
+" chemin_home=\"/skole/tjener/home0\"\n"
+" repertoire_partage=\"media\"\n"
+" permissions=\"775\"\n"
+" dossiers_crees=0;\n"
+" for home in $(ls $chemin_home); do\n"
+"    if [ ! -d \"$chemin_home/$home/$repertoire_partage\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"Le nombre de dossiers créés est $dossiers_crees\""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"These are the required steps to setup a machine dedicated to some services:"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
 msgstr ""
-"Voici les étapes à suivre pour configurer une machine dédiée à certains "
-"services :"
+"Avertissement à propos des périphériques amovibles sur les serveurs LTSP"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"install the <emphasis>minimal</emphasis> profile using the <emphasis>debian-"
-"edu-expert</emphasis> boot-option"
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
 msgstr ""
-"Installez le profil <emphasis>minimal</emphasis> en utilisant l'option de "
-"démarrage <emphasis>debian-edu-expert</emphasis>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "install the packages for the service"
-msgstr "installer les paquets requis pour le service"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "configure the service"
-msgstr "configurer le service"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "disable the service on main-server"
-msgstr "désactiver le service sur le serveur principal"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "update DNS (via LDAP/GOsa²) on main-server"
-msgstr "mettre à jour le DNS (à l'aide de LDAP/GOsa²) sur le serveur principal"
-
-#. type: Content of: <article><section><section><title>
-msgid "HowTos from wiki.debian.org"
-msgstr "Manuels de wiki.debian.org"
+"Avertissement : quand vous insérez un disque USB ou tout autre périphérique "
+"amovible dans un serveur LTSP, une fenêtre apparaît sur les clients LTSP "
+"distants."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
-"either user- or developer-specific. Let's move the user-specific HowTos over "
-"here (and delete them over there)! (But first ask the authors (see the "
-"history of those pages to find them) if they are fine with moving the howto "
-"and putting it under the GPL.)"
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
 msgstr ""
-"Les manuels de <ulink url='http://wiki.debian.org/DebianEdu/HowTo/'>http://"
-"wiki.debian.org/DebianEdu/HowTo/</ulink> sont destinés soit aux "
-"utilisateurs, soit aux développeurs. Déplaçons les manuels utilisateur ici ! "
-"(Mais, demandons avant aux auteurs — consulter l'historique de ces pages "
-"pour les trouver — s'ils sont d'accord pour déplacer les manuels et les "
-"placer sous GPL.)"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+"Quand les utilisateurs distants confirment le message ou utilisent pmount "
+"depuis la console, ils sont capables de monter le périphérique amovible et "
+"d'accéder à son contenu."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
-"\"/>"
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
-"\"/>"
+"Ce problème est suivi dans le <ulink url=\"http://bugs.skolelinux."
+"org/1376\">bogue Debian Edu nº 1376</ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
@@ -8638,6 +8722,34 @@ msgstr ""
 "changer aussi avec GOsa²."
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr "Exécuter des applications Java indépendantes"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+"Les applications indépendantes Java sont pris en charge par défaut par "
+"l'environnement d'exécution Java OpenJDK."
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr "Exécuter des applications Java dans le navigateur Internet"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+"L'exécution d'applications Java dans le navigateur est prise en charge par "
+"défaut par l'environnement d'exécution Java OpenJDK."
+
+#. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr "Utilisation du courrier électronique"
 
@@ -11676,6 +11788,42 @@ msgstr ""
 "ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
 "html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
 
+#~ msgid ""
+#~ "Boot parameters available when installing from the netinstall CD image, "
+#~ "not when installing from the multi-arch image"
+#~ msgstr ""
+#~ "Paramètres d’amorçage disponibles en installant à partir du CD, pas à "
+#~ "partir de l’image multiarchitecture"
+
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard. (Username generation can be customized in <computeroutput>/"
+#~ "etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> would generate the username "
+#~ "<computeroutput>pmuster</computeroutput> for a user \"Peter Muster\" and "
+#~ "<computeroutput>pmuster01</computeroutput> for the next user with the "
+#~ "same full name.  The maximum length for usernames in this case would be "
+#~ "25; see <computeroutput>man 5 gosa.conf</computeroutput> for more "
+#~ "details. Backup gosa.conf before editing it!)"
+#~ msgstr ""
+#~ "Si vous n'aimez pas l'identifiant créé automatiquement, vous pouvez en "
+#~ "choisir un autre dans le menu déroulant, mais vous ne pouvez pas choisir "
+#~ "librement dans l'assistant. (La création d'identifiant peut être "
+#~ "personnalisée dans <computeroutput>/etc/gosa/gosa.conf</computeroutput>, "
+#~ "en modifiant par exemple l'entrée par défaut <computeroutput>idGenerator="
+#~ "\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> en "
+#~ "<computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
+#~ "computeroutput>, ce qui créerait l'identifiant <computeroutput>pmuster</"
+#~ "computeroutput> pour l'utilisateur « Peter Muster » et "
+#~ "<computeroutput>pmuster01</computeroutput> pour le prochain utilisateur "
+#~ "portant le même nom. La taille maximum pour les identifiants serait dans "
+#~ "ce cas 25 ; Veuillez consulter <computeroutput>man 5 gosa.conf</"
+#~ "computeroutput> pour de plus amples renseignements. Faites une sauvegarde "
+#~ "de gosa.conf avant de l'éditer !)"
+
 #~ msgid "./images/30-ThinClient-LDM_Login.png"
 #~ msgstr "./images/30-ThinClient-LDM_Login.png"
 
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 0ace611..49e6b47 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-08-07 15:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\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"
@@ -1874,12 +1874,6 @@ msgstr ""
 "ulteriori installazioni dovrebbero essere fatti via PXE, in quanto questi "
 "utilizzeranno automaticamente il proxy del server principale."
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
@@ -3078,7 +3072,12 @@ msgid ""
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 "Una installazione di default del server Debian Edu principale offre "
 "attualmente due \"dipartimenti\": Insegnanti e Studenti, oltre il livello "
@@ -3162,30 +3161,8 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
-msgstr ""
-"Se si vuol cambiare il nome utente generato è possibile selezionare un altro "
-"nome utente tra quelli proposti nella casella a discesa, ma non si è liberi "
-"di gestirlo nella procedura guidata (la generazione dell'ID utente può "
-"essere personalizzata in <computeroutput>/etc/gosa/ gosa.conf </"
-"computeroutput> cambiando le entrate di default <computeroutput>idGenerator="
-"\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> a "
-"<computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> dovrebbe generare l'username <computeroutput>pmuster</"
-"computeroutput> per l'utente \"Peter Muster\" e <computeroutput>pmuster01</"
-"computeroutput> per un altro utente con lo stesso nome. La lunghezza massima "
-"per l'username in questo caso dovrebbe essere 25; vedere <computeroutput>man "
-"5 gosa.conf</computeroutput> per i dettagli.) Fare il backup di gosa.conf "
-"prima di modificarlo!)"
+"wizard."
+msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -3884,6 +3861,16 @@ msgstr ""
 "potrebbero essere utilizzate durante gli esami."
 
 #. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Another important part of machine configuration is the 'Samba host' flag "
+#| "(in the 'Host information' area). If you plan to add existing Windows "
+#| "systems to the Skolelinux Samba domain, you need to add the Windows host "
+#| "to the LDAP tree and set this flag to be able to join the Windows host to "
+#| "the domain. For more information about adding Windows hosts to the "
+#| "Skolelinux network see the <link linkend=\"NetworkClients--"
+#| "Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
+#| "\">HowTo/NetworkClients</link> chapter of this manual."
 msgid ""
 "Another important part of machine configuration is the 'Samba host' flag (in "
 "the 'Host information' area). If you plan to add existing Windows systems to "
@@ -3891,8 +3878,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "Un'altra importante parte della configurazione delle macchine è la casella "
 "'Samba host' (nella sezione 'Host information'). Se si progetta di "
@@ -4502,10 +4489,16 @@ msgid "More information about Debian Edu customisations"
 msgstr "Maggiori informazioni per personalizzare Debian Edu"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Edu customisations useful for system "
+#| "administrators can be found in the <link linkend=\"Administration"
+#| "\">Administration Howto chapter</link>."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Maggiori informazioni sulla personalizzazione di Debian Edu utile per gli "
 "amministratori di sistema possono essere trovate nel capitolo <link linkend="
@@ -4741,6 +4734,16 @@ msgstr ""
 "HowTo per <link linkend=\"Administration\">amministrazione generale</link>"
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "HowTos for <link linkend=\"Administration\">general administration</link>"
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"HowTo per <link linkend=\"Administration\">amministrazione generale</link>"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr "HowTo per <link linkend=\"Desktop\">il desktop</link>"
 
@@ -5322,235 +5325,6 @@ msgstr ""
 "apt-get upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr "eseguire applicazioni Java standalone"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-"Le applicazioni Java standalone sono supportate out of the box da OpenJDK "
-"Java runtime."
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr "Eseguire le applicazioni Java nel browser web"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-"Le applicazioni Java sono supportate out of the box da OpenJDK Java runtime."
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Creare cartelle in tutte le home directory degli utenti"
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-"Con questo script l'amministratore può creare una cartella in tutte le home "
-"directory degli utenti e impostare permessi e proprietà."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-"Nell'esempio mostarto sotto con il gruppo=teachers e i permessi=2770 un "
-"utente può correggere un compito salvando il file nella cartella "
-"\"assignments\" dove gli insegnanti hanno accesso di scrittura per fare "
-"commenti."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Accesso facile a drive USB e CDROM/DVD"
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
-#| "a popup window appears asking what to do with it, just like in any other "
-#| "normal installation."
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-"Quando gli utenti inseriscono un drive USB o DVD/CDROM dentro una (diskless) "
-"workstation, si attiva una finestra popup che chiede cosa si vuole fare, "
-"come in ogni altra normale installazione."
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
-#| "only a notify-window showing up for a few seconds. The media is "
-#| "automatically mounted and it is possible to access it browsing to the /"
-#| "media/$user folder. This is quite difficult for many non experienced "
-#| "users."
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-"Quando gli utenti inseriscono un componente usb o un DVD/CDROM in un thin "
-"client viene mostrata una finestra popup per pochi secondi.  Il supporto è "
-"automaticamente montato ed è possibile accederci nella cartella /media/"
-"$user. Questo può essere problematico per utenti non esperti."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-"E' possibile avere Dolphin, il desktop manager di default per KDE file "
-"manager Dolphin se KDE (o LDXE, se installato in parallelo con KDE) è in uso "
-"come ambiente di desktop. Per configurarlo va eseguito <computeroutput>/usr/"
-"share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> su un "
-"terminal server. (Quando si usa Gnome, le icone saranno visibili sul desktop "
-"permettendo un accesso facilitato)."
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "In addition the following script could be used to create the symlink "
-#| "\"media\" for all users in their home folder for easy access to USB "
-#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
-#| "might come in handy if users want to edit files directly on their plugged "
-#| "in media."
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-"In aggiunta lo script seguente dovrebbe essere usato per creare un "
-"collegamento a \"media\" nella home directory di0 tutti gli utenti  per "
-"avere un accesso più facile ai drive USB, ai CDROM o ad altri media connessi "
-"ai thin client."
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr "Un avvertimento sui media rimovibili sui server LTSP"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-"Attenzione: Quando si inserisce in un server LTSP un drive USB e altri media "
-"rimovibili questo fa apparire un messaggio popup sui client LTSP remoti."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-"Quando un utente remoto vede la finestra popup o usa pmount da console, può "
-"montare i dispositivi rimovibili e accedere ai file."
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Questo è indicato come <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
-"Edu bug #1376</ulink>."
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr "Pulitura automatica dei processi pendenti"
 
@@ -5733,139 +5507,444 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"An alternative if the netgroup is used to activate shutdown-at-night on "
-"clients is this script using the netgroup tool from the <computeroutput>ng-"
-"utils</computeroutput> package:"
+"An alternative if the netgroup is used to activate shutdown-at-night on "
+"clients is this script using the netgroup tool from the <computeroutput>ng-"
+"utils</computeroutput> package:"
+msgstr ""
+"Se si usa il netgroup un'alternativa per l'attivazione di shutdown-at-night "
+"sui clients è data da questo script con l'uso degli strumenti di netgroup "
+"dal pacchetto <computeroutput>ng-utils</computeroutput>:"
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  netgroup -h shutdown-at-night-hosts"
+msgstr ""
+"#!/bin/sh\n"
+"  PATH=/usr/sbin:$PATH\n"
+"  export PATH\n"
+"  netgroup -h shutdown-at-night-hosts"
+
+#. type: Content of: <article><section><section><title>
+msgid "Access Debian-Edu servers located behind a firewall"
+msgstr "Accedere ai server Debian-Edu che si trova dietro un firewall"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"To access machines behind a firewall from the Internet, consider installing "
+"the package <computeroutput>autossh</computeroutput>.  It can be used to set "
+"up an SSH tunnel to a machine on the Internet that you have access to. From "
+"that machine, you can access the server behind the firewall via the SSH "
+"tunnel."
+msgstr ""
+"Per accedere a macchine protette con un firewall da Internet, è "
+"consigliabile installare il pacchetto <computeroutput>autossh</"
+"computeroutput>. Può essere utilizzato per istituire un tunnel SSH ad una "
+"macchina che ha accesso a internet. Da quella macchina, è possibile accedere "
+"al server dietro il firewall tramite tunnel SSH."
+
+#. type: Content of: <article><section><section><title>
+msgid ""
+"Installing additional service machines for spreading the load from main-"
+"server"
+msgstr ""
+"Installare servizi aggiuntivi sulle macchine per distribuire il carico del "
+"server principale"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"In the default installation, all services are running on the main-server, "
+"tjener. To simplify moving some to another machine, there is a "
+"<emphasis>minimal</emphasis> installation profile available. Installing with "
+"this profile will lead to a machine, which is part of the Debian Edu "
+"network, but which doesn't have any services running (yet)."
+msgstr ""
+"In una installazione di default, tutti i servizi sono in esecuzione sul "
+"server principale, tjener. Per semplificare il trasferimento alcuni di "
+"un'altra macchina, vi è una profilo di installazione <emphasis>minimal</"
+"emphasis>. Installare con questo profilo porterà a una macchina, che è parte "
+"della rete Debian Edu, ma che non ha alcun servizio attivato (ancora)."
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"These are the required steps to setup a machine dedicated to some services:"
+msgstr ""
+"Questi sono i passi necessari per configurare una macchina dedicata ad "
+"alcuni servizi:"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"install the <emphasis>minimal</emphasis> profile using the <emphasis>debian-"
+"edu-expert</emphasis> boot-option"
+msgstr ""
+"installare il profilo <emphasis>minimal</emphasis> usando l'opzione di boot "
+"<emphasis>debian-edu-expert</emphasis>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "install the packages for the service"
+msgstr "installare il pacchetto per il servizio"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "configure the service"
+msgstr "configurare il servizio"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "disable the service on main-server"
+msgstr "disattivare il servizio nel server principale"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "update DNS (via LDAP/GOsa²) on main-server"
+msgstr "aggiornare DNS (via LDAP/GOsa²) sul server principale"
+
+#. type: Content of: <article><section><section><title>
+msgid "HowTos from wiki.debian.org"
+msgstr "HowTo da wiki.debian.org"
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
+"either user- or developer-specific. Let's move the user-specific HowTos over "
+"here (and delete them over there)! (But first ask the authors (see the "
+"history of those pages to find them) if they are fine with moving the howto "
+"and putting it under the GPL.)"
+msgstr ""
+"Gli HowTo a <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> sono "
+"specifici per utenti o sviluppatori. Spostiamo in questa sezione gli HowTo "
+"specifici per gli utenti (e li cancelliamo dove erano)! (Prima occorre "
+"chiedere agli autori se sono d'accordo con lo spostamento (vedere la storia "
+"di quelle pagine per rintracciarli) e di metterli sotto licenza GPL.)"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+msgid ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
+msgstr ""
+"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
+"\"/>"
+
+#. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Amministrazione"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid "User Management with GOsa²"
+msgid "User Customisations with GOsa²"
+msgstr "Gestione degli utenti con GOsa²"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Common name</emphasis>"
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role=\"strong\">Nome comune</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid "<emphasis role=\"strong\">Minimal</emphasis>"
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role=\"strong\">Minimal</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Creare cartelle in tutte le home directory degli utenti"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+"Con questo script l'amministratore può creare una cartella in tutte le home "
+"directory degli utenti e impostare permessi e proprietà."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+"Nell'esempio mostarto sotto con il gruppo=teachers e i permessi=2770 un "
+"utente può correggere un compito salvando il file nella cartella "
+"\"assignments\" dove gli insegnanti hanno accesso di scrittura per fare "
+"commenti."
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Accesso facile a drive USB e CDROM/DVD"
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a (diskless) workstation, "
+#| "a popup window appears asking what to do with it, just like in any other "
+#| "normal installation."
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
 msgstr ""
-"Se si usa il netgroup un'alternativa per l'attivazione di shutdown-at-night "
-"sui clients è data da questo script con l'uso degli strumenti di netgroup "
-"dal pacchetto <computeroutput>ng-utils</computeroutput>:"
+"Quando gli utenti inseriscono un drive USB o DVD/CDROM dentro una (diskless) "
+"workstation, si attiva una finestra popup che chiede cosa si vuole fare, "
+"come in ogni altra normale installazione."
 
-#. type: CDATA
-#, no-wrap
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "When users insert a USB drive or DVD/CDROM into a thin client there is "
+#| "only a notify-window showing up for a few seconds. The media is "
+#| "automatically mounted and it is possible to access it browsing to the /"
+#| "media/$user folder. This is quite difficult for many non experienced "
+#| "users."
 msgid ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts"
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
 msgstr ""
-"#!/bin/sh\n"
-"  PATH=/usr/sbin:$PATH\n"
-"  export PATH\n"
-"  netgroup -h shutdown-at-night-hosts"
-
-#. type: Content of: <article><section><section><title>
-msgid "Access Debian-Edu servers located behind a firewall"
-msgstr "Accedere ai server Debian-Edu che si trova dietro un firewall"
+"Quando gli utenti inseriscono un componente usb o un DVD/CDROM in un thin "
+"client viene mostrata una finestra popup per pochi secondi.  Il supporto è "
+"automaticamente montato ed è possibile accederci nella cartella /media/"
+"$user. Questo può essere problematico per utenti non esperti."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><para>
 msgid ""
-"To access machines behind a firewall from the Internet, consider installing "
-"the package <computeroutput>autossh</computeroutput>.  It can be used to set "
-"up an SSH tunnel to a machine on the Internet that you have access to. From "
-"that machine, you can access the server behind the firewall via the SSH "
-"tunnel."
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
 msgstr ""
-"Per accedere a macchine protette con un firewall da Internet, è "
-"consigliabile installare il pacchetto <computeroutput>autossh</"
-"computeroutput>. Può essere utilizzato per istituire un tunnel SSH ad una "
-"macchina che ha accesso a internet. Da quella macchina, è possibile accedere "
-"al server dietro il firewall tramite tunnel SSH."
+"E' possibile avere Dolphin, il desktop manager di default per KDE file "
+"manager Dolphin se KDE (o LDXE, se installato in parallelo con KDE) è in uso "
+"come ambiente di desktop. Per configurarlo va eseguito <computeroutput>/usr/"
+"share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> su un "
+"terminal server. (Quando si usa Gnome, le icone saranno visibili sul desktop "
+"permettendo un accesso facilitato)."
 
-#. type: Content of: <article><section><section><title>
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "In addition the following script could be used to create the symlink "
+#| "\"media\" for all users in their home folder for easy access to USB "
+#| "drives, CDROM/DVD or whatever media is connected to the thin client. This "
+#| "might come in handy if users want to edit files directly on their plugged "
+#| "in media."
 msgid ""
-"Installing additional service machines for spreading the load from main-"
-"server"
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
 msgstr ""
-"Installare servizi aggiuntivi sulle macchine per distribuire il carico del "
-"server principale"
+"In aggiunta lo script seguente dovrebbe essere usato per creare un "
+"collegamento a \"media\" nella home directory di0 tutti gli utenti  per "
+"avere un accesso più facile ai drive USB, ai CDROM o ad altri media connessi "
+"ai thin client."
 
-#. type: Content of: <article><section><section><para>
+#. type: CDATA
+#, no-wrap
 msgid ""
-"In the default installation, all services are running on the main-server, "
-"tjener. To simplify moving some to another machine, there is a "
-"<emphasis>minimal</emphasis> installation profile available. Installing with "
-"this profile will lead to a machine, which is part of the Debian Edu "
-"network, but which doesn't have any services running (yet)."
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
 msgstr ""
-"In una installazione di default, tutti i servizi sono in esecuzione sul "
-"server principale, tjener. Per semplificare il trasferimento alcuni di "
-"un'altra macchina, vi è una profilo di installazione <emphasis>minimal</"
-"emphasis>. Installare con questo profilo porterà a una macchina, che è parte "
-"della rete Debian Edu, ma che non ha alcun servizio attivato (ancora)."
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
 
-#. type: Content of: <article><section><section><para>
-msgid ""
-"These are the required steps to setup a machine dedicated to some services:"
-msgstr ""
-"Questi sono i passi necessari per configurare una macchina dedicata ad "
-"alcuni servizi:"
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
+msgstr "Un avvertimento sui media rimovibili sui server LTSP"
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"install the <emphasis>minimal</emphasis> profile using the <emphasis>debian-"
-"edu-expert</emphasis> boot-option"
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
 msgstr ""
-"installare il profilo <emphasis>minimal</emphasis> usando l'opzione di boot "
-"<emphasis>debian-edu-expert</emphasis>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "install the packages for the service"
-msgstr "installare il pacchetto per il servizio"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "configure the service"
-msgstr "configurare il servizio"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "disable the service on main-server"
-msgstr "disattivare il servizio nel server principale"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "update DNS (via LDAP/GOsa²) on main-server"
-msgstr "aggiornare DNS (via LDAP/GOsa²) sul server principale"
-
-#. type: Content of: <article><section><section><title>
-msgid "HowTos from wiki.debian.org"
-msgstr "HowTo da wiki.debian.org"
+"Attenzione: Quando si inserisce in un server LTSP un drive USB e altri media "
+"rimovibili questo fa apparire un messaggio popup sui client LTSP remoti."
 
-#. type: Content of: <article><section><section><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"The HowTos from <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> are "
-"either user- or developer-specific. Let's move the user-specific HowTos over "
-"here (and delete them over there)! (But first ask the authors (see the "
-"history of those pages to find them) if they are fine with moving the howto "
-"and putting it under the GPL.)"
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
 msgstr ""
-"Gli HowTo a <ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/\"/> sono "
-"specifici per utenti o sviluppatori. Spostiamo in questa sezione gli HowTo "
-"specifici per gli utenti (e li cancelliamo dove erano)! (Prima occorre "
-"chiedere agli autori se sono d'accordo con lo spostamento (vedere la storia "
-"di quelle pagine per rintracciarli) e di metterli sotto licenza GPL.)"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/AutoNetRespawn\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/BackupPC\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet\"/>"
-
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
-msgstr "<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/SiteSummary\"/>"
+"Quando un utente remoto vede la finestra popup o usa pmount da console, può "
+"montare i dispositivi rimovibili e accedere ai file."
 
-#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
-"\"/>"
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
 msgstr ""
-"<ulink url=\"http://wiki.debian.org/DebianEdu/HowTo/Squid_LDAP_Authentication"
-"\"/>"
+"Questo è indicato come <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
+"Edu bug #1376</ulink>."
 
 #. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
@@ -8573,6 +8652,33 @@ msgstr ""
 "la password, si deve cambiarla anche utilizzando GOsa²."
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr "eseguire applicazioni Java standalone"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+"Le applicazioni Java standalone sono supportate out of the box da OpenJDK "
+"Java runtime."
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr "Eseguire le applicazioni Java nel browser web"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+"Le applicazioni Java sono supportate out of the box da OpenJDK Java runtime."
+
+#. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr "Usare email"
 
@@ -11596,6 +11702,34 @@ msgstr ""
 "Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
 "url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 
+#~ msgid ""
+#~ "If you don't like the generated username you can select another username "
+#~ "offered in the drop-down box, but you do not have a free choice here in "
+#~ "the wizard. (Username generation can be customized in <computeroutput>/"
+#~ "etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> would generate the username "
+#~ "<computeroutput>pmuster</computeroutput> for a user \"Peter Muster\" and "
+#~ "<computeroutput>pmuster01</computeroutput> for the next user with the "
+#~ "same full name.  The maximum length for usernames in this case would be "
+#~ "25; see <computeroutput>man 5 gosa.conf</computeroutput> for more "
+#~ "details. Backup gosa.conf before editing it!)"
+#~ msgstr ""
+#~ "Se si vuol cambiare il nome utente generato è possibile selezionare un "
+#~ "altro nome utente tra quelli proposti nella casella a discesa, ma non si "
+#~ "è liberi di gestirlo nella procedura guidata (la generazione dell'ID "
+#~ "utente può essere personalizzata in <computeroutput>/etc/gosa/ gosa.conf "
+#~ "</computeroutput> cambiando le entrate di default "
+#~ "<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
+#~ "computeroutput> a <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}"
+#~ "{id!2}\"</computeroutput> dovrebbe generare l'username "
+#~ "<computeroutput>pmuster</computeroutput> per l'utente \"Peter Muster\" e "
+#~ "<computeroutput>pmuster01</computeroutput> per un altro utente con lo "
+#~ "stesso nome. La lunghezza massima per l'username in questo caso dovrebbe "
+#~ "essere 25; vedere <computeroutput>man 5 gosa.conf</computeroutput> per i "
+#~ "dettagli.) Fare il backup di gosa.conf prima di modificarlo!)"
+
 #~ msgid "./images/30-ThinClient-LDM_Login.png"
 #~ msgstr "./images/30-ThinClient-LDM_Login.png"
 
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 b7c03ea..b0211cb 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-08-07 15:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\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"
@@ -1844,12 +1844,6 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
 msgid ""
@@ -3108,7 +3102,12 @@ msgid ""
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -3164,16 +3163,7 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
+"wizard."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -3843,8 +3833,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 "En annen viktig del av maskinkonfigurasjonen er 'Samba host' merket (i 'Host "
 "information' feltet). Hvis du planlegger å legge til eksisterende "
@@ -4435,7 +4425,8 @@ msgstr "Mer informasjon om ulike måter å tilpasse DebianEdu/Skolelinux på."
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 "Veiledninger for <link linkend=\"NetworkClients\">nettverksklienter</link>"
 
@@ -4665,6 +4656,15 @@ msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
 #, fuzzy
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+"Veiledninger for <link linkend=\"Administration\">generell administrasjon</"
+"link>"
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
+#, fuzzy
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr "Veiledninger for <link linkend=\"Desktop\">skrivebordet</link>"
 
@@ -5201,212 +5201,6 @@ msgstr ""
 "aptitude dist-upgrade"
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr "Java"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr "kjører frittstående Java applikasjoner"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-"Frittstående Jave-applikasjoner er støttet rett ut av boksen med pakken "
-"OpenJDK Java runtime."
-
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-msgid "Running Java applications in the web browser"
-msgstr "kjører Java-applikasjoner i nettleseren"
-
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-"Frittstående Jave-applikasjoner er støttet rett ut av boksen med pakken "
-"OpenJDK Java runtime."
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr "Oppretter en mappe på alle brukeres hjemmeområde"
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-"Med dette scriptet kan administrator opprette en mappe på hver brukers "
-"hjemmeområde og sette tilgangsrettigheter og eierskap."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-"I eksemplet nedenfor med gruppe=teachers og tillatelser=2770, kan en bruker "
-"lever inn en oppgave ved å lagre fila i mappa \"oppgaver\" der lærerne har "
-"fått skrivetilgang slik at de kan legge til kommentarer."
-
-#. type: CDATA
-#, fuzzy, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-"home_path=\"/skole/tjener/home0\";\n"
-" shared_folder=\"assignments\";\n"
-" permissions=\"2770\";\n"
-" created_dir=0;\n"
-"        for home in $(ls $home_path);do\n"
-"        . if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        . mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-". #set the right owner and group\n"
-"  #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-" . fi\n"
-"done\n"
-"echo \"$created_dir folders has been created\""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr "Enkel tilgang til USB-enheter og CD-ROM(er)/DVD(er)"
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-"Når brukere setter en USB-disk eller DVD/CD i en (diskløs) arbeidsstasjon. "
-"så spretter det opp et vindu med spørsmål om hva du vil gjøre. Akkurat som "
-"på andre installsjoner."
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-"Når brukere setter inn en usb-enhet eller DVD/CDROM i en tynnklient, vil det "
-"ikke dukke opp en dialogboks slik de er vant til fra sitt vanlige "
-"skrivebord. Istedet blir den automatisk montert, og brukerne må da navigere "
-"til mappa /media/ $user. Dette er for vanskelig for uerfarne brukere."
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-#, fuzzy
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-"Ved hjelp av følgende script vil linken \"Media\" opprettes for alle brukere "
-"på deres hjemmeområde. Dette gir enkel tilgang til USB-penner, CD-ROM og "
-"andre media som kobles til tynnklienten."
-
-#. type: CDATA
-#, fuzzy, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
-"for home in $(ls $home_path); do\n"
-"  if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"    ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
-"  else\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\""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr "En liten advarsel om flyttbare medier på LTSP-tjenere. "
-
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-"</inlinemediaobject> ADVARSEL: Når en USB-penn blir satt inn i en LTSP-"
-"tjener, så fører dette til at det spretter opp et vindu på alle LTSP-"
-"klienter slik at innholdet vises. "
-
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-"Når andre brukere ser vinduet som spretter opp, så kan de montere USB-pennen "
-"og bla gjennom innholdet med full tilgang. "
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-"Dette er registret som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
-"Edu bug #1376</ulink>."
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr "Automatisk opprydding av prosesser som er til overs"
 
@@ -5705,6 +5499,282 @@ msgstr ""
 "\"/>"
 
 #. type: Content of: <article><section><title>
+#, fuzzy
+#| msgid "Administration"
+msgid "Advanced administration"
+msgstr "Administrasjon"
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+#, fuzzy
+msgid "User Customisations with GOsa²"
+msgstr "Brukeradministrasjon med lwat"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr "<emphasis role='strong'>rolle</emphasis>"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr "Oppretter en mappe på alle brukeres hjemmeområde"
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+"Med dette scriptet kan administrator opprette en mappe på hver brukers "
+"hjemmeområde og sette tilgangsrettigheter og eierskap."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+"I eksemplet nedenfor med gruppe=teachers og tillatelser=2770, kan en bruker "
+"lever inn en oppgave ved å lagre fila i mappa \"oppgaver\" der lærerne har "
+"fått skrivetilgang slik at de kan legge til kommentarer."
+
+#. type: CDATA
+#, fuzzy, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+"home_path=\"/skole/tjener/home0\";\n"
+" shared_folder=\"assignments\";\n"
+" permissions=\"2770\";\n"
+" created_dir=0;\n"
+"        for home in $(ls $home_path);do\n"
+"        . if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        . mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+". #set the right owner and group\n"
+"  #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+" . fi\n"
+"done\n"
+"echo \"$created_dir folders has been created\""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr "Enkel tilgang til USB-enheter og CD-ROM(er)/DVD(er)"
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
+msgstr ""
+"Når brukere setter en USB-disk eller DVD/CD i en (diskløs) arbeidsstasjon. "
+"så spretter det opp et vindu med spørsmål om hva du vil gjøre. Akkurat som "
+"på andre installsjoner."
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
+msgstr ""
+"Når brukere setter inn en usb-enhet eller DVD/CDROM i en tynnklient, vil det "
+"ikke dukke opp en dialogboks slik de er vant til fra sitt vanlige "
+"skrivebord. Istedet blir den automatisk montert, og brukerne må da navigere "
+"til mappa /media/ $user. Dette er for vanskelig for uerfarne brukere."
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
+msgstr ""
+"Ved hjelp av følgende script vil linken \"Media\" opprettes for alle brukere "
+"på deres hjemmeområde. Dette gir enkel tilgang til USB-penner, CD-ROM og "
+"andre media som kobles til tynnklienten."
+
+#. type: CDATA
+#, fuzzy, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+msgstr ""
+"home_path=\"/skole/tjener/home0\"; shared_folder=\"Media\"; permissions=\"775\"; created_dir=0;\n"
+"for home in $(ls $home_path); do\n"
+"  if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"    ln -s /media/$home $home_path/$home/$shared_folder ((created_dir+=1))\n"
+"  else\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\""
+
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
+msgstr "En liten advarsel om flyttbare medier på LTSP-tjenere. "
+
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+msgid ""
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
+msgstr ""
+"</inlinemediaobject> ADVARSEL: Når en USB-penn blir satt inn i en LTSP-"
+"tjener, så fører dette til at det spretter opp et vindu på alle LTSP-"
+"klienter slik at innholdet vises. "
+
+#. type: Content of: <article><section><section><section><section><para>
+#, fuzzy
+msgid ""
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
+msgstr ""
+"Når andre brukere ser vinduet som spretter opp, så kan de montere USB-pennen "
+"og bla gjennom innholdet med full tilgang. "
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
+msgstr ""
+"Dette er registret som <ulink url=\"http://bugs.skolelinux.org/1376\">Debian "
+"Edu bug #1376</ulink>."
+
+#. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr "Veiledninger for skrivebordet"
 
@@ -8201,6 +8271,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr "Java"
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr "kjører frittstående Java applikasjoner"
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+"Frittstående Jave-applikasjoner er støttet rett ut av boksen med pakken "
+"OpenJDK Java runtime."
+
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+msgid "Running Java applications in the web browser"
+msgstr "kjører Java-applikasjoner i nettleseren"
+
+#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+"Frittstående Jave-applikasjoner er støttet rett ut av boksen med pakken "
+"OpenJDK Java runtime."
+
+#. type: Content of: <article><section><section><title>
 #, fuzzy
 msgid "Using email"
 msgstr "Bruk av maskinregler"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 0623e99..ded2e10 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-08-08 21:26+0300\n"
+"POT-Creation-Date: 2013-08-26 00:24+0300\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"
@@ -1362,12 +1362,6 @@ msgid ""
 "proxy of the main server."
 msgstr ""
 
-#. type: Content of: <article><section><section><section><section><title>
-msgid ""
-"Boot parameters available when installing from the netinstall CD image, not "
-"when installing from the multi-arch image"
-msgstr ""
-
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
@@ -2273,7 +2267,12 @@ msgid ""
 "tree. Student accounts are intended to be added to the \"Students\" "
 "department, teachers to the \"Teachers\" department; systems (servers, "
 "Skolelinux workstations, Windows machines, printers etc.) are currently "
-"added to the base level. Find your own scheme for customising this structure."
+"added to the base level. Find your own scheme for customising this "
+"structure. (You can find an example how to create users in year groups, with "
+"common home directories for each group in the <ulink url=\"https://wiki."
+"debian.org/DebianEdu/Documentation/Wheezy//HowTo/"
+"AdvancedAdministration#User_Customisations_with_GOsa.2BALI-\">HowTo/"
+"AdvancedAdministration</ulink> chapter of this manual.)"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -2328,16 +2327,7 @@ msgstr ""
 msgid ""
 "If you don't like the generated username you can select another username "
 "offered in the drop-down box, but you do not have a free choice here in the "
-"wizard. (Username generation can be customized in <computeroutput>/etc/gosa/"
-"gosa.conf</computeroutput>, changing e.g. the default entry "
-"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
-"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
-"computeroutput> would generate the username <computeroutput>pmuster</"
-"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
-"computeroutput> for the next user with the same full name.  The maximum "
-"length for usernames in this case would be 25; see <computeroutput>man 5 "
-"gosa.conf</computeroutput> for more details. Backup gosa.conf before editing "
-"it!)"
+"wizard."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2878,8 +2868,8 @@ msgid ""
 "tree and set this flag to be able to join the Windows host to the domain. "
 "For more information about adding Windows hosts to the Skolelinux network "
 "see the <link linkend=\"NetworkClients--"
-"Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration"
-"\">HowTo/NetworkClients</link> chapter of this manual."
+"Connecting_Windows_machines_to_the_network_.2F_Windows_integration\">HowTo/"
+"NetworkClients</link> chapter of this manual."
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3303,7 +3293,8 @@ msgstr ""
 msgid ""
 "More information about Debian Edu customisations useful for system "
 "administrators can be found in the <link linkend=\"Administration"
-"\">Administration Howto chapter</link>."
+"\">Administration Howto chapter</link> and in the <link linkend="
+"\"AdvancedAdministration\">Advanced administration Howto chapter</link>"
 msgstr ""
 
 #. type: Content of: <article><section><title>
@@ -3466,6 +3457,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><itemizedlist><listitem><para>
+msgid ""
+"HowTos for <link linkend=\"AdvancedAdministration\">advanced administration</"
+"link>"
+msgstr ""
+
+#. type: Content of: <article><section><itemizedlist><listitem><para>
 msgid "HowTos for <link linkend=\"Desktop\">the desktop</link>"
 msgstr ""
 
@@ -3894,150 +3891,6 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
-msgid "Java"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "running standalone Java applications"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Standalone Java applications are supported out of the box by the OpenJDK "
-"Java runtime."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Running Java applications in the web browser"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Running Java applets in the browser are supported out of the box by the "
-"OpenJDK Java runtime."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Creating folders in the home directories of all users"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"With this script the administrator can create a folder in each user's home "
-"directory and set access permissions and ownership."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In the example shown below with group=teachers and permissions=2770 a user "
-"can hand in an assignment by saving the file to the folder \"assignments\" "
-"where teachers are given write access to be able to make comments."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"assignments\"\n"
-" permissions=\"2770\"\n"
-" created_dir=0\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        mkdir $home_path/$home/$shared_folder\n"
-"        chmod $permissions $home_path/$home/$shared_folder\n"
-"        #set the right owner and group\n"
-"        #\"username\" = \"group name\" = \"folder name\"\n"
-"        user=$home\n"
-"        group=teachers\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders have been created\""
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
-msgid "Easy access to USB drives and CDROMs/DVDs"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a (diskless) "
-"workstation, a popup window appears asking what to do with it, just like in "
-"any other normal installation."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"When users insert a USB drive or a DVD / CDROM into a thin client there is "
-"only a notify-window showing up for a few seconds. The media is "
-"automatically mounted and it is possible to access it browsing to the /media/"
-"$user folder. This is quite difficult for many non experienced users."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"It is possible to have the default KDE file manager Dolphin showing up if "
-"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
-"environment. To configure this, simply execute <computeroutput>/usr/share/"
-"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
-"server. (When using Gnome, device icons will be placed on the desktop "
-"allowing easy access)."
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-msgid ""
-"In addition the following script could be used to create the symlink \"media"
-"\" for all users in their home folder for easy access to USB drives, CDROM / "
-"DVD or whatever media is connected to the thin client. This might come in "
-"handy if users want to edit files directly on their plugged in media."
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"#!/bin/bash\n"
-" home_path=\"/skole/tjener/home0\"\n"
-" shared_folder=\"media\"\n"
-" permissions=\"775\"\n"
-" created_dir=0;\n"
-" for home in $(ls $home_path); do\n"
-"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
-"        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"
-"    fi\n"
-" done\n"
-" echo \"$created_dir folders has been created\""
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-msgid "A warning about removable media on LTSP servers"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"Warning: When inserted into an LTSP server USB drives and other removable "
-"media cause popup messages on remote LTSP clients."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If remote users acknowledge the popup or use pmount from the console, they "
-"can even mount the removable devices and access the files."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"This is being tracked as <ulink url=\"http://bugs.skolelinux."
-"org/1376\">Debian Edu bug #1376</ulink>."
-msgstr ""
-
-#. type: Content of: <article><section><section><title>
 msgid "Automatic cleanup of leftover processes"
 msgstr ""
 
@@ -4273,6 +4126,221 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><title>
+msgid "Advanced administration"
+msgstr ""
+
+#. type: Content of: <article><section><para>
+msgid "In this chapter advanced administration tasks are described."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "User Customisations with GOsa²"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Create Users in Year Groups"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In this example we want to create users in year groups, with common home "
+"directories for each group (home0/2014, home0/2015, etc.) We want to create "
+"the users by csv import."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "<emphasis>(as root on Tjener) </emphasis>"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Make the necessary year group directories"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "mkdir /skole/tjener/home0/2014"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid "<emphasis>(as superuser in Gosa)</emphasis>"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Department"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Main menu: goto 'Directory structure', click the 'Students' department. The "
+"'Base' field should show '/Students'. From the drop box 'Actions' choose "
+"'Create'/'Department'. Fill in values for Name (2014) and Description fields "
+"(students graduating in 2014), leave the Base field as is (should be '/"
+"Students'). Save it clicking 'Ok'. Now the new department (2014) should show "
+"up below /Students. Click it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name "
+"(leave 'Base' as is, should be /Students/2014) and click the check box left "
+"of 'Samba group'. 'Ok' to save it."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Template"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose 'users' from the main menu. Change to 'Students' in the Base field. "
+"An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click "
+"it. This is the 'students' template, not a real user. As you'll have to "
+"create such a template (to be able to use csv import for your structure) "
+"based on this one, notice all entries showing up in the Generic, POSIX and "
+"Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base "
+"field; choose Create/Template and start to fill in your desired values, "
+"first the Generic tab (add your new 2014 group under Group Membership, too), "
+"then add POSIX and Samba account."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid "Import users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Choose your new template when doing csv import; testing it with a few users "
+"recommended."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
+msgid "Other User Customisations"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Creating folders in the home directories of all users"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"With this script the administrator can create a folder in each user's home "
+"directory and set access permissions and ownership."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In the example shown below with group=teachers and permissions=2770 a user "
+"can hand in an assignment by saving the file to the folder \"assignments\" "
+"where teachers are given write access to be able to make comments."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"assignments\"\n"
+" permissions=\"2770\"\n"
+" created_dir=0\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        mkdir $home_path/$home/$shared_folder\n"
+"        chmod $permissions $home_path/$home/$shared_folder\n"
+"        #set the right owner and group\n"
+"        #\"username\" = \"group name\" = \"folder name\"\n"
+"        user=$home\n"
+"        group=teachers\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders have been created\""
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Easy access to USB drives and CDROMs/DVDs"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a (diskless) "
+"workstation, a popup window appears asking what to do with it, just like in "
+"any other normal installation."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"When users insert a USB drive or a DVD / CDROM into a thin client there is "
+"only a notify-window showing up for a few seconds. The media is "
+"automatically mounted and it is possible to access it browsing to the /media/"
+"$user folder. This is quite difficult for many non experienced users."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"It is possible to have the default KDE file manager Dolphin showing up if "
+"KDE (or LDXE, if installed in parallel to KDE) is in use as desktop "
+"environment. To configure this, simply execute <computeroutput>/usr/share/"
+"debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal "
+"server. (When using Gnome, device icons will be placed on the desktop "
+"allowing easy access)."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"In addition the following script could be used to create the symlink \"media"
+"\" for all users in their home folder for easy access to USB drives, CDROM / "
+"DVD or whatever media is connected to the thin client. This might come in "
+"handy if users want to edit files directly on their plugged in media."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"#!/bin/bash\n"
+" home_path=\"/skole/tjener/home0\"\n"
+" shared_folder=\"media\"\n"
+" permissions=\"775\"\n"
+" created_dir=0;\n"
+" for home in $(ls $home_path); do\n"
+"    if [ ! -d \"$home_path/$home/$shared_folder\" ]; then\n"
+"        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"
+"    fi\n"
+" done\n"
+" echo \"$created_dir folders has been created\""
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><title>
+msgid "A warning about removable media on LTSP servers"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"Warning: When inserted into an LTSP server USB drives and other removable "
+"media cause popup messages on remote LTSP clients."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"If remote users acknowledge the popup or use pmount from the console, they "
+"can even mount the removable devices and access the files."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><section><para>
+msgid ""
+"This is being tracked as <ulink url=\"http://bugs.skolelinux."
+"org/1376\">Debian Edu bug #1376</ulink>."
+msgstr ""
+
+#. type: Content of: <article><section><title>
 msgid "HowTos for the desktop"
 msgstr ""
 
@@ -6235,6 +6303,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><title>
+msgid "Java"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "running standalone Java applications"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Standalone Java applications are supported out of the box by the OpenJDK "
+"Java runtime."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Running Java applications in the web browser"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"Running Java applets in the browser are supported out of the box by the "
+"OpenJDK Java runtime."
+msgstr ""
+
+#. type: Content of: <article><section><section><title>
 msgid "Using email"
 msgstr ""
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index da9eb32..b6ae34e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -560,13 +560,7 @@ FIXME: the source DVD download URL currently doesn't work
 </para></listitem>
 <listitem>
 <para>If you have already installed the main server profile on a machine, further installations should be done via PXE, as this will automatically use the proxy of the main server. 
-</para></listitem></itemizedlist>
-</section>
-
-<section id="Installation--Boot_parameters_available_when_installing_from_the_netinstall_CD_image.2C_not_when_installing_from_the_multi-arch_image">
-<title>Boot parameters available when installing from the netinstall CD image, not when installing from the multi-arch image
-</title>
-<itemizedlist>
+</para></listitem>
 <listitem>
 <para>To install the <emphasis role="strong">GNOME</emphasis> desktop instead of the <emphasis role="strong">KDE</emphasis> desktop, add <computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters. 
 </para></listitem>
@@ -929,7 +923,7 @@ FIXME: screenshot 28 needs to be updated with new artwork.
 </para>
 <para>GOsa² is an administration tool that uses LDAP to store its information and provide a hierarchical department structure. To each "department" you can add user accounts, groups, systems, netgroups, etc. Depending on the structure of your institution, you can use the department structure in GOsa²/LDAP to transfer your organisational structure into the LDAP data tree of the Debian Edu main server. 
 </para>
-<para>A default Debian Edu main server installation currently provides two "departments": Teachers and Students, plus the base level of the LDAP tree. Student accounts are intended to be added to the "Students" department, teachers to the "Teachers" department; systems (servers, Skolelinux workstations, Windows machines, printers etc.) are currently added to the base level. Find your own scheme for customising this structure. 
+<para>A default Debian Edu main server installation currently provides two "departments": Teachers and Students, plus the base level of the LDAP tree. Student accounts are intended to be added to the "Students" department, teachers to the "Teachers" department; systems (servers, Skolelinux workstations, Windows machines, printers etc.) are currently added to the base level. Find your own scheme for customising this structure. (You can find an example how to create users in year groups, with common home directories for each group in the <ulink url="https://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/AdvancedAdministration#User_Customisations_with_GOsa.2BALI-">HowTo/AdvancedAdministration</ulink> chapter of this manual.) 
 </para>
 <para>Depending on the task that you want to work on (manage users, manage groups, manage systems, etc.) GOsa² presents you with a different view on the selected department (or the base level).  
 </para>
@@ -955,7 +949,7 @@ FIXME: screenshot 28 needs to be updated with new artwork.
 <para>As you follow the wizard, you will see that GOsa² generates a username automatically based on the real name. It automatically chooses a username that doesn't exist yet, so multiple users with the same full name are not a problem.  Note that GOsa² can generate invalid usernames if the full name contains non-ASCII characters. 
 </para></listitem>
 <listitem>
-<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard. (Username generation can be customized in <computeroutput>/etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry <computeroutput>idGenerator="{%givenName[1-6]}{%sn[1-6]}"</computeroutput> to <computeroutput>idGenerator="{%givenName[1]}{%sn[22]}{id!2}"</computeroutput> would generate the username <computeroutput>pmuster</computeroutput> for a user "Peter Muster" and <computeroutput>pmuster01</computeroutput> for the next user with the same full name.  The maximum length for usernames in this case would be 25; see <computeroutput>man 5 gosa.conf</computeroutput> for more details. Backup gosa.conf before editing it!) 
+<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard.  
 </para></listitem>
 <listitem>
 <para>When the wizard has finished, you are presented with the GOsa² screen for your new user object. Use the tabs at the top to check the completed fields. 
@@ -1194,7 +1188,7 @@ enter password: ]]></screen>
 <itemizedlist><listitem override="none">
 <para>Debian Edu machines in this group will only be allowed to connect to machines on the local network.  Combined with web proxy restrictions this might be used during exams. 
 </para></listitem></itemizedlist></listitem></itemizedlist>
-<para>Another important part of machine configuration is the 'Samba host' flag (in the 'Host information' area). If you plan to add existing Windows systems to the Skolelinux Samba domain, you need to add the Windows host to the LDAP tree and set this flag to be able to join the Windows host to the domain. For more information about adding Windows hosts to the Skolelinux network see the <link linkend="NetworkClients--Connecting_Windows_machines_to_the_network_.2BAC8_Windows_integration">HowTo/NetworkClients</link> chapter of this manual. 
+<para>Another important part of machine configuration is the 'Samba host' flag (in the 'Host information' area). If you plan to add existing Windows systems to the Skolelinux Samba domain, you need to add the Windows host to the LDAP tree and set this flag to be able to join the Windows host to the domain. For more information about adding Windows hosts to the Skolelinux network see the <link linkend="NetworkClients--Connecting_Windows_machines_to_the_network_.2F_Windows_integration">HowTo/NetworkClients</link> chapter of this manual. 
 </para>
 </section>
 </section>
@@ -1366,7 +1360,7 @@ enter password: ]]></screen>
 <section id="Maintenance--More_information_about_Debian_Edu_customisations">
 <title>More information about Debian Edu customisations
 </title>
-<para>More information about Debian Edu customisations useful for system administrators can be found in the <link linkend="Administration">Administration Howto chapter</link>. 
+<para>More information about Debian Edu customisations useful for system administrators can be found in the <link linkend="Administration">Administration Howto chapter</link> and in the <link linkend="AdvancedAdministration">Advanced administration Howto chapter</link> 
 </para>
 </section>
 </section>
@@ -1454,6 +1448,9 @@ enter password: ]]></screen>
 <para>HowTos for <link linkend="Administration">general administration</link> 
 </para></listitem>
 <listitem>
+<para>HowTos for <link linkend="AdvancedAdministration">advanced administration</link> 
+</para></listitem>
+<listitem>
 <para>HowTos for <link linkend="Desktop">the desktop</link> 
 </para></listitem>
 <listitem>
@@ -1628,90 +1625,6 @@ apt-cdrom add -m]]></screen>
 apt-get upgrade]]></screen>
 </section>
 
-<section id="Administration--Java">
-<title>Java
-</title>
-
-<section id="Administration--running_standalone_Java_applications">
-<title>running standalone Java applications
-</title>
-<para>Standalone Java applications are supported out of the box by the OpenJDK Java runtime.  
-</para>
-</section>
-
-<section id="Administration--Running_Java_applications_in_the_web_browser">
-<title>Running Java applications in the web browser
-</title>
-<para>Running Java applets in the browser are supported out of the box by the OpenJDK Java runtime. 
-</para>
-</section>
-</section>
-
-<section id="Administration--Creating_folders_in_the_home_directories_of_all_users">
-<title>Creating folders in the home directories of all users
-</title>
-<para>With this script the administrator can create a folder in each user's home directory and set access permissions and ownership. 
-</para>
-<para>In the example shown below with group=teachers and permissions=2770 a user can hand in an assignment by saving the file to the folder "assignments" where teachers are given write access to be able to make comments. 
-</para><screen><![CDATA[ #!/bin/bash
- home_path="/skole/tjener/home0"
- shared_folder="assignments"
- permissions="2770"
- created_dir=0
- for home in $(ls $home_path); do
-    if [ ! -d "$home_path/$home/$shared_folder" ]; then
-        mkdir $home_path/$home/$shared_folder
-        chmod $permissions $home_path/$home/$shared_folder
-        #set the right owner and group
-        #"username" = "group name" = "folder name"
-        user=$home
-        group=teachers
-        chown $user:$group $home_path/$home/$shared_folder
-        ((created_dir+=1))
-    else
-        echo -e "the folder $home_path/$home/$shared_folder already exists.\n"
-    fi
- done
- echo "$created_dir folders have been created"]]></screen>
-</section>
-
-<section id="Administration--Easy_access_to_USB_drives_and_CDROMs.2BAC8DVDs">
-<title>Easy access to USB drives and CDROMs/DVDs
-</title>
-<para>When users insert a USB drive or a DVD / CDROM into a (diskless) workstation, a popup window appears asking what to do with it, just like in any other normal installation. 
-</para>
-<para>When users insert a USB drive or a DVD / CDROM into a thin client there is only a notify-window showing up for a few seconds. The media is automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users. 
-</para>
-<para>It is possible to have the default KDE file manager Dolphin showing up if KDE (or LDXE, if installed in parallel to KDE) is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using Gnome, device icons will be placed on the desktop allowing easy access).  
-</para>
-<para>In addition the following script could be used to create the symlink "media" for all users in their home folder for easy access to USB drives, CDROM / DVD or whatever media is connected to the thin client. This might come in handy if users want to edit files directly on their plugged in media. 
-</para><screen><![CDATA[ #!/bin/bash
- home_path="/skole/tjener/home0"
- shared_folder="media"
- permissions="775"
- created_dir=0;
- for home in $(ls $home_path); do
-    if [ ! -d "$home_path/$home/$shared_folder" ]; then
-        ln -s /media/$home $home_path/$home/$shared_folder
-        ((created_dir+=1))
-    else
-        echo -e "the folder $home_path/$home/$shared_folder already exists.\n"
-    fi
- done
- echo "$created_dir folders has been created"]]></screen>
-
-<section id="Administration--A_warning_about_removable_media_on_LTSP_servers">
-<title>A warning about removable media on LTSP servers
-</title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: When inserted into an LTSP server USB drives and other removable media cause popup messages on remote LTSP clients. 
-</para>
-<para>If remote users acknowledge the popup or use pmount from the console, they can even mount the removable devices and access the files. 
-</para>
-<para>This is being tracked as <ulink url="http://bugs.skolelinux.org/1376">Debian Edu bug #1376</ulink>. 
-</para>
-</section>
-</section>
-
 <section id="Administration--Automatic_cleanup_of_leftover_processes">
 <title>Automatic cleanup of leftover processes
 </title>
@@ -1824,6 +1737,129 @@ apt-get upgrade]]></screen>
 </section>
 </section>
 
+<section id="AdvancedAdministration">
+<title>Advanced administration
+</title>
+<para>In this chapter advanced administration tasks are described.   
+</para>
+
+<section id="AdvancedAdministration--User_Customisations_with_GOsa.2BALI-">
+<title>User Customisations with GOsa²
+</title>
+
+<section id="AdvancedAdministration--Create_Users_in_Year_Groups">
+<title>Create Users in Year Groups
+</title>
+<para>In this example we want to create users in year groups, with common home directories for each group (home0/2014, home0/2015, etc.) We want to create the users by csv import. 
+</para>
+<para><emphasis>(as root on Tjener) </emphasis> 
+</para>
+<itemizedlist>
+<listitem>
+<para>Make the necessary year group directories  
+</para></listitem></itemizedlist>
+<para>mkdir /skole/tjener/home0/2014 
+</para>
+<para><emphasis>(as superuser in Gosa)</emphasis> 
+</para>
+<itemizedlist>
+<listitem>
+<para>Department 
+</para></listitem></itemizedlist>
+<para>Main menu: goto 'Directory structure', click the 'Students' department. The 'Base' field should show '/Students'. From the drop box 'Actions' choose 'Create'/'Department'. Fill in values for Name (2014) and Description fields (students graduating in 2014), leave the Base field as is (should be '/Students'). Save it clicking 'Ok'. Now the new department (2014) should show up below  /Students. Click it. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Group 
+</para></listitem></itemizedlist>
+<para>Choose 'Groups' from the main menu; 'Actions'/Create/Group. Enter group name (leave 'Base' as is, should be /Students/2014) and click the check box left of 'Samba group'. 'Ok' to save it. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Template 
+</para></listitem></itemizedlist>
+<para>Choose 'users' from the main menu. Change to 'Students' in the Base field. An Entry <computeroutput>'NewStudent'</computeroutput> should show up, click it. This is the 'students' template, not a real user. As you'll have to create such a template (to be able to use csv import for your structure) based on this one, notice all entries showing up in the Generic, POSIX and Samba tabs, maybe take screenshots. Now change to /Students/2014 in the Base field; choose Create/Template and start to fill in your desired values, first the Generic tab (add your new 2014 group under Group Membership, too), then add POSIX and Samba account. 
+</para>
+<itemizedlist>
+<listitem>
+<para>Import users 
+</para></listitem></itemizedlist>
+<para>Choose your new template when doing csv import; testing it with a few users recommended. 
+</para>
+</section>
+</section>
+
+<section id="AdvancedAdministration--Other_User_Customisations">
+<title>Other User Customisations
+</title>
+
+<section id="AdvancedAdministration--Creating_folders_in_the_home_directories_of_all_users">
+<title>Creating folders in the home directories of all users
+</title>
+<para>With this script the administrator can create a folder in each user's home directory and set access permissions and ownership. 
+</para>
+<para>In the example shown below with group=teachers and permissions=2770 a user can hand in an assignment by saving the file to the folder "assignments" where teachers are given write access to be able to make comments. 
+</para><screen><![CDATA[ #!/bin/bash
+ home_path="/skole/tjener/home0"
+ shared_folder="assignments"
+ permissions="2770"
+ created_dir=0
+ for home in $(ls $home_path); do
+    if [ ! -d "$home_path/$home/$shared_folder" ]; then
+        mkdir $home_path/$home/$shared_folder
+        chmod $permissions $home_path/$home/$shared_folder
+        #set the right owner and group
+        #"username" = "group name" = "folder name"
+        user=$home
+        group=teachers
+        chown $user:$group $home_path/$home/$shared_folder
+        ((created_dir+=1))
+    else
+        echo -e "the folder $home_path/$home/$shared_folder already exists.\n"
+    fi
+ done
+ echo "$created_dir folders have been created"]]></screen>
+</section>
+
+<section id="AdvancedAdministration--Easy_access_to_USB_drives_and_CDROMs.2BAC8DVDs">
+<title>Easy access to USB drives and CDROMs/DVDs
+</title>
+<para>When users insert a USB drive or a DVD / CDROM into a (diskless) workstation, a popup window appears asking what to do with it, just like in any other normal installation. 
+</para>
+<para>When users insert a USB drive or a DVD / CDROM into a thin client there is only a notify-window showing up for a few seconds. The media is automatically mounted and it is possible to access it browsing to the /media/$user folder. This is quite difficult for many non experienced users. 
+</para>
+<para>It is possible to have the default KDE file manager Dolphin showing up if KDE (or LDXE, if installed in parallel to KDE) is in use as desktop environment. To configure this, simply execute <computeroutput>/usr/share/debian-edu-config/ltspfs-mounter-kde enable</computeroutput> on the terminal server. (When using Gnome, device icons will be placed on the desktop allowing easy access).  
+</para>
+<para>In addition the following script could be used to create the symlink "media" for all users in their home folder for easy access to USB drives, CDROM / DVD or whatever media is connected to the thin client. This might come in handy if users want to edit files directly on their plugged in media. 
+</para><screen><![CDATA[ #!/bin/bash
+ home_path="/skole/tjener/home0"
+ shared_folder="media"
+ permissions="775"
+ created_dir=0;
+ for home in $(ls $home_path); do
+    if [ ! -d "$home_path/$home/$shared_folder" ]; then
+        ln -s /media/$home $home_path/$home/$shared_folder
+        ((created_dir+=1))
+    else
+        echo -e "the folder $home_path/$home/$shared_folder already exists.\n"
+    fi
+ done
+ echo "$created_dir folders has been created"]]></screen>
+
+<section id="AdvancedAdministration--A_warning_about_removable_media_on_LTSP_servers">
+<title>A warning about removable media on LTSP servers
+</title>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: When inserted into an LTSP server USB drives and other removable media cause popup messages on remote LTSP clients. 
+</para>
+<para>If remote users acknowledge the popup or use pmount from the console, they can even mount the removable devices and access the files. 
+</para>
+<para>This is being tracked as <ulink url="http://bugs.skolelinux.org/1376">Debian Edu bug #1376</ulink>. 
+</para>
+</section>
+</section>
+</section>
+</section>
+
 <section id="Desktop">
 <title>HowTos for the desktop
 </title>
@@ -2757,6 +2793,25 @@ ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallery
 </para>
 </section>
 
+<section id="Users--Java">
+<title>Java
+</title>
+
+<section id="Users--running_standalone_Java_applications">
+<title>running standalone Java applications
+</title>
+<para>Standalone Java applications are supported out of the box by the OpenJDK Java runtime.  
+</para>
+</section>
+
+<section id="Users--Running_Java_applications_in_the_web_browser">
+<title>Running Java applications in the web browser
+</title>
+<para>Running Java applets in the browser are supported out of the box by the OpenJDK Java runtime. 
+</para>
+</section>
+</section>
+
 <section id="Users--Using_email">
 <title>Using email
 </title>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index bc14ae0..f1c9029 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 f5dbacb..6d0f063 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 b1a2278..43fceec 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 3c7bf35..8aa2cb1 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.es.po b/documentation/rosegarden/rosegarden-manual.es.po
index 4c0befa..d1031a2 100644
--- a/documentation/rosegarden/rosegarden-manual.es.po
+++ b/documentation/rosegarden/rosegarden-manual.es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Rosegarden Manual Debian Edu\n"
 "Report-Msgid-Bugs-To: tato at debian.org.sv\n"
-"POT-Creation-Date: 2013-08-07 15:23+0300\n"
+"POT-Creation-Date: 2013-08-26 00:25+0300\n"
 "PO-Revision-Date: 2012-01-10 10:33-0600\n"
 "Last-Translator: Rafael Ernesto Rivas <tato at debian.org.sv>\n"
 "Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -1695,22 +1695,16 @@ msgid "30"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-msgid "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+msgid "OverDr. Guitar"
 msgstr ""
-"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "63"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+msgid "SynthBrass 1"
 msgstr ""
-"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "96"
@@ -1733,11 +1727,8 @@ msgid "64"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+msgid "SynthBrass 2"
 msgstr ""
-"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "97"
@@ -1803,12 +1794,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-msgid ""
-"<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
-"\">DrumKit</ulink> </emphasis>"
-msgstr ""
-"La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
+#| msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
+msgid "<emphasis role=\"strong\"> DrumKit </emphasis>"
+msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> Uses </emphasis>"
@@ -2881,9 +2869,8 @@ msgstr ""
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"After that you have to start jackd you have to manualy connect <ulink url="
-"\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> so you can hear "
-"what been played."
+"After that you have to start jackd you have to manualy connect FluidSynth so "
+"you can hear what been played."
 msgstr ""
 "La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
 "Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
@@ -3512,6 +3499,35 @@ msgstr ""
 msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+#~ msgstr ""
+#~ "La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#~ "Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
+
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+#~ msgstr ""
+#~ "La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#~ "Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
+
+#, fuzzy
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+#~ msgstr ""
+#~ "La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#~ "Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
+
+#, fuzzy
+#~ msgid ""
+#~ "<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
+#~ "\">DrumKit</ulink> </emphasis>"
+#~ msgstr ""
+#~ "La versión <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
+#~ "Manuals/Rosegarden\"/> es basada en un wiki y se actualiza frecuentemente."
+
 #~ msgid ""
 #~ "This document was put into the <computeroutput>debian-edu-doc</"
 #~ "computeroutput> package on <computeroutput>"
diff --git a/documentation/rosegarden/rosegarden-manual.fr.po b/documentation/rosegarden/rosegarden-manual.fr.po
index 89807c4..8936c42 100644
--- a/documentation/rosegarden/rosegarden-manual.fr.po
+++ b/documentation/rosegarden/rosegarden-manual.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-08-07 16:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:25+0300\n"
 "PO-Revision-Date: 2012-02-25 11:11-0400\n"
 "Last-Translator: Thomas Vincent <thomas at vinc-net.fr>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -1772,16 +1772,20 @@ msgid "30"
 msgstr "30"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
-msgstr "Guitare électrique (overdrive)"
+#, fuzzy
+#| msgid "Dist. Guitar"
+msgid "OverDr. Guitar"
+msgstr "Guitare électrique (distorsion)"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "63"
 msgstr "63"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
-msgstr "Cuivre synthétisé 1"
+#, fuzzy
+#| msgid "Synth Bass 1"
+msgid "SynthBrass 1"
+msgstr "Basse synthétisée 1"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "96"
@@ -1804,8 +1808,10 @@ msgid "64"
 msgstr "64"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
-msgstr "Cuivre synthétisé 2"
+#, fuzzy
+#| msgid "Synth Bass 2"
+msgid "SynthBrass 2"
+msgstr "Basse synthétisée 2"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "97"
@@ -1870,12 +1876,10 @@ msgid ""
 msgstr "Voici maintenant l'index des instruments à percussion."
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
-"\">DrumKit</ulink> </emphasis>"
-msgstr ""
-"<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
-"\">Kit de percussion</ulink> </emphasis>"
+#, fuzzy
+#| msgid "<emphasis role=\"strong\"> </emphasis>"
+msgid "<emphasis role=\"strong\"> DrumKit </emphasis>"
+msgstr "<emphasis role=\"strong\"> </emphasis>"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "<emphasis role=\"strong\"> Uses </emphasis>"
@@ -3146,10 +3150,14 @@ msgid "swamiedit.png"
 msgstr "swamiedit.png"
 
 #. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "After that you have to start jackd you have to manualy connect <ulink url="
+#| "\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> so you can "
+#| "hear what been played."
 msgid ""
-"After that you have to start jackd you have to manualy connect <ulink url="
-"\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> so you can hear "
-"what been played."
+"After that you have to start jackd you have to manualy connect FluidSynth so "
+"you can hear what been played."
 msgstr ""
 "Vous devez ensuite lancer Jackd et le connecter manuellement à <ulink url="
 "\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> pour pouvoir "
@@ -4084,6 +4092,25 @@ msgstr ""
 msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+#~ msgstr "Guitare électrique (overdrive)"
+
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+#~ msgstr "Cuivre synthétisé 1"
+
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+#~ msgstr "Cuivre synthétisé 2"
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
+#~ "\">DrumKit</ulink> </emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
+#~ "\">Kit de percussion</ulink> </emphasis>"
+
 #~ msgid "END OF TERMS AND CONDITIONS"
 #~ msgstr "END OF TERMS AND CONDITIONS"
 
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index e8345a9..b9e68f1 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rosegarden-manual.nb\n"
-"POT-Creation-Date: 2013-08-07 15:23+0300\n"
+"POT-Creation-Date: 2013-08-26 00:25+0300\n"
 "PO-Revision-Date: 2009-10-31 13:13+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <en at li.org>\n"
@@ -1875,9 +1875,9 @@ msgstr "30"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<ulink url=\"http://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
-msgid "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
-msgstr "<ulink url=\"/OverDr\">OverDr</ulink>. Guitar"
+#| msgid "Dist. Guitar"
+msgid "OverDr. Guitar"
+msgstr "Dist. Guitar"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "63"
@@ -1885,10 +1885,9 @@ msgstr "63"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
-msgstr "<ulink url=\"/SynthBrass\">SynthBrass</ulink> 1"
+#| msgid "Synth Bass 1"
+msgid "SynthBrass 1"
+msgstr "Synth Bass 1"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "96"
@@ -1912,10 +1911,9 @@ msgstr "64"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
-msgstr "<ulink url=\"/SynthBrass\">SynthBrass</ulink> 2"
+#| msgid "Synth Bass 2"
+msgid "SynthBrass 2"
+msgstr "Synth Bass 2"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "97"
@@ -1983,12 +1981,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-msgid ""
-"<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
-"\">DrumKit</ulink> </emphasis>"
-msgstr ""
-"<emphasis role=\"strong\"> <ulink url=\"http://wiki.debian.org/DrumKit#"
-"\">Tromme</ulink></emphasis>"
+msgid "<emphasis role=\"strong\"> DrumKit </emphasis>"
+msgstr "<emphasis role=\"strong\"> Nr.</emphasis>"
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
@@ -3361,9 +3355,8 @@ msgstr "MIDI-oppsett"
 #. type: Content of: <article><section><section><para>
 #, fuzzy
 msgid ""
-"After that you have to start jackd you have to manualy connect <ulink url="
-"\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> so you can hear "
-"what been played."
+"After that you have to start jackd you have to manualy connect FluidSynth so "
+"you can hear what been played."
 msgstr ""
 "Etter at du har startet jack, må du manuelt koble til fluidsynt slik at du "
 "kan høre lyden."
@@ -4221,6 +4214,35 @@ msgstr ""
 msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+#~ msgstr "<ulink url=\"/OverDr\">OverDr</ulink>. Guitar"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+#~ msgstr "<ulink url=\"/SynthBrass\">SynthBrass</ulink> 1"
+
+#, fuzzy
+#~| msgid ""
+#~| "<ulink url=\"http://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+#~ msgid ""
+#~ "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+#~ msgstr "<ulink url=\"/SynthBrass\">SynthBrass</ulink> 2"
+
+#, fuzzy
+#~ msgid ""
+#~ "<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
+#~ "\">DrumKit</ulink> </emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\"> <ulink url=\"http://wiki.debian.org/DrumKit#"
+#~ "\">Tromme</ulink></emphasis>"
+
 #~ msgid "END OF TERMS AND CONDITIONS"
 #~ msgstr "END OF TERMS AND CONDITIONS"
 
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 4af1a62..0a9c255 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-08-07 16:02+0300\n"
+"POT-Creation-Date: 2013-08-26 00:25+0300\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"
@@ -1626,7 +1626,7 @@ msgid "30"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/OverDr#\">OverDr</ulink>. Guitar"
+msgid "OverDr. Guitar"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1634,7 +1634,7 @@ msgid "63"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 1"
+msgid "SynthBrass 1"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1658,7 +1658,7 @@ msgid "64"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "<ulink url=\"https://wiki.debian.org/SynthBrass#\">SynthBrass</ulink> 2"
+msgid "SynthBrass 2"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -1724,9 +1724,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid ""
-"<emphasis role=\"strong\"> <ulink url=\"https://wiki.debian.org/DrumKit#"
-"\">DrumKit</ulink> </emphasis>"
+msgid "<emphasis role=\"strong\"> DrumKit </emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -2777,9 +2775,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"After that you have to start jackd you have to manualy connect <ulink url="
-"\"https://wiki.debian.org/FluidSynth#\">FluidSynth</ulink> so you can hear "
-"what been played."
+"After that you have to start jackd you have to manualy connect FluidSynth so "
+"you can hear what been played."
 msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject>
diff --git a/documentation/rosegarden/rosegarden-manual.xml b/documentation/rosegarden/rosegarden-manual.xml
index 882a312..7be4245 100644
--- a/documentation/rosegarden/rosegarden-manual.xml
+++ b/documentation/rosegarden/rosegarden-manual.xml
@@ -760,11 +760,11 @@
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
 <para> 30 
 </para></entry><entry colsep="1" rowsep="1">
-<para><ulink url="https://wiki.debian.org/OverDr#">OverDr</ulink>. Guitar 
+<para>OverDr. Guitar 
 </para></entry><entry colsep="1" rowsep="1">
 <para> 63 
 </para></entry><entry colsep="1" rowsep="1">
-<para><ulink url="https://wiki.debian.org/SynthBrass#">SynthBrass</ulink> 1 
+<para>SynthBrass 1 
 </para></entry><entry colsep="1" rowsep="1">
 <para> 96 
 </para></entry><entry colsep="1" rowsep="1">
@@ -776,7 +776,7 @@
 </para></entry><entry colsep="1" rowsep="1">
 <para> 64 
 </para></entry><entry colsep="1" rowsep="1">
-<para><ulink url="https://wiki.debian.org/SynthBrass#">SynthBrass</ulink> 2 
+<para>SynthBrass 2 
 </para></entry><entry colsep="1" rowsep="1">
 <para> 97 
 </para></entry><entry colsep="1" rowsep="1">
@@ -810,7 +810,7 @@
 </para><informaltable><tgroup cols="3"><colspec colname="col_0"/><colspec colname="col_1"/><colspec colname="col_2"/><tbody><row rowsep="1"><entry colsep="1" rowsep="1">
 <para><emphasis role="strong"> No. </emphasis> 
 </para></entry><entry colsep="1" rowsep="1">
-<para><emphasis role="strong">   <ulink url="https://wiki.debian.org/DrumKit#">DrumKit</ulink>    </emphasis> 
+<para><emphasis role="strong">   DrumKit    </emphasis> 
 </para></entry><entry colsep="1" rowsep="1">
 <para><emphasis role="strong">              Uses                 </emphasis> 
 </para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
@@ -1324,7 +1324,7 @@
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/swamiedit.png"/></imageobject><textobject><phrase>swamiedit.png</phrase></textobject></inlinemediaobject> 
 </para>
-<para>After that you have to start jackd you have to manualy connect <ulink url="https://wiki.debian.org/FluidSynth#">FluidSynth</ulink> so you can hear what been played. 
+<para>After that you have to start jackd you have to manualy connect FluidSynth so you can hear what been played. 
 </para>
 <para><inlinemediaobject><imageobject><imagedata fileref="./images/swamijackconneckt.png"/></imageobject><textobject><phrase>swamijackconneckt.png</phrase></textobject></inlinemediaobject> 
 </para>


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