[debian-edu-commits] debian-edu/debian-edu-doc.git (#1519) - master (branch) updated: 1.5_20130617_7.1-31-g1aba6c7

David Prévot taffit at alioth.debian.org
Sat Jul 6 18:43:13 UTC 2013


The branch, master has been updated
       via  1aba6c7c14fbb0988ee57cad051b1816670080bf (commit)
      from  50484aece506a86cfeb812136044a694f7ecc1c9 (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 1aba6c7c14fbb0988ee57cad051b1816670080bf
Author: David Prévot <taffit at debian.org>
Date:   Sat Jul 6 13:38:23 2013 -0400

    (da,it,nb) Trivial unfuzzy
    
    Fix build issue: broken XeLaTeX toolchain doesn’t allow quotes in
    titles for these languages.

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

Summary of changes:
 .../debian-edu-wheezy-manual.da.po                 |  584 ++--------
 .../debian-edu-wheezy-manual.it.po                 |  467 ++------
 .../debian-edu-wheezy-manual.nb.po                 | 1181 +-------------------
 3 files changed, 185 insertions(+), 2047 deletions(-)

The diff of changes is:
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 40f15a6..7a2b833 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -23,32 +23,24 @@ msgid "en"
 msgstr "da"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
-msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.0.0+r0"
+msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.1+edu0"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
-msgstr "Manual for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
+msgstr "Manual for Debian Edu 7.1+edu0 kodenavn »Wheezy«"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Logind for Debian Edu"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
-msgstr "Dette er manualen for Debian Edu Wheezy 7.0.0+r0-udgivelsen."
+msgstr "Dette er manualen for Debian Edu Wheezy 7.1+edu0-udgivelsen."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -110,11 +102,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Several educational applications like celestia, drgeo, gcompris, "
-#| "geogebra, kalzium, kgeography and solfege are included in the default "
-#| "desktop setup, which can be extended easily and almost endlessly via the "
-#| "Debian universe."
 msgid ""
 "Several educational applications like celestia, drgeo, gcompris, kalzium, "
 "kgeography, solfege and scratch are included in the default desktop setup, "
@@ -267,10 +254,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is designed to be modified - that is, you can have the NFS-root in "
-#| "syslinux point to one of the LTSP servers or change next-server in DHCP "
-#| "to have clients directly boot via PXE from the terminal server."
 msgid ""
 "This is designed to be modified - that is, you can have the NFS-root in "
 "syslinux point to one of the LTSP servers or change the DHCP next-server "
@@ -283,9 +266,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated 192.168.0.0/24 network "
-#| "on the second interface and should seldom need to be changed."
 msgid ""
 "DHCPD on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -450,10 +430,8 @@ msgid "Electronic Post Office"
 msgstr "Elektronisk postkontor"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-#, fuzzy
-#| msgid "IMAP/POP3 (Dovecot)"
 msgid "IMAP (Dovecot)"
-msgstr "IMAP/POP3 (Dovecot)"
+msgstr "IMAP (Dovecot)"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid "postoffice"
@@ -595,14 +573,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "By default email is set up for local delivery (i.e. within the school) "
-#| "only, though email delivery to the wider Internet may be set up if the "
-#| "school has a permanent Internet connection. Mailing lists are set up "
-#| "based on the user database, giving each class their own mailing list. "
-#| "Clients are set up to deliver mail to the server (using 'smarthost'), and "
-#| "users can <link linkend=\"Users--Using_email\">access their personal "
-#| "mail</link> through either POP3 or IMAP."
 msgid ""
 "By default email is set up for local delivery (i.e. within the school) only, "
 "though email delivery to the wider Internet may be set up if the school has "
@@ -1102,7 +1072,6 @@ msgstr "eth0 er forbundet til hovednetværket (10.0.0.0/8),"
 # engelsk fejl mellemrum
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
 "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
 "192.168.1.0/24) ."
@@ -1142,10 +1111,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone PCs, 800 MHz, 256 "
-#| "MiB RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
-#| "considerably better. Just a faster CPU will speed things up."
 msgid ""
 "For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
 "RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
@@ -1177,13 +1142,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "On workstations with little RAM the spell checker can cause OpenOffice."
-#| "org to hang if the swap space is too small. Then the system administrator "
-#| "has to disable the spell checker on OpenOffice.org or students have to "
-#| "kill OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB "
-#| "swap on a 256 MiB RAM workstation solves this, and the spell checker runs "
-#| "smoothly."
 msgid ""
 "On workstations with little RAM the spell checker can cause OpenOffice.org "
 "to hang if the swap space is too small. Then the system administrator has to "
@@ -1265,13 +1223,11 @@ msgstr "Du skal kun have en hovedserver, tjeneren."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "You can have up to 50 (diskless) workstations on the main network."
 msgid "You can have hundreds of workstations on the main network."
 msgstr "Du kan have op til 50 (diskløse) arbejdsstationer på hovednetværket."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "You can have up to 20 LTSP servers on the main network."
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured in LDAP."
@@ -1416,13 +1372,9 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
-#| "\""
 msgid ""
 "Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
-msgstr "Hent installationsmediet for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
+msgstr "Hent installationsmediet for Debian Edu 7.1+edu0 kodenavn »Wheezy«"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "DVD for i386, amd64"
@@ -1439,53 +1391,38 @@ msgstr ""
 "eller rsync via:"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXM-: these download URLs need to be adapted for wheezy still... They "
-#| "currently don't work"
 msgid ""
 "FIXME: only the CD download links work currently - the DVD and source DVD "
 "download URLs need to be adapted for wheezy still... They currently don't "
 "work."
 msgstr ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"FIXME: only the CD download links work currently - the DVD and source DVD "
+"download URLs need to be adapted for wheezy still... They currently don't "
+"work."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
 "iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
 "iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1500,40 +1437,28 @@ msgstr ""
 "er tilgængelig via"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
-"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
 "CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
-"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1544,41 +1469,28 @@ msgid "The sources are available via"
 msgstr "Kilderne er tilgængelige via"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
-#| "computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1629,10 +1541,8 @@ msgid "Select type of installation"
 msgstr "Vælg installationstype"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer boot menu"
@@ -1687,10 +1597,8 @@ msgstr ""
 "installationsprogrammet"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:Installer_advanced_options_a.png]"
 msgid "./images/Installer_advanced_options_a.png"
-msgstr "[attachment:Installer_advanced_options_a.png]"
+msgstr "./images/Installer_advanced_options_a.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 1"
@@ -1749,10 +1657,8 @@ msgstr ""
 "en forudfyldt fil (preseed)."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:Installer_advanced_options_b.png]"
 msgid "./images/Installer_advanced_options_b.png"
-msgstr "[attachment:Installer_advanced_options_b.png]"
+msgstr "./images/Installer_advanced_options_b.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 2"
@@ -1811,10 +1717,8 @@ msgstr ""
 "kræver en forudfyldt fil (preseed)."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/Installer_help.png"
-msgstr "./images/alert.png"
+msgstr "./images/Installer_help.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
@@ -1906,12 +1810,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "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. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
@@ -1925,11 +1823,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1942,11 +1835,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -2257,11 +2145,8 @@ msgstr ""
 "nettet varierer fra profil til profil:"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2431,10 +2316,6 @@ msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Diskless workstations must be added with "
-#| "GOsa² just like normal workstations or thin client servers."
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
@@ -2611,151 +2492,122 @@ msgstr ""
 "på netværket for de tynde klienter:"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid ""
 "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr ""
+"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "02-select_a_language.png"
 msgid "./images/02-select_a_language.png"
-msgstr "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "03-select_your_location.png"
 msgid "./images/03-select_your_location.png"
-msgstr "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
 msgid "./images/04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "05-Detect_and_mount_CD-ROM.png"
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "06-Load_installer_components_from_CD.png"
 msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "07-Detect_network_hardware.png"
 msgid "./images/07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
 msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
 msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
 msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
 msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12c-Set_up_users_and_passwords.png"
@@ -2763,97 +2615,79 @@ msgstr "12c-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
-msgstr ""
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12d-Setting-up-the-partitioner.png"
-msgstr ""
+msgstr "12d-Setting-up-the-partitioner.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/12e-creating_ext4.png"
-msgstr "./images/alert.png"
+msgstr "./images/12e-creating_ext4.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12e-creating_ext4.png"
-msgstr ""
+msgstr "12e-creating_ext4.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "13-Install the base system.png"
 msgid "./images/13-Install+the+base+system.png"
-msgstr "13-Install the base system.png"
+msgstr "./images/13-Install the base system.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "14-Select_and_install_software.png"
 msgid "./images/14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "17-Select_and_install_software.png"
 msgid "./images/17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "18-Build LTSP chroot.png"
 msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "18-Build LTSP chroot.png"
+msgstr "./images/18-Build+LTSP+chroot.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "20-Finish_the_Installation.png"
 msgid "./images/20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "22-Tjener_GRUB_boot_menu.png"
@@ -2861,71 +2695,55 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "24-Tjener-KDE_Start.png"
 msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+msgstr "./images/24-Tjener-KDE_Start.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Remote Desktop"
 msgid "KDE Desktop"
 msgstr "Fjernskrivebord"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "29-Diskless-WS-KDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+msgstr "./images/29-Diskless-WS-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Diskless workstations"
 msgid "Diskless Workstation Login"
 msgstr "Diskløse arbejdsstationer"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "30-ThinClient-LDM_Login.png"
 msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+msgstr "./images/30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Thin clients"
 msgid "Thin Client Login"
 msgstr "Tynde klienter"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2998,7 +2816,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Debian Edu desktop"
 msgid "Debian Edu KDE desktop"
 msgstr "Debian Edu-skrivebord"
 
@@ -3102,10 +2919,8 @@ msgid "GOsa² Login plus Overview"
 msgstr "GOsa²-logind samt overblik"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
-msgstr "./images/smile.png"
+msgstr "./images/gosa2_overview.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
@@ -3162,13 +2977,6 @@ msgstr ""
 
 #. 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, 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 "
@@ -3256,19 +3064,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| 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[3-6]}{%sn[3-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!)"
 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 "
@@ -3341,10 +3136,8 @@ msgid "Search, modify and delete users"
 msgstr "Søg, ændr og slet brugere"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
-msgstr "./images/smile.png"
+msgstr "./images/filterbox.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
@@ -3352,13 +3145,6 @@ msgstr "Filterbox"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To modify or delete a user, use GOsa² to browse the list of users on your "
-#| "system. On the very right of the screen you will find the \"Filter\" box, "
-#| "a search tool provided by GOsa². If you don't know the exact location of "
-#| "your user account in your tree, change to the base level of the GOsa²/"
-#| "LDAP tree and search there with the option marked \"[x] Search in subtrees"
-#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
 "system. On the middle of the screen you may open the \"Filter\" box, a "
@@ -3375,12 +3161,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When using the \"Filter\" box, results will immediately appear in the "
-#| "middle of the text in the table list view. Every line represents a user "
-#| "account and the items farthest to the right on each line are little icons "
-#| "that provide actions for you: edit, lock, set password, restore snapshot "
-#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
@@ -3405,10 +3185,8 @@ msgstr ""
 "medlem af."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/edit_user.png"
-msgstr "./images/smile.png"
+msgstr "./images/edit_user.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
@@ -3420,11 +3198,6 @@ msgstr "Angiv adgangskoder"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The students can change their own passwords by logging into GOsa² with "
-#| "their own usernames. A logged-in student will be presented with a very "
-#| "minimal version of GOsa² that only allows access to the student's own "
-#| "account data sheet and to the set-password dialog."
 msgid ""
 "The students can change their own passwords by logging into GOsa² with their "
 "own usernames. To ease the access of GOsa², an entry called Gosa is provided "
@@ -3469,10 +3242,8 @@ msgstr ""
 "på den efterfølgende side kan du angive en ny adgangskode valgt af dig selv"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:change_password_administratively.png]"
 msgid "./images/change_password_administratively.png"
-msgstr "[attachment:change_password_administratively.png]"
+msgstr "./images/change_password_administratively.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Set user password"
@@ -3492,16 +3263,6 @@ msgstr "Avanceret brugerhåndtering"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "It is possible to mass-create users with GOsa² by using a CSV file, which "
-#| "can be created with any good spreadsheet software (for example "
-#| "<computeroutput>oocalc</computeroutput>). At least, entries for the "
-#| "following fields have to be provided: uid, last name (sn) and first name "
-#| "(givenName). Make sure that there are no duplicate entries in the uid "
-#| "field. Please note that the check for duplicates must include already "
-#| "existing uid entries in LDAP (which could be obtained by executing "
-#| "<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
-#| "computeroutput> on the command line)."
 msgid ""
 "It is possible to mass-create users with GOsa² by using a CSV file, which "
 "can be created with any good spreadsheet software (for example "
@@ -3599,20 +3360,16 @@ msgid "Group Management with GOsa²"
 msgstr "Gruppehåndtering med GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
-msgstr "./images/alert.png"
+msgstr "./images/create_group.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr "opret gruppe"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/list_groups.png"
-msgstr "./images/smile.png"
+msgstr "./images/list_groups.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3708,10 +3465,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Diskless workstations must be added with "
-#| "GOsa² just like normal workstations or thin client servers."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks *have* to be added with "
@@ -3724,14 +3477,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To add a machine, use the GOsa² main menu, systems, add. (Choose "
-#| "netdevice, not server as that will leave you with a system object that "
-#| "can't be erased with GOsa². You can use an IP address/hostname from the "
-#| "preconfigured address space 10.0.0.0/8. Currently there are only two "
-#| "predefined fixed addresses: 10.0.2.2 (tjener) and 10.0.0.1 (gateway). The "
-#| "addresses from 10.0.16.20 to 10.0.31.254 (roughly 10.0.16.0/20 or 4000 "
-#| "hosts) are reserved for DHCP and are assigned dynamically."
 msgid ""
 "To add a machine, use the GOsa² main menu, systems, add. You can use an IP "
 "address/hostname from the preconfigured address space 10.0.0.0/8. Currently "
@@ -3750,14 +3495,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To assign a host with the MAC address 52:54:00:12:34:10 a static IP "
-#| "address in GOsa² you have to enter the MAC address, the hostname and the "
-#| "IP; alternatively you might click the <computeroutput>Propose ip</"
-#| "computeroutput> button which will show the first free fixed address in "
-#| "10.0.0.0/8, most probably something like 10.0.0.1 if you add the first "
-#| "machine this way. It may be better to first think about a suited range "
-#| "for your network."
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
@@ -3780,15 +3517,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa². Please note, that the IP "
-#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
-#| "computeroutput> belong to the dynamic IP range. These systems can then be "
-#| "modified though to suite your network. A few screenshots show how this "
-#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -3810,16 +3538,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
-#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
-#| "\n"
-#| "Enter password if you want to activate these changes, and ^c to abort.\n"
-#| "\n"
-#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-#| "enter password: █"
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
 "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -3840,40 +3558,32 @@ msgstr ""
 "indtast adgangskode: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_list.png]"
 msgid "./images/gosa_systems_list.png"
-msgstr "[attachment:gosa_systems_list.png]"
+msgstr "./images/gosa_systems_list.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
 msgstr "Visning af GOsa²-systemer"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_host_details.png]"
 msgid "./images/gosa_systems_host_details.png"
-msgstr "[attachment:gosa_systems_host_details.png]"
+msgstr "./images/gosa_systems_host_details.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
 msgstr "Værtsdetaljer"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_edit_host.png]"
 msgid "./images/gosa_systems_edit_host.png"
-msgstr "[attachment:gosa_systems_edit_host.png]"
+msgstr "./images/gosa_systems_edit_host.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Modify host"
 msgstr "Ændr vært"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "./images/gosa_systems_add_netgroup.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
@@ -4013,9 +3723,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories."
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -4369,10 +4076,8 @@ msgstr ""
 "ældste øjebliksbillede du ønsker at bevare:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:slbackup-php_maintenance.png]"
 msgid "./images/slbackup-php_maintenance.png"
-msgstr "[attachment:slbackup-php_maintenance.png]"
+msgstr "./images/slbackup-php_maintenance.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "slbackup-php Maintenance"
@@ -4835,13 +4540,6 @@ msgstr "LDAP-tjeneste skal konfigureres igen"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The LDAP setup has changed a lot from Lenny to Squeeze. The way users "
-#| "accounts, passwords, network settings, services and machines are treated "
-#| "is quite different now. So LDAP has to be rebuild from scratch. There's a "
-#| "script <computeroutput>ldap-debian-edu-install</computeroutput> (in /usr/"
-#| "bin) that could be used to achieve this. Read the comment at the "
-#| "beginning of that script carefully before doing anything."
 msgid ""
 "The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
 "LDAP has to be rebuild from scratch. There's a script <computeroutput>ldap-"
@@ -5197,14 +4895,8 @@ msgstr ""
 
 # engelsk fejl G-GB
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To extend home0 <emphasis role=\"strong\">by</emphasis> 30G, you insert a "
-#| "'+' (-L+30G)"
 msgid "To extend home0 by additional 30G, you insert a '+' (-L+30G)"
-msgstr ""
-"For at udvide home0 <emphasis role=\"strong\">med</emphasis> 30 GB, så "
-"indsætter du »+« (-L+30G)"
+msgstr "For at udvide home0 med 30 GB, så indsætter du »+« (-L+30G)"
 
 #. type: Content of: <article><section><section><title>
 msgid "Installing a graphical environment on the main-server to use GOsa²"
@@ -5281,9 +4973,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
-#| "Be careful and don't mess up the LDAP database."
 msgid ""
 "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
 "careful and don't mess up the LDAP database, same warning applies for "
@@ -5293,16 +4982,11 @@ msgstr ""
 "værktøj. Vær forsigtig og ødelæg ikke LDAP-databasen."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "jxplorer, an LDAP GUI"
 msgid "JXplorer, an LDAP GUI"
-msgstr "jxplorer, en grafisk brugerflade for LDAP"
+msgstr "JXplorer, en grafisk brugerflade for LDAP"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you prefer a GUI to work with the LDAP database, check out the "
-#| "<computeroutput>jxplorer</computeroutput> package."
 msgid ""
 "If you prefer a GUI to work with the LDAP database, check out the "
 "<computeroutput>jxplorer</computeroutput> package, wich is installed by "
@@ -5338,8 +5022,6 @@ msgstr ""
 "Kerberos. Den bruges dog hovedsagelig for testformål."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Using stable-updates (formerly known an volatile)"
 msgid "Using stable-updates (formerly known as volatile)"
 msgstr "Brug af stable-updates (tidligere kendt som volatile)"
 
@@ -5355,10 +5037,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "While you can use stable-updates directly, you don't have to: stable-"
-#| "updates are pushed into the stable suite regularily when stable "
-#| "pointreleases are done, which roughly happens every two months."
 msgid ""
 "While you can use stable-updates directly, you don't have to: stable-updates "
 "are pushed into the stable suite regularily when stable point releases are "
@@ -5400,21 +5078,16 @@ msgstr ""
 "at du bruger alle tilgængelige backporte.</emphasis>"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "Using backports.debian.org is simple:"
 msgid "Using backports is simple:"
-msgstr "Brug af backports.debian.org er nemt:"
+msgstr "Brug af backports er nemt:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid ""
-#| "echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
-#| "apt-get update"
+#, no-wrap
 msgid ""
 "echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 msgstr ""
-"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
 "apt-get update"
 
 #. type: Content of: <article><section><section><para>
@@ -5430,12 +5103,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Previously, extra configuration was needed to get updates installed "
-#| "automatically for installed backports, but since 2011 the <ulink url="
-#| "\"http://backports.debian.org/news/squeeze-backports_and_lenny-backports-"
-#| "sloppy_started/\">squeeze-backports suite</ulink> renders this "
-#| "unnecessary."
 msgid ""
 "Backports are automatically updated (if available) just like other packages. "
 "(Previously, extra configuration was needed to achieve this, but since 2011 "
@@ -5458,19 +5125,14 @@ msgid "Upgrading with a CD or DVD ROM"
 msgstr "Opgradering med en cd eller dvd-rom"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
-#| "physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Wheezy "
 "7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Hvis du ønsker at opgradere fra en version til den næste (for eksempel fra "
-"Wheezy 7.0.0 til 7.0.1) men ikke har internetadgang, kun et fysisk medie, så "
-"følg disse trin:"
+"Wheezy 7.1+edu0 til 7.3+edu1) men ikke har internetadgang, kun et fysisk "
+"medie, så følg disse trin:"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6306,13 +5968,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Add workstations with GOsa²"
 msgid "Add the diskless workstations to LDAP with GOsa²."
 msgstr "Tilføj arbejdsstationer med GOsa²"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
 
@@ -6382,11 +6042,6 @@ msgstr "<emphasis role=\"strong\">LTSP-klientkerne</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In order to support older hardware the package <computeroutput>linux-"
-#| "image-486</computeroutput> is installed by default. If all LTSP client "
-#| "machines support the 686 processor architecture the <computeroutput>linux-"
-#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
@@ -6402,16 +6057,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Select type of installation"
 msgid "LTSP client type selection"
 msgstr "Vælg installationstype"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Each LTSP server has two ethernet cards: one configured in the 10.0.0.0/8 "
-#| "subnet (which is shared with the main server), and another forming a "
-#| "local 192.168.0.0/24 subnet (a separate subnet for each LTSP server)."
 msgid ""
 "Each LTSP server has two ethernet cards: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
@@ -6565,7 +6215,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Changing the PXE menu on an LTSP server"
 msgid "Changing the PXE menu on a combined (main and LTSP) server"
 msgstr "Ændring af PXE-menuen på en LTSP-server"
 
@@ -6622,7 +6271,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Separate main- and LTSP servers"
 msgid "Separate main and LTSP server"
 msgstr "Adskil hoved- og LTSP-servere"
 
@@ -6672,10 +6320,9 @@ msgstr ""
 "hovednetværket:"
 
 #. type: CDATA
-#, fuzzy, no-wrap
-#| msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+#, no-wrap
 msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
-msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 boot=nfs ro quiet 3"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -7843,15 +7490,11 @@ msgid "Redirecting using global policies"
 msgstr "Videresende med brug af globale politikker"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXME explain how to use profiles from global policies for Windows "
-#| "machines in the skolelinux network"
 msgid ""
 "FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 
 #. type: Content of: <article><section><section><section><title>
@@ -8787,7 +8430,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Introduction to thin clients and diskless workstations"
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr "Introduktion til tynde klienter og diskløse arbejdsstationer"
 
@@ -9091,14 +8733,10 @@ msgid "New features in Debian Edu Wheezy"
 msgstr "Nye funktioner i Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
-#| "2013-??-??"
 msgid ""
 "New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Nye funktioner for Debian Edu 7.0.0+r0 kodenavn »Wheezy« udgivet ??-??-2013"
+"Nye funktioner for Debian Edu 7.1+edu0 kodenavn »Wheezy« udgivet ??-??-2013"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "User visible changes"
@@ -9132,7 +8770,6 @@ msgstr "Programopdateringer"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Everything which is new in Debian Wheezy:"
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
 msgstr "Alt som også er nyt i Debian Wheezy:"
 
@@ -9148,10 +8785,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Web browser Iceweasel 10 ESR"
 msgid "Web browser Iceweasel 17 ESR"
-msgstr "Internetbrowseren Iceweasel 10 ESR"
+msgstr "Internetbrowseren Iceweasel 17 ESR"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 3.5.4"
@@ -9195,28 +8830,19 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Debian Wheezy includes over 10,000 new packages available for "
-#| "installation, including the Chromium browser"
 msgid "Debian Wheezy includes about 37000 packages available for installation."
 msgstr ""
 "Debian Wheezy inkluderer over 10.000 nye pakker tilgængelige for "
 "installation, inklusiv browseren Chromium"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
 "and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Yderligere information om Debian Wheezy 7.0 er tilgængelig i <ulink url="
+"Yderligere information om Debian Wheezy 7.1 er tilgængelig i <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">udgivelsesnoterne</"
 "ulink> og <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installationsmanualen</ulink>."
@@ -9226,16 +8852,12 @@ msgid "Documentation and translation updates"
 msgstr "Opdateringer af dokumentation og oversættelser"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Translation updates for the templates used in the installer. These "
-#| "templates are now available in 28 languages."
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
 msgstr ""
 "Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
-"Disse skabeloner er nu tilgængelige på 28 sprog."
+"Disse skabeloner er nu tilgængelige på 29 sprog."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
@@ -9248,7 +8870,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Other LDAP related changes"
 msgid "LDAP related changes"
 msgstr "Andre LDAP-relaterede ændringer"
 
@@ -9283,20 +8904,6 @@ msgid "Copyright and authors"
 msgstr "Ophavsret og forfattere"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "This document is written and copyrighted by Holger Levsen (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
-#| "2004, 2007, 2008, 2009, 2010, 2012), Daniel Heß (2007), Patrick Winnertz "
-#| "(2007), Knut Yrvin (2007), Ralf Gesellensetter (2007), Ronny Aasen "
-#| "(2007), Morten Werner Forsbring (2007), Bjarne Nielsen (2007, 2008), "
-#| "Nigel Barker (2007), José L. Redrejo Rodríguez (2007), John Bildoy "
-#| "(2007), Joakim Seeberg (2008), Jürgen Leibner (2009, 2010, 2011, 2012), "
-#| "Oded Naveh (2009), Philipp Hübner (2009, 2010), Andreas Mundt (2010), "
-#| "Olivier Vitrat (2010, 2012), Vagrant Cascadian (2010), Mike Gabriel "
-#| "(2011), Justin B Rye (2012), David Prévot (2012), Wolfgang Schweer (2012) "
-#| "and Bernhard Hammes (2012) and is released under the GPL2 or any later "
-#| "version. Enjoy!"
 msgid ""
 "This document is written and copyrighted by Holger Levsen (2007, 2008, 2009, "
 "2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, 2007, "
@@ -9319,8 +8926,8 @@ msgstr ""
 "(2008), Jürgen Leibner (2009, 2010, 2011, 2012), Oded Naveh (2009), Philipp "
 "Hübner (2009, 2010), Andreas Mundt (2010), Olivier Vitrat (2010, 2012), "
 "Vagrant Cascadian (2010), Mike Gabriel (2011), Justin B Rye (2012), David "
-"Prévot (2012), Wolfgang Schweer (2012) og Bernhard Hammes (2012). Dokumentet "
-"er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
+"Prévot (2012), Wolfgang Schweer (2012, 2013) og Bernhard Hammes (2012). "
+"Dokumentet er udgivet under GPL2 eller enhver senere version. God fornøjelse!"
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -9419,11 +9026,6 @@ msgstr "Oversættelse af dette dokument"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "Versions of this document fully translated into German, Italian, French "
-#| "and Danish are available. Incomplete translations exist for Norwegian "
-#| "Bokmål and Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-"
-#| "edu-doc/\">take a look here</ulink> for your own language."
 msgid ""
 "Versions of this document fully translated into German, Italian, French and "
 "Danish are available. Incomplete translations exist for Norwegian Bokmål and "
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 bb8f18a..c9955e8 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -23,32 +23,24 @@ msgid "en"
 msgstr "it"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
-msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.0.0+r0"
+msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.1+edu0"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
-msgstr "Manuale per Debian Edu 7.0.0+r0 Codename Wheezy"
+msgstr "Manuale per Debian Edu 7.1+edu0 Codename Wheezy"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Debian Edu login"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
-msgstr "Questa è la guida  per Debian Edu Wheezy 7.0.0+r0 release."
+msgstr "Questa è la guida  per Debian Edu Wheezy 7.1+edu0 release."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -273,9 +265,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "DHCPD on the LTSP servers only serves a dedicated 192.168.0.0/24 network "
-#| "on the second interface and should seldom need to be changed."
 msgid ""
 "DHCPD on the LTSP servers only serves a dedicated network on the second "
 "interface (192.168.0.0/24 and 192.168.1.0/24 are preconfigured options) and "
@@ -1084,7 +1073,6 @@ msgstr "eth0 connessa alla rete principale (10.0.0.0/8)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
 "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
 "192.168.1.0/24) ."
@@ -1384,14 +1372,10 @@ msgstr ""
 "ulink>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
-#| "\""
 msgid ""
 "Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr ""
-"Download del supporto di installazione per Debian Edu 7.0.0+r0 Codename "
+"Download del supporto di installazione per Debian Edu 7.1+edu0 Codename "
 "Wheezy"
 
 #. type: Content of: <article><section><section><section><title>
@@ -1410,10 +1394,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-#| "still... They currently don't work. CD download URL (debian-"
-#| "edu~7.0+edu0~a0-CD.iso) should work."
 msgid ""
 "FIXME: only the CD download links work currently - the DVD and source DVD "
 "download URLs need to be adapted for wheezy still... They currently don't "
@@ -1424,40 +1404,28 @@ msgstr ""
 "CD.iso) should work."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
 "iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
 "iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "CD for i386, amd64"
@@ -1472,40 +1440,28 @@ msgstr ""
 "disponibile a "
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
 "edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a3-CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
 "CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a3-"
+"CD.iso\">debian-edu-7.1+edu0~a3-CD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
 "edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 msgstr ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu-7.1+edu0~a3-CD.iso|debian-edu-7.1+edu0~a3-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Source DVD"
@@ -1516,41 +1472,28 @@ msgid "The sources are available via"
 msgstr "I sorgenti sono disponibili via"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
 msgid ""
 "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 msgstr ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
-#| "computeroutput>"
 msgid ""
 "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
 "source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
 msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
 
 #. type: Content of: <article><section><section><title>
 msgid "Request a CD/DVD by mail"
@@ -1601,10 +1544,8 @@ msgid "Select type of installation"
 msgstr "Selezionare il tipo d'installazione"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "01-Installer_boot_menu.png"
 msgid "./images/01-Installer_boot_menu.png"
-msgstr "01-Installer_boot_menu.png"
+msgstr "./images/01-Installer_boot_menu.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer boot menu"
@@ -1659,10 +1600,8 @@ msgstr ""
 "sull'utilizzo dell'installer"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:Installer_advanced_options_a.png]"
 msgid "./images/Installer_advanced_options_a.png"
-msgstr "[attachment:Installer_advanced_options_a.png]"
+msgstr "./images/Installer_advanced_options_a.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 1"
@@ -1722,10 +1661,8 @@ msgstr ""
 "un file di preconfigurazione."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:Installer_advanced_options_b.png]"
 msgid "./images/Installer_advanced_options_b.png"
-msgstr "[attachment:Installer_advanced_options_b.png]"
+msgstr "./images/Installer_advanced_options_b.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer advanced options screen 2"
@@ -1784,10 +1721,8 @@ msgstr ""
 "bisogno di un file di preconfigurazione."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/Installer_help.png"
-msgstr "./images/alert.png"
+msgstr "./images/Installer_help.png"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 msgid "Installer help screen"
@@ -1879,12 +1814,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "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. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
@@ -1898,11 +1827,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
 "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
@@ -1915,11 +1839,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To install the <emphasis role=\"strong\">LXDE</emphasis> desktop instead, "
-#| "add <computeroutput>desktop=lxde</computeroutput> to the kernel boot "
-#| "parameters. This option is only available when installing from CD, not "
-#| "when installing from DVD."
 msgid ""
 "To install the <emphasis role=\"strong\">Xfce</emphasis> desktop instead, "
 "add <computeroutput>desktop=xfce</computeroutput> to the kernel boot "
@@ -2239,11 +2158,8 @@ msgstr ""
 "prendere dalla rete cambia in base al profilo scelto:"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 msgid "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
+msgstr "FIXME: Check these numbers for Wheezy.  They are 2012-01-22 for Lenny."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid "Main server: 8 out of 115 MiB downloaded."
@@ -2580,151 +2496,122 @@ msgstr ""
 "network:"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
 msgid ""
 "FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr ""
+"FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png)."
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "01-Installer_boot_menu.png"
 msgstr "01-Installer_boot_menu.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "02-select_a_language.png"
 msgid "./images/02-select_a_language.png"
-msgstr "02-select_a_language.png"
+msgstr "./images/02-select_a_language.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "02-select_a_language.png"
 msgstr "02-select_a_language.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "03-select_your_location.png"
 msgid "./images/03-select_your_location.png"
-msgstr "03-select_your_location.png"
+msgstr "./images/03-select_your_location.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "03-select_your_location.png"
 msgstr "03-select_your_location.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "04-Configure_the_keyboard.png"
 msgid "./images/04-Configure_the_keyboard.png"
-msgstr "04-Configure_the_keyboard.png"
+msgstr "./images/04-Configure_the_keyboard.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "04-Configure_the_keyboard.png"
 msgstr "04-Configure_the_keyboard.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "05-Detect_and_mount_CD-ROM.png"
 msgid "./images/05-Detect_and_mount_CD-ROM.png"
-msgstr "05-Detect_and_mount_CD-ROM.png"
+msgstr "./images/05-Detect_and_mount_CD-ROM.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "05-Detect_and_mount_CD-ROM.png"
 msgstr "05-Detect_and_mount_CD-ROM.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "06-Load_installer_components_from_CD.png"
 msgid "./images/06-Load_installer_components_from_CD.png"
-msgstr "06-Load_installer_components_from_CD.png"
+msgstr "./images/06-Load_installer_components_from_CD.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "06-Load_installer_components_from_CD.png"
 msgstr "06-Load_installer_components_from_CD.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "07-Detect_network_hardware.png"
 msgid "./images/07-Detect_network_hardware.png"
-msgstr "07-Detect_network_hardware.png"
+msgstr "./images/07-Detect_network_hardware.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "07-Detect_network_hardware.png"
 msgstr "07-Detect_network_hardware.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "08-Choose_Debian_Edu_profile.png"
 msgid "./images/08-Choose_Debian_Edu_profile.png"
-msgstr "08-Choose_Debian_Edu_profile.png"
+msgstr "./images/08-Choose_Debian_Edu_profile.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "08-Choose_Debian_Edu_profile.png"
 msgstr "08-Choose_Debian_Edu_profile.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
-msgstr "09-Really_use_the_automatic_partitioning_tool.png"
+msgstr "./images/09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "09-Really_use_the_automatic_partitioning_tool.png"
 msgstr "09-Really_use_the_automatic_partitioning_tool.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
-msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
+msgstr "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 msgstr "10-Really_use_the_automatic_partitioning_tool-Yes.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "11-Participate_in_the_package_usage_survey.png"
 msgid "./images/11-Participate_in_the_package_usage_survey.png"
-msgstr "11-Participate_in_the_package_usage_survey.png"
+msgstr "./images/11-Participate_in_the_package_usage_survey.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "11-Participate_in_the_package_usage_survey.png"
 msgstr "11-Participate_in_the_package_usage_survey.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12-Set_up_users_and_passwords.png"
 msgid "./images/12-Set_up_users_and_passwords.png"
-msgstr "12-Set_up_users_and_passwords.png"
+msgstr "./images/12-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "12-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12a-Set_up_users_and_passwords.png"
 msgid "./images/12a-Set_up_users_and_passwords.png"
-msgstr "12a-Set_up_users_and_passwords.png"
+msgstr "./images/12a-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "12a-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12b-Set_up_users_and_passwords.png"
 msgid "./images/12b-Set_up_users_and_passwords.png"
-msgstr "12b-Set_up_users_and_passwords.png"
+msgstr "./images/12b-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "12b-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "12c-Set_up_users_and_passwords.png"
 msgid "./images/12c-Set_up_users_and_passwords.png"
-msgstr "12c-Set_up_users_and_passwords.png"
+msgstr "./images/12c-Set_up_users_and_passwords.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12c-Set_up_users_and_passwords.png"
@@ -2732,97 +2619,79 @@ msgstr "12c-Set_up_users_and_passwords.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 msgid "./images/12d-Setting-up-the-partitioner.png"
-msgstr ""
+msgstr "./images/12d-Setting-up-the-partitioner.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12d-Setting-up-the-partitioner.png"
-msgstr ""
+msgstr "12d-Setting-up-the-partitioner.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/12e-creating_ext4.png"
-msgstr "./images/alert.png"
+msgstr "./images/12e-creating_ext4.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "12e-creating_ext4.png"
-msgstr ""
+msgstr "12e-creating_ext4.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "13-Install the base system.png"
 msgid "./images/13-Install+the+base+system.png"
-msgstr "13-Install the base system.png"
+msgstr "./images/13-Install+the+base+system.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "13-Install the base system.png"
 msgstr "13-Install the base system.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "14-Select_and_install_software.png"
 msgid "./images/14-Select_and_install_software.png"
-msgstr "14-Select_and_install_software.png"
+msgstr "./images/14-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "14-Select_and_install_software.png"
 msgstr "14-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "17-Select_and_install_software.png"
 msgid "./images/17-Select_and_install_software.png"
-msgstr "17-Select_and_install_software.png"
+msgstr "./images/17-Select_and_install_software.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "17-Select_and_install_software.png"
 msgstr "17-Select_and_install_software.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "18-Build LTSP chroot.png"
 msgid "./images/18-Build+LTSP+chroot.png"
-msgstr "18-Build LTSP chroot.png"
+msgstr "./images/18-Build LTSP chroot.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "18-Build LTSP chroot.png"
 msgstr "18-Build LTSP chroot.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgid "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
-msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
+msgstr "./images/19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 msgstr "19-Install_the_GRUB_boot_loader_on_a_hard_disk.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "20-Finish_the_Installation.png"
 msgid "./images/20-Finish_the_Installation.png"
-msgstr "20-Finish_the_Installation.png"
+msgstr "./images/20-Finish_the_Installation.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "20-Finish_the_Installation.png"
 msgstr "20-Finish_the_Installation.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "21-Finish_the_Installation-Installation_complete.png"
 msgid "./images/21-Finish_the_Installation-Installation_complete.png"
-msgstr "21-Finish_the_Installation-Installation_complete.png"
+msgstr "./images/21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "21-Finish_the_Installation-Installation_complete.png"
 msgstr "21-Finish_the_Installation-Installation_complete.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "22-Tjener_GRUB_boot_menu.png"
 msgid "./images/22-Tjener_GRUB_boot_menu.png"
-msgstr "22-Tjener_GRUB_boot_menu.png"
+msgstr "./images/22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "22-Tjener_GRUB_boot_menu.png"
@@ -2830,71 +2699,55 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
 msgid "tjener KDM Login"
 msgstr "23-Tjener-KDM_Login.png"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "24-Tjener-KDE_Start.png"
 msgid "./images/24-Tjener-KDE_Start.png"
-msgstr "24-Tjener-KDE_Start.png"
+msgstr "./images/24-Tjener-KDE_Start.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE starting..."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "26-Tjener-KDE_Desktop_Browser.png"
 msgid "./images/26-Tjener-KDE_Desktop_Browser.png"
-msgstr "26-Tjener-KDE_Desktop_Browser.png"
+msgstr "./images/26-Tjener-KDE_Desktop_Browser.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "KDE and Browser"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "27-Tjener-KDE_Desktop.png"
 msgid "./images/27-Tjener-KDE_Desktop.png"
-msgstr "27-Tjener-KDE_Desktop.png"
+msgstr "./images/27-Tjener-KDE_Desktop.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Remote Desktop"
 msgid "KDE Desktop"
 msgstr "Desktop Remoto"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "29-Diskless-WS-KDM_Login.png"
 msgid "./images/29-Diskless-WS-LDM_Login.png"
-msgstr "29-Diskless-WS-KDM_Login.png"
+msgstr "./images/29-Diskless-WS-KDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Diskless workstations"
 msgid "Diskless Workstation Login"
 msgstr "Workstation diskless (senza disco)"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "30-ThinClient-LDM_Login.png"
 msgid "./images/30-ThinClient-LDM_Login.png"
-msgstr "30-ThinClient-LDM_Login.png"
+msgstr "./images/30-ThinClient-LDM_Login.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Thin clients"
 msgid "Thin Client Login"
 msgstr "Thin client"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "31-ThinClient-KDE_Desktop.png"
 msgid "./images/31-ThinClient-KDE_Desktop.png"
-msgstr "31-ThinClient-KDE_Desktop.png"
+msgstr "./images/31-ThinClient-KDE_Desktop.png"
 
 #. type: Content of: <article><section><title>
 msgid "Getting started"
@@ -2968,7 +2821,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Debian Edu desktop"
 msgid "Debian Edu KDE desktop"
 msgstr "Debian Edu desktop"
 
@@ -3073,10 +2925,8 @@ msgid "GOsa² Login plus Overview"
 msgstr "Accesso a GOsa² e Pagina iniziale"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/gosa2_overview.png"
-msgstr "./images/smile.png"
+msgstr "./images/gosa2_overview.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² overview page after login as the first user"
@@ -3137,13 +2987,6 @@ msgstr ""
 
 #. 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, 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 "
@@ -3304,10 +3147,8 @@ msgid "Search, modify and delete users"
 msgstr "Cercare, modificare e cancellare utenti"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/filterbox.png"
-msgstr "./images/smile.png"
+msgstr "./images/filterbox.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Filterbox"
@@ -3315,13 +3156,6 @@ msgstr "Il box Filter"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To modify or delete a user, use GOsa² to browse the list of users on your "
-#| "system. On the very right of the screen you will find the \"Filter\" box, "
-#| "a search tool provided by GOsa². If you don't know the exact location of "
-#| "your user account in your tree, change to the base level of the GOsa²/"
-#| "LDAP tree and search there with the option marked \"[x] Search in subtrees"
-#| "\"."
 msgid ""
 "To modify or delete a user, use GOsa² to browse the list of users on your "
 "system. On the middle of the screen you may open the \"Filter\" box, a "
@@ -3337,12 +3171,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When using the \"Filter\" box, results will immediately appear in the "
-#| "middle of the text in the table list view. Every line represents a user "
-#| "account and the items farthest to the right on each line are little icons "
-#| "that provide actions for you: edit, lock, set password, restore snapshot "
-#| "(greyed out if no snapshot was taken before), take snapshot and delete."
 msgid ""
 "When using the \"Filter\" box, results will immediately appear in the middle "
 "of the text in the table list view. Every line represents a user account and "
@@ -3368,10 +3196,8 @@ msgstr ""
 "collegato."
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/edit_user.png"
-msgstr "./images/smile.png"
+msgstr "./images/edit_user.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Editing user data"
@@ -3383,11 +3209,6 @@ msgstr "Impostare la password"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The students can change their own passwords by logging into GOsa² with "
-#| "their own usernames. A logged-in student will be presented with a very "
-#| "minimal version of GOsa² that only allows access to the student's own "
-#| "account data sheet and to the set-password dialog."
 msgid ""
 "The students can change their own passwords by logging into GOsa² with their "
 "own usernames. To ease the access of GOsa², an entry called Gosa is provided "
@@ -3433,10 +3254,8 @@ msgstr ""
 "scelta"
 
 #. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:change_password_administratively.png]"
 msgid "./images/change_password_administratively.png"
-msgstr "[attachment:change_password_administratively.png]"
+msgstr "./images/change_password_administratively.png"
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Set user password"
@@ -3456,16 +3275,6 @@ msgstr "Gestione avanzata degli utenti"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "It is possible to mass-create users with GOsa² by using a CSV file, which "
-#| "can be created with any good spreadsheet software (for example "
-#| "<computeroutput>oocalc</computeroutput>). At least, entries for the "
-#| "following fields have to be provided: uid, last name (sn) and first name "
-#| "(givenName). Make sure that there are no duplicate entries in the uid "
-#| "field. Please note that the check for duplicates must include already "
-#| "existing uid entries in LDAP (which could be obtained by executing "
-#| "<computeroutput>getent passwd | grep tjener/home | cut -d\":\" -f1</"
-#| "computeroutput> on the command line)."
 msgid ""
 "It is possible to mass-create users with GOsa² by using a CSV file, which "
 "can be created with any good spreadsheet software (for example "
@@ -3565,20 +3374,16 @@ msgid "Group Management with GOsa²"
 msgstr "Gestione dei gruppi con GOsa²"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/alert.png"
 msgid "./images/create_group.png"
-msgstr "./images/alert.png"
+msgstr "./images/create_group.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "create group"
 msgstr "creare il gruppo"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/smile.png"
 msgid "./images/list_groups.png"
-msgstr "./images/smile.png"
+msgstr "./images/list_groups.png"
 
 #. type: Content of: <article><section><section><para>
 msgid "The management of groups is very similar to the management of users."
@@ -3675,11 +3480,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows diskless workstations and thin clients to be "
-#| "booted on the main network. Unlike workstations, diskless workstations "
-#| "don't have to be added to LDAP with GOsa², but can be, for example if you "
-#| "want to force the hostname."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks *have* to be added with "
@@ -3708,14 +3508,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To assign a host with the MAC address 52:54:00:12:34:10 a static IP "
-#| "address in GOsa² you have to enter the MAC address, the hostname and the "
-#| "IP; alternatively you might click the <computeroutput>Propose ip</"
-#| "computeroutput> button which will show the first free fixed address in "
-#| "10.0.0.0/8, most probably something like 10.0.0.1 if you add the first "
-#| "machine this way. It may be better to first think about a suited range "
-#| "for your network."
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
@@ -3738,15 +3530,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If the machines have booted as thin clients/diskless workstations or have "
-#| "been installed using any of the networked profiles, the "
-#| "<computeroutput>sitesummary2ldapdhcp</computeroutput> script can be used "
-#| "to automatically add machines to GOsa². Please note, that the IP "
-#| "addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
-#| "computeroutput> belong to the dynamic IP range. These systems can then be "
-#| "modified though to suite your network. A few screenshots show how this "
-#| "may be done."
 msgid ""
 "If the machines have booted as thin clients/diskless workstations or have "
 "been installed using any of the networked profiles, the "
@@ -3769,16 +3552,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "root at tjener:~# sitesummary2ldapdhcp -a\n"
-#| "info: Create GOSa machine for auto-mac-00-02-b3-20-e4-aa [10.0.16.25] id ether-00:02:b3:20:e4:aa.\n"
-#| "info: Updating machine tjener.interm [10.0.2.2] id ether-00:04:76:d3:28:b7.\n"
-#| "info: Create GOSa machine for auto-mac-00-0d-59-99-d6-98 [10.0.16.26] id ether-00:0d:59:99:d6:98.\n"
-#| "\n"
-#| "Enter password if you want to activate these changes, and ^c to abort.\n"
-#| "\n"
-#| "Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
-#| "enter password: █"
 msgid ""
 "root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
 "info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
@@ -3799,40 +3572,32 @@ msgstr ""
 "enter password: █"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "./images/collect_system_info.png"
 msgid "./images/gosa_systems_list.png"
-msgstr "./images/collect_system_info.png"
+msgstr "./images/gosa_systems_list.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "GOsa² systems listing"
 msgstr "GOsa² systems listing"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_host_details.png]"
 msgid "./images/gosa_systems_host_details.png"
-msgstr "[attachment:gosa_systems_host_details.png]"
+msgstr "./images/gosa_systems_host_details.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Host details"
 msgstr "Dettagli dell'host"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_edit_host.png]"
 msgid "./images/gosa_systems_edit_host.png"
-msgstr "[attachment:gosa_systems_edit_host.png]"
+msgstr "./images/gosa_systems_edit_host.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Modify host"
 msgstr "Modificare l'host"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:gosa_systems_add_netgroup.png]"
 msgid "./images/gosa_systems_add_netgroup.png"
-msgstr "[attachment:gosa_systems_add_netgroup.png]"
+msgstr "./images/gosa_systems_add_netgroup.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "Add netgroup"
@@ -3976,9 +3741,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Remember to configure workstations and ltsp-servers properly with GOsa², "
-#| "or your users won't be able to access their home directories."
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -4330,10 +4092,8 @@ msgstr ""
 "menudella pagina di backup e selezionare lo snapshot da conservare:"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:slbackup-php_maintenance.png]"
 msgid "./images/slbackup-php_maintenance.png"
-msgstr "[attachment:slbackup-php_maintenance.png]"
+msgstr "./images/slbackup-php_maintenance.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 msgid "slbackup-php Maintenance"
@@ -5154,14 +4914,8 @@ msgstr ""
 "resize2fs /dev/vg_system/skole+tjener+home0"
 
 #. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "To extend home0 <emphasis role=\"strong\">by</emphasis> 30G, you insert a "
-#| "'+' (-L+30G)"
 msgid "To extend home0 by additional 30G, you insert a '+' (-L+30G)"
-msgstr ""
-"Per estendere home0 <emphasis role=\"strong\">a</emphasis> 30G, si deve "
-"inserire un '+' (-L+30G)"
+msgstr "Per estendere home0 a 30G, si deve inserire un '+' (-L+30G)"
 
 #. type: Content of: <article><section><section><title>
 msgid "Installing a graphical environment on the main-server to use GOsa²"
@@ -5236,10 +4990,6 @@ msgstr ""
 "LDAP."
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
-#| "Be careful and don't mess up the LDAP database, same applies for jxplorer."
 msgid ""
 "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
 "careful and don't mess up the LDAP database, same warning applies for "
@@ -5247,13 +4997,11 @@ msgid ""
 msgstr ""
 "Attenzione: <computeroutput>ldapvi</computeroutput> è uno strumento molto "
 "potente. Fare attenzione a non rovinare tutto il database LDAP, lo stesso "
-"vale per jxplorer."
+"vale per JXplorer."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "jxplorer, an LDAP GUI"
 msgid "JXplorer, an LDAP GUI"
-msgstr "jxplorer, una GUI LDAP"
+msgstr "JXplorer, una GUI LDAP"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5409,19 +5157,14 @@ msgid "Upgrading with a CD or DVD ROM"
 msgstr "Aggiornamento da CD o DVD"
 
 #. type: Content of: <article><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "If you want to upgrade from one version to another (for example from "
-#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
-#| "physical media, follow these steps:"
 msgid ""
 "If you want to upgrade from one version to another (for example from Wheezy "
 "7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
 "physical media, follow these steps:"
 msgstr ""
 "Se si vuole aggiornare da una versione a un'altra (per esempio da Wheezy "
-"7.0.0 a 7.0.1) ma non si ha collegamento internet, ma solo un media fisico, "
-"occorre seguire questi passi:"
+"7.1+edu0 a 7.3+edu1) ma non si ha collegamento internet, ma solo un media "
+"fisico, occorre seguire questi passi:"
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -6233,11 +5976,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "LTSP defines 320MB as the default minimum amount of RAM for diskless "
-#| "workstations. If the amount of RAM is less, the machine will boot as thin "
-#| "client. Unlike workstations, diskless workstations run without any need "
-#| "to add them with GOsa²."
 msgid ""
 "LTSP defines 320MB as the default minimum amount of RAM for diskless "
 "workstations. If the amount of RAM is less, the machine will boot as thin "
@@ -6265,13 +6003,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Add workstations with GOsa²"
 msgid "Add the diskless workstations to LDAP with GOsa²."
 msgstr "Aggiungere workstation con GOsa²"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 
@@ -6343,11 +6079,6 @@ msgstr "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In order to support older hardware the package <computeroutput>linux-"
-#| "image-486</computeroutput> is installed by default. If all LTSP client "
-#| "machines support the 686 processor architecture the <computeroutput>linux-"
-#| "image-686</computeroutput> package could be installed in the chroot."
 msgid ""
 "In order to support older hardware the package <computeroutput>linux-"
 "image-486</computeroutput> is installed by default. If all LTSP client "
@@ -7820,15 +7551,11 @@ msgid "Redirecting using global policies"
 msgstr "Reindirizzamento usando una policy globale"
 
 #. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXME explain how to use profiles from global policies for Windows "
-#| "machines in the skolelinux network"
 msgid ""
 "FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 msgstr ""
-"FIXME explain how to use profiles from global policies for Windows machines "
+"FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
 
 #. type: Content of: <article><section><section><section><title>
@@ -8776,7 +8503,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Changing kioskmode on diskless workstations"
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr "Cambiare il modo kiosk sulle workstation diskless"
 
@@ -9086,15 +8812,11 @@ msgid "New features in Debian Edu Wheezy"
 msgstr "Nuove caratteristiche in Debian Edu Wheezy"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
-#| "2013-??-??"
 msgid ""
 "New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
 msgstr ""
-"Nuove caratteristiche in Debian Edu 7.0.0+r0 Codename \"Wheezy\" "
-"released ??-??-2012"
+"Nuove caratteristiche in Debian Edu 7.1+edu0 Codename Wheezy "
+"released ??-??-2013"
 
 #. type: Content of: <article><section><section><section><title>
 msgid "User visible changes"
@@ -9127,33 +8849,26 @@ msgid "Software updates"
 msgstr "Aggiornamenti software"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Everything which is new in Debian Wheezy, eg:"
 msgid "Everything which is new in Debian Wheezy 7.1, eg:"
-msgstr "Tutto ciò che è nuovo in Debian Wheezy, ad esempio:"
+msgstr "Tutto ciò che è nuovo in Debian Wheezy 7.1, ad esempio:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "Linux kernel 3.2.x"
 msgstr "Linux kernel 3.2.x"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-#| "installed by default; to choose GNOME or LXDE: see manual.)"
 msgid ""
 "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
 "0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
 "manual.)"
 msgstr ""
-"Ambienti desktop KDE \"Plasma\" 4.8.4, GNOME 3.4, e LXDE 4 (KDE è installati "
-"di default; per scegliere GNOME o LXDE: vedere il manuale.)"
+"Ambienti desktop KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, e LXDE 0.5.5 "
+"(KDE è installati di default; per scegliere GNOME, Xfce o LXDE: vedere il "
+"manuale.)"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Web browser Iceweasel 10 ESR"
 msgid "Web browser Iceweasel 17 ESR"
-msgstr "Browser web Iceweasel 10 ESR"
+msgstr "Browser web Iceweasel 17 ESR"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 msgid "LibreOffice 3.5.4"
@@ -9202,19 +8917,13 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
-#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
-#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
-#| "installmanual\">installation manual</ulink>."
 msgid ""
 "More information about Debian Wheezy 7.1 is provided in the <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
 "and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
 msgstr ""
-"Altre informazioni su Debian Wheezy 6.0 sono disponibili nelle <ulink url="
+"Altre informazioni su Debian Wheezy 7.1 sono disponibili nelle <ulink url="
 "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
 "e nell'<ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
 "\">installation manual</ulink>."
@@ -9224,16 +8933,12 @@ msgid "Documentation and translation updates"
 msgstr "Aggiornamenti della documentazione e delle traduzioni"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid ""
-#| "Translation updates for the templates used in the installer. These "
-#| "templates are now available in 28 languages."
 msgid ""
 "Translation updates for the templates used in the installer. These templates "
 "are now available in 29 languages."
 msgstr ""
 "Aggionate le traduzioni per i template usati dall'installer. Questi template "
-"sono disponibili in 28 lingue."
+"sono disponibili in 29 lingue."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
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 b2677ea..701d78d 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -24,32 +24,24 @@ msgid "en"
 msgstr "nb"
 
 #. type: Content of: <article><articleinfo><title>
-#, fuzzy
-#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
 msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
-msgstr "Debian Edu / Skolelinux Wheezy 7.0.0+r0 utgivelsesmanual"
+msgstr "Debian Edu / Skolelinux Wheezy 7.1+edu0 utgivelsesmanual"
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
 msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
-msgstr "Utgivelsesmanual for Debian Edu 7.0.0+r0 kodenavn Wheezy"
+msgstr "Utgivelsesmanual for Debian Edu 7.1+edu0 kodenavn Wheezy"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "[attachment:23-Tjener-KDM_Login.png]"
 msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "[attachment:23-Tjener-KDM_Login.png]"
+msgstr "./images/23-Tjener-KDM_Login.png"
 
 #. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
 msgid "Debian Edu login"
 msgstr "Skolelinux innlogging"
 
 #. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
 msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
-msgstr "Dette er utgivelsesmanualen for Debian Edu Wheezy versjon 7.0.0+r0."
+msgstr "Dette er utgivelsesmanualen for Debian Edu Wheezy versjon 7.1+edu0."
 
 #. type: Content of: <article><section><para>
 msgid ""
@@ -78,10 +70,6 @@ msgstr "Om Debian Edu og Skolelinux"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "What this means for your school is that Skolelinux is a version of Debian "
-#| "providing an out-of-the box environment of a completely configured school-"
-#| "network."
 msgid ""
 "Debian Edu aka Skolelinux is a Linux distribution based on Debian providing "
 "an out-of-the box environment of a completely configured school network."
@@ -116,12 +104,6 @@ msgstr "Litt historie og hvorfor to navn"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> is a Linux "
-#| "distribution made by the Debian Edu project. As a <ulink url=\"http://"
-#| "wiki.debian.org/DebianPureBlends\">Debian Pure Blends</ulink> "
-#| "distribution it is a official <ulink url=\"http://www.debian.org"
-#| "\">Debian</ulink> subproject."
 msgid ""
 "<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> is a Linux "
 "distribution created by the Debian Edu project. As a <ulink url=\"http://"
@@ -153,11 +135,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In Norway, where Skolelinux was started, the main target group initially "
-#| "were schools serving the 6-16 years age bracket. Today the system is in "
-#| "use in several countries around the world, with most installations in "
-#| "Norway, Spain, Germany and France."
 msgid ""
 "The main target group in Norway initially were schools serving the 6-16 "
 "years age bracket. Today the system is in use in several countries around "
@@ -184,15 +161,11 @@ msgid "Network"
 msgstr "Nettverk"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
 msgid "./images/Debian_Edu_Network_Wheezy.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:network-"
-"arch.]png\"/></imageobject>"
+msgstr "./images/Debian_Edu_Network_Wheezy.png"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Requirements for a network setup"
 msgid "The Debian Edu network topology"
 msgstr "Krav for nettverksoppsett"
 
@@ -234,12 +207,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In order to simplify the standard setup of Skolelinux, the Internet "
-#| "connection runs over a separate router. It is possible to set up Debian "
-#| "with both a modem and an ISDN connection, however no attempt is made to "
-#| "make such a setup work out of the box for Skolelinux (the setup needed to "
-#| "adjust the default situation to this should be documented separately)."
 msgid ""
 "In order to simplify the standard setup of Skolelinux, the Internet "
 "connection runs over a separate router. It is possible to set up Debian with "
@@ -254,7 +221,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Requirements for a network setup"
 msgid "The default network setup"
 msgstr "Krav for nettverksoppsett"
 
@@ -291,12 +257,6 @@ msgstr "Hovedtjener"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A Skolelinux network needs one main server (also called \"tjener\" which "
-#| "is Norwegian and means \"server\") which per default has the IP address "
-#| "10.0.2.2 and is installed by selecting the main server profile. It's "
-#| "possible (but not requiered) to also select and install the thin-client-"
-#| "server and workstation profiles in addition to the main server profile."
 msgid ""
 "A Skolelinux network needs one main server (also called \"tjener\" which is "
 "Norwegian and means \"server\") which per default has the IP address "
@@ -315,17 +275,6 @@ msgstr "Tjenester som kjører på hovedtjeneren"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "With the exception of the control of the thin-clients, all services are "
-#| "initially set up on one central computer (the main server). For "
-#| "performance reasons, the thin-client-server should be a separate machine "
-#| "(though it is possible to install both the main server and thin-client "
-#| "server profiles on the same machine). All services are allocated a "
-#| "dedicated DNS-name and are offered exclusively over IPv4. The allocated "
-#| "DNS name makes it easy to move individual services from the main-server "
-#| "to a different machine, by simply stopping the service on the main-"
-#| "server, and changing the DNS configuration to point to the new location "
-#| "of the service (which should be setup on that machine first of course)."
 msgid ""
 "With the exception of the control of the thin-clients, all services are "
 "initially set up on one central computer (the main server). For performance "
@@ -350,10 +299,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To ensure security all connections where passwords are transmitted over "
-#| "the network are encrypted, so no passwords are send over the network as "
-#| "plain text."
 msgid ""
 "To ensure security all connections where passwords are transmitted over the "
 "network are encrypted, so no passwords are sent over the network as plain "
@@ -365,13 +310,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Below is a list of the services that are set up by default in a "
-#| "Skolelinux network, with the DNS name of each service given in square "
-#| "brackets. If possible all configuration files will refer to the service "
-#| "by name (without the domain name) thus making it easy for schools to "
-#| "change either their domain (if they have an own DNS domain) or the IP "
-#| "addresses they use."
 msgid ""
 "Below is a table of the services that are set up by default in a Skolelinux "
 "network and the DNS name of each service. If possible all configuration "
@@ -398,13 +336,11 @@ msgstr "<emphasis role='strong'>Tjenestebeskrivelse</emphasis>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">hostname</emphasis>"
 msgid "<emphasis role=\"strong\">Common name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">hostname</emphasis>"
 msgid "<emphasis role=\"strong\">DNS service name</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
@@ -422,7 +358,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "Domain Name System"
 msgid "Domain Name Service"
 msgstr "Domain Name System"
 
@@ -460,7 +395,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "Home Directories via Network File System (SMB/NFS) [homes]"
 msgid "Home Directories via Network File System"
 msgstr "Hjemmeområder på nettverksfilsystem (SMB/NFS) [homes]"
 
@@ -470,7 +404,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "XP home"
 msgid "homes"
 msgstr "XP Home"
 
@@ -536,7 +469,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "Teachers"
 msgid "Web Cache"
 msgstr "Lærere"
 
@@ -546,7 +478,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "Teachers"
 msgid "webcache"
 msgstr "Lærere"
 
@@ -600,10 +531,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Machine and Service Surveillance with Error Reporting, plus Status and "
-#| "History on the Web. Error Reporting by E-mail (munin,nagios and site-"
-#| "summary)"
 msgid ""
 "Machine and Service Surveillance with Error Reporting, plus Status and "
 "History on the Web. Error Reporting by email"
@@ -617,12 +544,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Each user stores his personal files in his home folder which is made "
-#| "available by the server. Home folders are accessible from all machines, "
-#| "giving users access to the same files regardless of which machine they "
-#| "are using. The server is operating system agnostic in offering access "
-#| "using NFS for Unix Clients, SMB for Windows and Macintosh clients."
 msgid ""
 "Personal files for each user are stored in their home directories, which are "
 "made available by the server. Home directories are accessible from all "
@@ -657,9 +578,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "All services are accessible using the same username and password, thanks "
-#| "to the central user database for authentication and authorization."
 msgid ""
 "All services are accessible using the same username and password, thanks to "
 "the central user database for authentication and authorisation."
@@ -681,13 +599,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Network configuration on the clients is done automatically using DHCP. "
-#| "Normal clients are allocated IP addresses in the private subnet "
-#| "10.0.2.0/23, while thin clients are connected to the corresponding thin-"
-#| "client-server via the seperate subnet 192.168.0.0/24 (this to ensure that "
-#| "the network traffic of the thin clients doesn't interfere with the rest "
-#| "of the network services)."
 msgid ""
 "Network configuration on the clients is done automatically using DHCP. "
 "Normal clients are allocated IP addresses in the private subnet 10.0.0.0/8, "
@@ -705,10 +616,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Centralized logging is set up so that all machines send their syslog "
-#| "messages to the server. The syslog service is set up so that it only "
-#| "accepts incoming messages from the local network."
 msgid ""
 "Centralised logging is set up so that all machines send their syslog "
 "messages to the server. The syslog service is set up so that it only accepts "
@@ -732,12 +639,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Pupils and teachers have the possibility to publish websites. The web "
-#| "server provides mechanisms for authenticating users, and for limiting "
-#| "access to individual pages and subdiretories to certain users and groups. "
-#| "Users will have the possibility to create dynamic web pages, as the web "
-#| "server will be programmable on the server side."
 msgid ""
 "Pupils and teachers have the ability to publish websites. The web server "
 "provides mechanisms for authenticating users, and for limiting access to "
@@ -753,15 +654,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Information on users and machines can be changed in one central location, "
-#| "and is made accessible to all computers on the network automatically. To "
-#| "achieve this a centralized directory server is set up. The directory will "
-#| "have information on users, user groups, machines, and groups of machines. "
-#| "To avoid user confusion there won't be any difference between file "
-#| "groups, mailing lists, and network groups. This implies that groups of "
-#| "machines which have to be network groups, have the same namespace as user "
-#| "groups and mailing lists."
 msgid ""
 "Information on users and machines can be changed in one central location, "
 "and is made accessible to all computers on the network automatically. To "
@@ -783,11 +675,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Administration of services and users will by and large be via web, and "
-#| "follow established standards, functioning well in the web browsers which "
-#| "are part of Skolelinux. The delegation of certain tasks to individual "
-#| "users or user groups will be made possible by the administration systems."
 msgid ""
 "Administration of services and users will mainly be via the web, and follow "
 "established standards, functioning well in the web browsers which are part "
@@ -801,14 +688,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In order to avoid certain problems with NFS, and to make it simpler to "
-#| "debug problems, time needs to be synchronized on the different machines. "
-#| "To achieve this the Skolelinux server is set up as a local Network Time "
-#| "Protocol (NTP) server, and all workstations and clients are set up to "
-#| "synchronize their clock with the server. The server itself should "
-#| "synchronize its clock via NTP against machines on the Internet, thus "
-#| "ensuring the whole network has the correct time."
 msgid ""
 "In order to avoid certain problems with NFS, and to make it simpler to debug "
 "problems, the different machines need synchronised clocks. To achieve this "
@@ -828,12 +707,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Printers are connected where convenient, either directly onto the "
-#| "network, or connected to a server, workstation or thin-client-server. "
-#| "Access to printers can be controlled for individual users according to "
-#| "the groups they belong to, this will be achieved by using quota and "
-#| "access control for printers."
 msgid ""
 "Printers are connected where convenient, either directly onto the main "
 "network, or connected to a server, workstation or thin-client-server. Access "
@@ -873,12 +746,6 @@ msgstr "Tynnklienter"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A thin client setup enables a ordinary PC to function as an (X-)terminal. "
-#| "This means that this machine boots from a diskette or directly from the "
-#| "server using network-PROM (or PXE) without using the local client hard "
-#| "drive. The thin client setup used is that of the Linux Terminal Server "
-#| "Project (LTSP)."
 msgid ""
 "A thin client setup enables ordinary PCs to function as (X-)terminals. This "
 "means that the machine boots from a diskette or directly from the server "
@@ -893,16 +760,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Thin clients are a good way to make use of older, weaker machines as they "
-#| "effectively run all programs on the LTSP-Server. This works as follows: "
-#| "The service uses DHCP and TFTP to connect to the network and boot from "
-#| "the network. Next, the file system is mounted via NFS from the LTSP-"
-#| "server, and finally X11 is started. The display manager (LDM) connects to "
-#| "the LTSP-Server via SSH with X-forwarding. That way all data is encrypted "
-#| "on the network. For very old thin clients which are to slow for the "
-#| "encryption this can be set to the behaviour from former versions: use "
-#| "direct X connection via XDMCP."
 msgid ""
 "Thin clients are a good way to make use of older, weaker machines as they "
 "effectively run all programs on the LTSP server. This works as follows: the "
@@ -939,11 +796,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A diskless workstation runs all software on the PC without a locally "
-#| "installed operating system. This means that client machines boot direcly "
-#| "from the servers hard drive without running software installed on a local "
-#| "hard drive."
 msgid ""
 "A diskless workstation runs all software on the PC without a locally "
 "installed operating system. This means that client machines boot directly "
@@ -957,12 +809,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Diskless workstations are an exellent way of reusing newer hardware with "
-#| "the same low maintanence cost as with thin clients. Software is "
-#| "administered and maintained on the server with no need for local "
-#| "installed software on the clients. Home directories and system settings "
-#| "are stored on the server too."
 msgid ""
 "Diskless workstations are an excellent way of reusing newer hardware with "
 "the same low maintenance cost as with thin clients. Software is administered "
@@ -988,10 +834,6 @@ msgstr "Nettverksklienter"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The term \"networked clients\" is used in this manual to refer to both "
-#| "thin clients and diskless workstations as well as computers running MacOS "
-#| "or Windows."
 msgid ""
 "The term \"networked clients\" is used in this manual to refer to both thin "
 "clients and diskless workstations, as well as computers running Mac OS or "
@@ -1007,11 +849,6 @@ msgstr "Administrasjon"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "All the linux machines that are installed by means of a Skolelinux CD or "
-#| "DVD will be administrable from a central computer, most likely the "
-#| "server. It will be possible to login to all machines by ssh, and thereby "
-#| "have full access to the machines"
 msgid ""
 "All the Linux machines that are installed by means of a Skolelinux CD or DVD "
 "will be administrable from a central computer, most likely the server. It "
@@ -1025,11 +862,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "We use cfengine to edit configuration files. These files are updated from "
-#| "the server to the clients. In order to change the client configuration, "
-#| "it suffices to edit the server configuration and let the automatation "
-#| "distribute the changes."
 msgid ""
 "We use cfengine to edit configuration files. These files are updated from "
 "the server to the clients. In order to change the client configuration, it "
@@ -1042,10 +874,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "All user information is kept in an LDAP directory. Updates of user "
-#| "accounts are made against this database and is used by the clients for "
-#| "user authentication."
 msgid ""
 "All user information is kept in an LDAP directory. Updates of user accounts "
 "are made against this database, which is used by the clients for user "
@@ -1067,10 +895,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The aim is to be able to install a server from CD/DVD, and install "
-#| "clients over the network by booting all other machines from the network. "
-#| "The DVD installation works without access to the Internet."
 msgid ""
 "The aim is to be able to install a server from a CD/DVD type medium once, "
 "and install all other clients over the network by booting from the network."
@@ -1085,13 +909,6 @@ msgstr "DVD-installasjonen fungerer uten tilgang til Internet."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The installation should not ask any questions, with the exception of "
-#| "desired language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine "
-#| "profile (server, workstation, thin client server). All other "
-#| "configuration will be set up automatically with reasonable values, to be "
-#| "changed from a centrally location by the system administrator subsequent "
-#| "to the installation."
 msgid ""
 "The installation should not ask any questions, with the exception of desired "
 "language (e.g. Norwegian Bokmal, Nynorsk, Sami) and machine profile (server, "
@@ -1111,13 +928,6 @@ msgstr "Oppsett av tilgang til filsystem"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Each Skolelinux user account is assigned a section of the file system on "
-#| "the file server. This section (home directory) contains the user's "
-#| "configuration files, documents, email and web pages. Some of the files "
-#| "should be set to have read access for other users on the system, some "
-#| "should be readable by everyone on the internet, and some should not be "
-#| "accessible for reading by anyone but the user."
 msgid ""
 "Each Skolelinux user account is assigned a section of the file system on the "
 "file server. This section (home directory) contains the user's configuration "
@@ -1134,15 +944,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To ensure that all disks that are used for user directories or shared "
-#| "directories can be uniquely named across all the computers in the "
-#| "installation, they can be mounted as <computeroutput>/skole/host/"
-#| "directory/</computeroutput>. Initially, one directory is created on the "
-#| "file server, <computeroutput>/skole/tjener/home0/</computeroutput>, in "
-#| "which all the user accounts are created. More directories may then be "
-#| "created when needed, to accomodate particular user groups or particular "
-#| "patterns of usage."
 msgid ""
 "To ensure that all disks that are used for user directories or shared "
 "directories can be uniquely named across all the computers in the "
@@ -1173,22 +974,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The initial access settings for newly created files is a matter of "
-#| "policy. They may either be set to give read access to everybody, which "
-#| "can later be removed by explicit user action, or they may be initially "
-#| "blocked, necessitating user action to make them accessible. The first "
-#| "approach encourages knowledge sharing, and makes the system more "
-#| "transparent, whereas the second method decreases the risk of unwanted "
-#| "spreading of sensitive information. The problem with the first solution "
-#| "is that it is not apparent to the users that the material they create "
-#| "will be accessible to all other users. This is detectable only upon "
-#| "inspection of other users' directories, where one can see that the files "
-#| "are readable. The problem with the second solution is that few people are "
-#| "likely to make their files accessible, even if they do not contain "
-#| "sensitive information and the content would be helpful to inquisitive "
-#| "users who want to learn how others have solved particular problems "
-#| "(typically configuration issues)."
 msgid ""
 "The initial access settings for newly created files are a matter of policy. "
 "The Debian default umask is 022 (which would not allow group-access as "
@@ -1230,12 +1015,6 @@ msgstr "Systemkrav"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "There are different ways of setting up a Skolelinux solution. It can be "
-#| "installed on just one standalone PC or a regional wide solution at many "
-#| "schools operated centrally. This variety of configurations makes a huge "
-#| "difference on how things are set up regarding network components, servers "
-#| "and client machines."
 msgid ""
 "There are different ways of setting up a Skolelinux solution. It can be "
 "installed on just one standalone PC, or as a region-wide solution at many "
@@ -1281,13 +1060,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "eth0 is connected to the main network (10.0.2.0/23),"
 msgid "eth0 is connected to the main network (10.0.0.0/8),"
 msgstr "eth0 koblet til hovednettverket (10.0.2.0/23)"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "eth1 is used for serving the thin-clients (192.168.0.0/24) ."
 msgid ""
 "eth1 is used for serving the thin-clients (192.168.0.0/24 or "
 "192.168.1.0/24) ."
@@ -1329,10 +1106,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For workstations, diskless workstations and standalone PCs 800 MHz, 256 "
-#| "MiB RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
-#| "considerable better. Just a faster CPU will speed things up."
 msgid ""
 "For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
 "RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
@@ -1344,11 +1117,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Swapping over the network is automatically enabled, the swap size is 32 "
-#| "MiB, if you need more you can tune this by editing /etc/ltsp/nbdswapd."
-#| "conf on tjener to set the SIZE variable. Please <emphasis>tune up the "
-#| "swap size</emphasis> either locally on the pc or on the server."
 msgid ""
 "Swapping over the network is automatically enabled; the swap size is 32 MiB, "
 "and if you need more you can tune this by editing /etc/ltsp/nbdswapd.conf on "
@@ -1363,9 +1131,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "If your diskless workstations have harddrives, it is recommended to use "
-#| "them for swap as it is a lot faster than network swapping."
 msgid ""
 "If your diskless workstations have hard drives, it is recommended to use "
 "them for swap as it is a lot faster than network swapping."
@@ -1375,13 +1140,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "On workstations with little RAM the spell checker can cause OpenOffice."
-#| "org to hang if the swap space is too small. Then the system administrator "
-#| "has to disable the spell checker on OpenOffice.org or students have to "
-#| "kill OpenOffice.org, resulting in loss of work. Enabling at least 512 MiB "
-#| "swap on a 256 MiB RAM workstation solves this, and the spell checker runs "
-#| "smoothly."
 msgid ""
 "On workstations with little RAM the spell checker can cause OpenOffice.org "
 "to hang if the swap space is too small. Then the system administrator has to "
@@ -1431,11 +1189,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort "
-#| "to document how to install, configure and use Debian on some specific "
-#| "hardware. Therefore potential buyers would know if that hardware is "
-#| "supported and owner would know how get the best out of that hardware."
 msgid ""
 "<ulink url=\"http://wiki.debian.org/InstallingDebianOn\"/> is an effort to "
 "document how to install, configure and use Debian on some specific hardware, "
@@ -1450,9 +1203,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "An excellent database about hardware supported by Debian is online at "
-#| "<ulink url=\"http://kmuto.jp/debian/hcl/\"/>."
 msgid ""
 "An excellent database of hardware supported by Debian is online at <ulink "
 "url=\"http://kmuto.jp/debian/hcl/\"/>."
@@ -1462,7 +1212,6 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Requirements for a network setup"
 msgid "Requirements for network setup"
 msgstr "Krav for nettverksoppsett"
 
@@ -1478,19 +1227,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "you need exactly one main server, the tjener"
 msgid "You need exactly one main server, the tjener."
 msgstr "du trenger bare en hovedtjener, omtalt som tjener"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "you can have up to 50 (diskless) workstations on the main network"
 msgid "You can have hundreds of workstations on the main network."
 msgstr "man kan ha opp til 50 (diskløse) arbeidsstasoner på hovednettverket"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "you can have up to 20 ltspservers on the main network"
 msgid ""
 "You can have a lot of LTSP servers on the main network; two different "
 "subnets are preconfigured in LDAP."
@@ -1498,9 +1244,6 @@ msgstr "man kan ha opp til 20 ltsp-tjenere på hovednettverket"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "you can have hundreds of thin clients and/or diskless workstations on "
-#| "each ltspserver network"
 msgid ""
 "You can have hundreds of thin clients and/or diskless workstations on each "
 "LTSP server network."
@@ -1510,9 +1253,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "you can have hundreds of other machines which will have dynamic IP "
-#| "addresses assigned"
 msgid ""
 "You can have hundreds of other machines which will have dynamic IP addresses "
 "assigned."
@@ -1521,8 +1261,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "for having access to the internet you need a router/gateway (see below)"
 msgid "For access to the Internet you need a router/gateway (see below)."
 msgstr ""
 "for å få tilgang til internett så trenger man en router/gateway (se under)"
@@ -1533,10 +1271,6 @@ msgstr "Internett-ruter"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A router/gateway, connected to the internet on the external interface and "
-#| "running on the IP address 10.0.2.1 with netmask 255.255.254.0 on the "
-#| "internal interface, is needed to connect to the internet."
 msgid ""
 "A router/gateway, connected to the Internet on the external interface and "
 "running on the IP address 10.0.0.1 with netmask 255.0.0.0 on the internal "
@@ -1554,10 +1288,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you are looking for a i386 based solution (so that you can reuse an "
-#| "old PC), we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> "
-#| "or <ulink url=\"http://www.zelow.no/floppyfw\">floppyfw</ulink>."
 msgid ""
 "If you are looking for a router firewall solution capable of running on an "
 "old PC, we recommend <ulink url=\"http://www.ipcop.org\">IPCop</ulink> or "
@@ -1569,13 +1299,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you need something for an embedded router or accesspoint we recommend "
-#| "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
-#| "you can also use the original firmware. Using the original firmware is "
-#| "easier, using OpenWRT gives you more choices and control. Check the "
-#| "OpenWRT webpages for a list of <ulink url=\"http://wiki.openwrt.org/"
-#| "TableOfHardware\">supported hardware</ulink>."
 msgid ""
 "If you need something for an embedded router or accesspoint we recommend "
 "using <ulink url=\"http://openwrt.org\">OpenWRT</ulink>, though of course "
@@ -1610,7 +1333,6 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Installation"
 msgid "Installation and download options"
 msgstr "Installasjon"
 
@@ -1666,14 +1388,10 @@ msgstr ""
 "squeeze/installmanual\"> manualen til Debian Installer</ulink>."
 
 #. type: Content of: <article><section><section><title>
-#, fuzzy
-#| msgid ""
-#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
-#| "\""
 msgid ""
 "Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
 msgstr ""
-"Last ned et installasjonsmedium for Debian Edu 7.0.0+r0 Kodenavn Wheezy"
+"Last ned et installasjonsmedium for Debian Edu 7.1+edu0 Kodenavn Wheezy"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
@@ -1682,10 +1400,6 @@ msgstr "DVDer for i386, amd64 og powerpc"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The multiarch DVD ISO image is 4.4 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. To download it, use any of these "
-#| "methods:"
 msgid ""
 "The multi-architecture DVD ISO image is 4.4 GiB large and can be used for "
 "installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP "
@@ -1772,13 +1486,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Sources:"
 msgid "Source DVD"
 msgstr "Kilder:"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "The Sources are available via"
 msgid "The sources are available via"
 msgstr "Kildekoden er tilgjengelig via"
 
@@ -1831,9 +1543,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "</inlinemediaobject> Remember to include the address you want the CD or "
-#| "DVD to be sent to in the email."
 msgid ""
 "Remember to include the address you want the CD or DVD to be sent to in the "
 "email."
@@ -1847,13 +1556,6 @@ msgstr "Installasjon av DebianEdu"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When you do a Debian Edu installation, you have a few options to choose. "
-#| "Don't be afraid; there aren't many. We have done a good job hiding the "
-#| "complexity of Debian during the installation and beyond. However, Debian "
-#| "Edu is Debian, and if you want there are more than 15000 packages to "
-#| "choose from and a billion configuration options. For the majority of our "
-#| "users, our defaults should be fine."
 msgid ""
 "When you do a Debian Edu installation, you have a few options to choose "
 "from. Don't be afraid; there aren't many. We have done a good job of hiding "
@@ -1886,9 +1588,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>Install</computeroutput> is the default text mode "
-#| "installation on i386 and amd64."
 msgid ""
 "<emphasis role=\"strong\">Install</emphasis> is the default text mode "
 "installation on i386 and amd64."
@@ -1898,9 +1597,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>64 bit install</computeroutput> does an amd64 text-mode "
-#| "install."
 msgid ""
 "<emphasis role=\"strong\">64 bit install</emphasis> does an amd64 text-mode "
 "install."
@@ -1910,9 +1606,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Graphical install</emphasis> uses the GTK "
 "installer where you can use the mouse."
@@ -1922,9 +1615,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Select <computeroutput>64 bit graphical install</computeroutput> to have "
-#| "the amd64 GTK installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical install</emphasis> uses the amd64 "
 "GTK installer where you can use the mouse."
@@ -1934,7 +1624,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Advanced options ></emphasis> gives a sub menu "
 "with more detailed options to choose"
@@ -1942,9 +1631,6 @@ msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>64 bit install</computeroutput> does an amd64 text-mode "
-#| "install."
 msgid ""
 "<emphasis role=\"strong\">Help</emphasis> gives some hints on using the "
 "installer"
@@ -1961,22 +1647,17 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Installation options explained"
 msgid "Installer advanced options screen 1"
 msgstr "Installasjonsvalg i detalj"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">role</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Back..</emphasis> brings back to the main menu."
 msgstr "<emphasis role='strong'>rolle</emphasis>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Expert install</emphasis> gives access to all "
 "available questions in text mode."
@@ -1992,16 +1673,12 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Automated install</emphasis> needs a preseed file."
 msgstr "<emphasis role='strong'>Lokalkode</emphasis>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>64 bit install</computeroutput> does an amd64 text-mode "
-#| "install."
 msgid ""
 "<emphasis role=\"strong\">64 bit expert install</emphasis> gives access to "
 "all available questions in text mode on amd64."
@@ -2017,7 +1694,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Locale value</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">64 bit automated install</emphasis> needs a "
 "preseed file."
@@ -2032,15 +1708,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Installation options explained"
 msgid "Installer advanced options screen 2"
 msgstr "Installasjonsvalg i detalj"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Select <computeroutput>Graphical install</computeroutput> to have the GTK "
-#| "installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">Graphical expert install</emphasis> gives access "
 "to all available questions in graphical mode."
@@ -2057,7 +1729,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Graphical automated install</emphasis> needs a "
 "preseed file."
@@ -2065,9 +1736,6 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid ""
-#| "Select <computeroutput>64 bit graphical install</computeroutput> to have "
-#| "the amd64 GTK installer where you can use the mouse."
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical expert install</emphasis> gives "
 "access to all available questions in graphical mode on amd64."
@@ -2084,7 +1752,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">64 bit graphical automated install</emphasis> "
 "needs a preseed file."
@@ -2099,7 +1766,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Installation options explained"
 msgid "Installer help screen"
 msgstr "Installasjonsvalg i detalj"
 
@@ -2115,9 +1781,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "On i386/amd64 boot-options can be edited by pressing the "
-#| "<emphasis>tabulator-key</emphasis> in the boot menu."
 msgid ""
 "On i386/amd64, boot options can be edited by pressing the TAB key in the "
 "boot menu."
@@ -2127,9 +1790,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The multiarch DVD defaults to use amd64-installgui on x86 64-bits "
-#| "machines, and installgui on x86 32-bits machines."
 msgid ""
 "The multi-architecture DVD defaults to using amd64-installgui on 64-bit x86 "
 "machines, and installgui on 32-bit x86 machines."
@@ -2139,9 +1799,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to boot the amd64 text mode with the multiarch DVD it would "
-#| "be <computeroutput>amd64-install</computeroutput>."
 msgid ""
 "If you want to boot the amd64 text mode with the multi-architecture DVD, "
 "that would be <computeroutput>amd64-install</computeroutput>."
@@ -2159,11 +1816,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to boot the i386 mode with the multiarch DVD on an amd64 "
-#| "machine you need to manually select <computeroutput>install</"
-#| "computeroutput> (text mode) or <computeroutput>expertgui</computeroutput> "
-#| "(graphical mode)."
 msgid ""
 "If you want to boot the i386 mode with the multi-arch DVD on an amd64 "
 "machine you need to manually select <computeroutput>install</computeroutput> "
@@ -2196,10 +1848,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "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 params."
 msgid ""
 "To install the <emphasis role=\"strong\">GNOME</emphasis> desktop instead of "
 "the <emphasis role=\"strong\">KDE</emphasis> desktop, add "
@@ -2236,7 +1884,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "The installation process"
 msgid "The installation process"
 msgstr "Innstallasjonsprosessen"
 
@@ -2258,7 +1905,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Choose a keyboard keymap (usually the countrys default is fine)"
 msgid "Choose a keyboard keymap (the country's default is usually fine)"
 msgstr ""
 "Velg et tastaturoppsett (vanligvis er standardoppsettet for landet ditt bra)"
@@ -2269,20 +1915,11 @@ msgstr "Velg profil(er) fra denne listen:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">role</emphasis>"
 msgid "<emphasis role=\"strong\">Main-Server</emphasis>"
 msgstr "<emphasis role='strong'>rolle</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "This is the main server (tjener) for your school providing the following "
-#| "services: file, print, intranet, proxy, DNS, DHCP, LDAP, backup, nagios, "
-#| "sitesummary, and munin. All services are pre-configured to work out of "
-#| "the box. You must only install one main server per school! This profile "
-#| "does not include a graphical user interface.  If you want a graphical "
-#| "user interface, then select Workstation or Thin-Client-Server in addition "
-#| "to this one."
 msgid ""
 "This is the main server (tjener) for your school providing all services pre-"
 "configured to work out of the box. You must only install one main server per "
@@ -2300,7 +1937,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgid "<emphasis role=\"strong\">Workstation</emphasis>"
 msgstr "<emphasis role='strong'>Diskløs arbeidsstasjon</emphasis>:"
 
@@ -2319,7 +1955,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
 msgid "<emphasis role=\"strong\">Roaming workstation</emphasis>"
 msgstr "<emphasis role='strong'>Diskløs arbeidsstasjon</emphasis>:"
 
@@ -2334,7 +1969,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgid "<emphasis role=\"strong\">Thin-Client-Server</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
@@ -2361,15 +1995,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">hostname</emphasis>"
 msgid "<emphasis role=\"strong\">Standalone</emphasis>"
 msgstr "<emphasis role='strong'>vertsnavn</emphasis>:"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "An ordinary computer that can function without a main server, ie. doesn't "
-#| "need to be on the network. Includes laptops."
 msgid ""
 "An ordinary computer that can function without a main server (that is, it "
 "doesn't need to be on the network). Includes laptops."
@@ -2379,18 +2009,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">role</emphasis>"
 msgid "<emphasis role=\"strong\">Minimal</emphasis>"
 msgstr "<emphasis role='strong'>rolle</emphasis>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "This profile is only available when using the 'debian-edu-expert' boot "
-#| "option.  It will install the base packages and configure the machine to "
-#| "integrate into the Debian Edu network, but without any services and "
-#| "applications.  It is useful as a platform for single services manually "
-#| "moved out from the main-server."
 msgid ""
 "This profile will install the base packages and configure the machine to "
 "integrate into the Debian Edu network, but without any services and "
@@ -2430,10 +2053,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Be aware that saying yes will destroy all data on the harddrives! Saying "
-#| "no on the other hand will require more work and one will need to make "
-#| "sure that the required partitions are created and are big enough."
 msgid ""
 "Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
 "\" will destroy all data on the hard drives! Saying \"no\" on the other hand "
@@ -2461,10 +2080,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "if thin client server is among the selected profiles, then the installer "
-#| "will spent quite some time at the end, \"Finishing the installation - "
-#| "Running debian-edu-profile-udeb...\""
 msgid ""
 "Wait. If the selected profiles include Thin-client-server then the installer "
 "will spend quite some time at the end, \"Finishing the installation - "
@@ -2517,11 +2132,6 @@ msgstr "En kommenar om DVD-installasjon"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you install from a DVD, <computeroutput>/etc/apt/sources.list</"
-#| "computeroutput> it will only contain sources from the DVD afterwards. If "
-#| "you have an internet connection we strongly suggest adding the following "
-#| "lines to it so that available (security) updates can be installed:"
 msgid ""
 "After you install from a DVD, <computeroutput>/etc/apt/sources.list</"
 "computeroutput> will only contain sources from the DVD. If you have an "
@@ -2557,11 +2167,6 @@ msgstr "En kommenar om CD-installasjon"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The netinst installation (which is the type of installation our CD "
-#| "provides) will fetch some packages from the CD and the rest from the "
-#| "net.  The amount of packages fetched from the net varies from profile to "
-#| "profile:"
 msgid ""
 "A netinst installation (which is the type of installation our CD provides) "
 "will fetch some packages from the CD and the rest from the net.  The amount "
@@ -2577,7 +2182,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Main server: 8 of 115 MiB downloaded."
 msgid "Main server: 8 out of 115 MiB downloaded."
 msgstr "Hovedtjener: 8 av 115 MiB lastet ned."
 
@@ -2625,11 +2229,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "By providing the kernel argument <computeroutput>edu-skip-ltsp-make-"
-#| "client</computeroutput> it is possible to skip the step which converts "
-#| "the LTSP chroot from a thin-client chroot into a combined thin-client/"
-#| "diskless workstation chroot."
 msgid ""
 "Providing the kernel boot parameter <computeroutput>edu-skip-ltsp-make-"
 "client</computeroutput> makes it possible to skip the step which converts "
@@ -2643,11 +2242,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is useful in certain situations, e.g. if one wants a pure thin "
-#| "client chroot or if there is already a diskless chroot on another server, "
-#| "which can be rsynced. For these situations skipping this step will cut "
-#| "down the installation time considerably."
 msgid ""
 "This is useful in certain situations, such as if you want a pure thin client "
 "chroot or if there is already a diskless chroot on another server, which can "
@@ -2661,9 +2255,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Except for the longer installation time there is no harm creating "
-#| "combined chroots always and this is why this is done by default."
 msgid ""
 "Except for the longer installation time there is no harm in always creating "
 "combined chroots, which is why this is done by default."
@@ -2674,7 +2265,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Installation is possible either from a CD or DVD."
 msgid "Installation using USB sticks instead of CD/DVDs"
 msgstr "Installasjon er mulig enten fra en CD eller en DVD."
 
@@ -2720,9 +2310,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks like with the <emphasis role=\"strong"
-#| "\">Main-Server</emphasis> profile only:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
 "Server</emphasis> profile only:"
@@ -2740,10 +2327,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is how the PXE menu looks like with the <emphasis role=\"strong"
-#| "\">Main-Server</emphasis> and <emphasis role=\"strong\">Thin-Client-"
-#| "Server</emphasis> profile:"
 msgid ""
 "This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
 "Server</emphasis> and <emphasis role=\"strong\">Thin-Client-Server</"
@@ -2762,10 +2345,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows to boot diskless workstations and thin clients on "
-#| "the main network. Diskless workstations must be added with LWAT just like "
-#| "normal workstations or thin client servers."
 msgid ""
 "This setup also allows diskless workstations and thin clients to be booted "
 "on the main network. Unlike workstations, diskless workstations don't have "
@@ -2791,9 +2370,6 @@ msgstr "Modifisering av PXE installasjoner"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The PXE installation is using a debian-installer preseed file, and this "
-#| "file can be modified to ask for more packages to install."
 msgid ""
 "The PXE installation uses a debian-installer preseed file, which can be "
 "modified to ask for more packages to install."
@@ -2816,17 +2392,6 @@ msgstr "d-i    pkgsel/include string my-extra-package(s)"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The PXE installation uses the files <computeroutput>/var/lib/tftpboot/"
-#| "debian-edu/install.cfg</computeroutput> and the preseeding file in "
-#| "<computeroutput>/etc/debian-edu/www/debian-edu-install.dat</"
-#| "computeroutput>. These files can be changed to adjust the preseeding used "
-#| "during installation, i.e. to avoid more questions when installing over "
-#| "the net. Another possibility to achieve the same is to provide extra "
-#| "settings in <computeroutput>/etc/debian-edu/pxeinstall.conf</"
-#| "computeroutput> and <computeroutput>/etc/debian-edu/www/debian-edu-"
-#| "install.dat.local</computeroutput> and to run <computeroutput>/usr/sbin/"
-#| "debian-edu-pxeinstall</computeroutput> to update the generated files."
 msgid ""
 "The PXE installation uses <computeroutput>/var/lib/tftpboot/debian-edu/"
 "install.cfg</computeroutput> and the preseeding file in <computeroutput>/etc/"
@@ -2881,12 +2446,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Some settings can not be preseeded because they are needed before the "
-#| "preseeding file is downloaded.  These are configured in the pxelinux "
-#| "based boot arguments available from <computeroutput>/var/lib/tftproot/"
-#| "debian-edu/install.cfg</computeroutput>.  Language, keyboard layout and "
-#| "desktop are examples of such settings."
 msgid ""
 "Some settings can not be preseeded because they are needed before the "
 "preseeding file is downloaded.  These are configured in the PXElinux-based "
@@ -2906,12 +2465,6 @@ msgstr "Tilpassede CD/DVD-plater"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Creating custom CDs or DVDs is possibly quite easy since we use the "
-#| "<ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
-#| "ulink>, which has a modular design and other nice features. <ulink url="
-#| "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> "
-#| "allows you to define answers to the questions normally asked."
 msgid ""
 "Creating custom CDs or DVDs can be quite easy since we use the <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/\">debian installer</ulink>, which "
@@ -2943,12 +2496,6 @@ msgstr "Skjermbilder av installasjonen"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The text mode and the graphical installation are identical, only the "
-#| "appearance is different. The graphical mode offers you the opportunity to "
-#| "use a mouse. Of course the graphical mode looks much nicer and more "
-#| "modern. Unless the hardware has trouble with the graphical mode, there is "
-#| "no reason not to use it."
 msgid ""
 "The text mode and the graphical installation are functionally identical - "
 "only the appearance is different. The graphical mode offers the opportunity "
@@ -3118,49 +2665,41 @@ msgstr ""
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "./images/12-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "12-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "./images/12a-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "12a-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "./images/12b-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "12b-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "./images/12c-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "12c-Set_up_users_and_passwords.png"
 msgstr "Sett passord"
 
@@ -3321,7 +2860,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Directory Service (OpenLDAP) [ldap]"
 msgid "KDE Desktop"
 msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
 
@@ -3334,7 +2872,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Diskless workstations"
 msgid "Diskless Workstation Login"
 msgstr "Arbeidstasjoner uten harddisk"
 
@@ -3347,7 +2884,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Thin clients"
 msgid "Thin Client Login"
 msgstr "Tynnklienter"
 
@@ -3388,7 +2924,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid "add users"
 msgid "Add users with GOsa²"
 msgstr "legg til brukere"
 
@@ -3400,10 +2935,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This is described below, please read this chapter completly. It covers "
-#| "how to do these minumum steps correctly as well as other stuff probably "
-#| "everybody will need to do."
 msgid ""
 "Adding users and workstations is described in detail below, so please read "
 "this chapter completely. It covers how to perform these minumum steps "
@@ -3433,15 +2964,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Requirements for a network setup"
 msgid "Debian Edu KDE desktop"
 msgstr "Krav for nettverksoppsett"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "There are several services running on the main server which can be "
-#| "managed via a web management interface.  We'll describe each service here."
 msgid ""
 "There are several services running on the main server which can be managed "
 "via a web management interface. We'll describe each service below."
@@ -3470,7 +2997,6 @@ msgstr "Gruppeadministrasjon"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Group Administration"
 msgid "NIS Netgroup Administrator"
 msgstr "Gruppeadministrasjon"
 
@@ -3565,12 +3091,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In Debian Edu account information is stored in a LDAP directory. This "
-#| "data is used not only by the main server, but also by the (diskless) "
-#| "workstations and thin client servers on the network.  In this way data "
-#| "about students, pupils, teachers, etc. needs to be entered only once. "
-#| "After that it is available to all systems on the network."
 msgid ""
 "In Debian Edu, account, group, and system information is stored in an LDAP "
 "directory. This data is used not only by the main server, but also by the "
@@ -3615,7 +3135,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "User Management with lwat"
 msgid "User Management with GOsa²"
 msgstr "Brukeradministrasjon med lwat"
 
@@ -3703,7 +3222,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Search and delete users"
 msgid "Search, modify and delete users"
 msgstr "Søk etter og slett brukere"
 
@@ -3738,10 +3256,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A new page will show up where you can modify information directly "
-#| "belonging to the user, change the password of the user and modify the "
-#| "list of groups the user belongs to."
 msgid ""
 "A new page will show up where you can directly modify information about the "
 "user, change the password of the user and modify the list of groups the user "
@@ -3760,7 +3274,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Adding users"
 msgid "Editing user data"
 msgstr "Legge til brukere"
 
@@ -3786,15 +3299,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "To set a new password for a user"
 msgid "To administratively set a new password for a user"
 msgstr "For å gi en bruker et nytt passord"
 
 #. type: Content of: <article><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "search the user to be modified like explained above and click on the "
-#| "username once found."
 msgid "search for the user to be modified, as explained above"
 msgstr ""
 "Søk etter brukeren, som skal modifiseres, som beskrevet ovenfor. Klikk på "
@@ -3820,16 +3329,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Set passwords"
 msgid "Set user password"
 msgstr "Sett passord"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "You can now set any password you like, as long as it is at least 5 digits "
-#| "long. <emphasis role=\"strong\">Beware of security implications due to "
-#| "easy to guess passwords!</emphasis>"
 msgid ""
 "<emphasis role=\"strong\">Beware of security implications due to easy to "
 "guess passwords!</emphasis>"
@@ -3867,7 +3371,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "How to use volatile"
 msgid "Do not use quotes"
 msgstr "Hvordan bruke volatile"
 
@@ -3913,9 +3416,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "It's a good idea to do some tests first, best with a .csv file with a few "
-#| "fictional users, which can be deleted later."
 msgid ""
 "It's a good idea to do some tests first, preferably using a CSV file with a "
 "few fictional users, which can be deleted later."
@@ -3925,7 +3425,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "User Management with lwat"
 msgid "Group Management with GOsa²"
 msgstr "Brukeradministrasjon med lwat"
 
@@ -4014,7 +3513,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Machine Management with lwat"
 msgid "Machine Management with GOsa²"
 msgstr "Maskinhåndtering med lwat"
 
@@ -4038,10 +3536,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This setup also allows to boot diskless workstations and thin clients on "
-#| "the main network. Diskless workstations must be added with LWAT just like "
-#| "normal workstations or thin client servers."
 msgid ""
 "Diskless workstations and thin-clients work out-of-the-box when connected to "
 "the main network. Only workstations with disks *have* to be added with "
@@ -4063,11 +3557,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To assign a host with the MAC-address 52:54:00:12:34:10 a static IP-"
-#| "address you only have to enter the MAC-address and the hostname static00, "
-#| "the remaining fields will be filled automatically according to the "
-#| "predefined configuration:"
 msgid ""
 "To assign a host with the MAC address 52:54:00:12:34:10 a static IP address "
 "in GOsa² you have to enter the MAC address, the hostname and the IP; "
@@ -4166,9 +3655,6 @@ msgstr "Søk etter og slett maskiner"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Searching for and deleting machines is quite similar to searching and "
-#| "deleting users, so that information is not repeated here."
 msgid ""
 "Searching for and deleting machines is quite similar to searching for and "
 "deleting users, so that information is not repeated here."
@@ -4182,10 +3668,6 @@ msgstr "Endre eksisterende maskiner / nettgruppehåndtering"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "After adding a machine to the ldap tree using lwat, you can modify its "
-#| "properties using the search functionality and clicking on the machine (as "
-#| "you would with users)."
 msgid ""
 "After adding a machine to the LDAP tree using GOsa², you can modify its "
 "properties using the search functionality and clicking on the machine name "
@@ -4197,10 +3679,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The form that is behind these machine links is in one way similar to the "
-#| "one you already know from modifying user entries, but in an other way the "
-#| "informations do mean different things in this context."
 msgid ""
 "The format of these system entries is similar to the one you already know "
 "from modifying user entries, but the fields mean different things in this "
@@ -4232,19 +3710,16 @@ msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "fs-autoresize-hosts"
 msgid "cups-queue-autoflush-hosts"
 msgstr "fs-autoresize-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "fs-autoresize-hosts"
 msgid "cups-queue-autoreenable-hosts"
 msgstr "fs-autoresize-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "fs-autoresize-hosts"
 msgid "fsautoresize-hosts"
 msgstr "fs-autoresize-hosts"
 
@@ -4254,7 +3729,6 @@ msgstr "ltsp-server-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "workstation-hosts"
 msgid "netblock-hosts"
 msgstr "workstation-hosts"
 
@@ -4272,7 +3746,6 @@ msgstr "shutdown-at-night-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "workstation-hosts"
 msgid "winstation-hosts"
 msgstr "workstation-hosts"
 
@@ -4317,10 +3790,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "</inlinemediaobject> Remember to configure workstations and ldap-servers "
-#| "properly with lwat, or your users won't be able to access their home "
-#| "directories."
 msgid ""
 "Remember to configure workstations and ltsp-servers properly with GOsa², or "
 "your users won't be able to access their home directories. Diskless "
@@ -4337,9 +3806,6 @@ msgstr "fs-autoresize"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "debian edu machines in this group will automatically resize lvm "
-#| "partitions that run out of space"
 msgid ""
 "Debian Edu machines in this group will automatically resize LVM partitions "
 "that run out of space."
@@ -4353,9 +3819,6 @@ msgstr "shutdown at night"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "debian edu machines in this group will automatically shutdown at night to "
-#| "save energy"
 msgid ""
 "Debian Edu machines in this group will automatically shut down at night to "
 "save energy."
@@ -4365,15 +3828,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "fs-autoresize-hosts"
 msgid "CUPS (cups-queue-autoflush-hosts and cups-queue-autoreenable-hosts)"
 msgstr "fs-autoresize-hosts"
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "debian edu machines in this group will automatically shutdown at night to "
-#| "save energy"
 msgid ""
 "Debian Edu machines in these groups will automatically flush all print "
 "queues every night, and re-enable any disabled print queue every hour."
@@ -4412,17 +3871,11 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Printer Managment"
 msgid "Printer Management"
 msgstr "Skriverhåndtering"
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "For Printer Management point your web browser to <ulink url=\"https://"
-#| "www:631\"/> This is the normal cups management site where you can add/"
-#| "delete/modify your printers and can clean up the printing queue.  Changes "
-#| "that require to login as root need ssl encryption."
 msgid ""
 "For Printer Management point your web browser to <ulink url=\"https://"
 "www:631\"/> This is the normal CUPS management interface where you can add/"
@@ -4437,7 +3890,6 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Clock synchronization"
 msgid "Clock synchronisation"
 msgstr "Klokkesynkronisering"
 
@@ -4469,14 +3921,6 @@ msgstr ""
 
 #. type: Content of: <article><section><para>
 #, fuzzy
-#| msgid ""
-#| "To enable synchronization with an external clock, the file /etc/ntp.conf "
-#| "on the main-server need to be modified.  The comments in front of the "
-#| "<computeroutput>server</computeroutput> entries need to be removed.  "
-#| "After this, the ntp server need to be restarted by running "
-#| "<computeroutput>/etc/init.d/ntp restart</computeroutput> as root.  To "
-#| "test if the server is using the external clock sources, run "
-#| "<computeroutput>ntpq -c lpeer</computeroutput>."
 msgid ""
 "To disable synchronisation with an external clock, the file /etc/ntp.conf on "
 "the main-server and all clients and LTSP chroots need to be modified.  Add "
@@ -4515,7 +3959,6 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Maintainance"
 msgid "Maintenance"
 msgstr "Vedlikehold"
 
@@ -4525,9 +3968,6 @@ msgstr "Oppdatere programvaren"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This section explains how to use <computeroutput>aptitude upgrade</"
-#| "computeroutput> and kde-update-notifier."
 msgid ""
 "This section explains how to use <computeroutput>aptitude upgrade</"
 "computeroutput>."
@@ -4537,12 +3977,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Using <computeroutput>aptitude</computeroutput> is really simply. To "
-#| "update a system you need to execute two commands on the command line as "
-#| "root: <computeroutput>aptitude update</computeroutput> (updates the lists "
-#| "of available packages) and <computeroutput>aptitude upgrade</"
-#| "computeroutput> (upgrades the packages for which an upgrade is available)."
 msgid ""
 "Using <computeroutput>aptitude</computeroutput> is really simply. To update "
 "a system you need to execute two commands on the command line as root: "
@@ -4568,12 +4002,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
-#| "email, which packages need an update. It does not install these updates, "
-#| "but downloads them (usually in the night), so you don't have to wait for "
-#| "the download, when you do <computeroutput>aptitude upgrade</"
-#| "computeroutput>."
 msgid ""
 "<computeroutput>cron-apt</computeroutput> will notify you once a day via "
 "email about any packages that can be upgraded. It does not install these "
@@ -4612,15 +4040,6 @@ msgstr "Hold deg oppdatert vedrørende sikkerhetsoppdateringer."
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Running <computeroutput>cron-apt</computeroutput> as described above is a "
-#| "good way to learn that for an installed package a security update is "
-#| "available.  Another way to get informed about security updates is to "
-#| "subscribe to the <ulink url=\"http://lists.debian.org/debian-security-"
-#| "announce/\">Debian security-announce mailinglist</ulink>, which has the "
-#| "benefit of also informing what the security update is about. The downside "
-#| "(compared to <computeroutput>cron-apt</computeroutput>) is that it also "
-#| "includes information about updates for packages which aren't installed."
 msgid ""
 "Running <computeroutput>cron-apt</computeroutput> as described above is a "
 "good way to learn when security updates are available for installed "
@@ -4683,9 +4102,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to backup your data to an external server, a tape device or "
-#| "another harddrive you'll have to modify the existing configuration a bit."
 msgid ""
 "If you want to back up your data to an external server, a tape device or "
 "another hard drive you'll have to modify the existing configuration a bit."
@@ -4714,11 +4130,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "this will leave the content from <computeroutput>/skole/tjener/home0/"
-#| "user</computeroutput> from <computeroutput><date></computeroutput> "
-#| "in the folder <computeroutput>/skole/tjener/home0/user_<date></"
-#| "computeroutput>"
 msgid ""
 "This will leave the content from <computeroutput>/skole/tjener/home0/user</"
 "computeroutput> for <computeroutput><date></computeroutput> in the "
@@ -4730,10 +4141,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you want to restore a single file, then you should be able to select "
-#| "the file (and the version) from the web-interface, and download only that "
-#| "file."
 msgid ""
 "If you want to restore a single file, then you should be able to select the "
 "file (and the version) from the web interface, and download only that file."
@@ -4757,7 +4164,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
 #, fuzzy
-#| msgid "Maintainance"
 msgid "slbackup-php Maintenance"
 msgstr "Vedlikehold"
 
@@ -4815,9 +4221,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Information about the munin system is available from <ulink url=\"http://"
-#| "munin.projects.linpro.no/\"/> ."
 msgid ""
 "Information about Munin is available from <ulink url=\"http://munin.projects."
 "linpro.no/\"/> ."
@@ -4831,15 +4234,6 @@ msgstr "Nagios"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Nagios system and service monitoring is available from <ulink url="
-#| "\"https://www/nagios3/\"/>.  The set of machines and services being "
-#| "monitored is automatically generated using information collected by the "
-#| "sitesummary system.  The machines with the profile Main-server and Thin-"
-#| "client-server receive full monitoring, while workstations and thin "
-#| "clients receive simple monitoring.  To enable full monitoring on a "
-#| "workstation, install the <computeroutput>nagios-nrpe-server</"
-#| "computeroutput> package on the workstation."
 msgid ""
 "Nagios system and service monitoring is available from <ulink url=\"https://"
 "www/nagios3/\"/>. The set of machines and services being monitored is "
@@ -4894,11 +4288,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
-#| "sitesummary.cfg</computeroutput>.  The sitesummary cron job generate "
-#| "<computeroutput>/var/lib/sitesummary/nagios-generated.cfg</"
-#| "computeroutput> with the list of hosts and services to monitor."
 msgid ""
 "The Nagios configuration file used is <computeroutput>/etc/nagios3/"
 "sitesummary.cfg</computeroutput>.  The sitesummary cron job generates "
@@ -4912,10 +4301,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Extra nagios checks can be put in the file <computeroutput>/var/lib/"
-#| "sitesummary/nagios-generated.cfg.post</computeroutput> to get them "
-#| "included in the generated file."
 msgid ""
 "Extra Nagios checks can be put in the file <computeroutput>/var/lib/"
 "sitesummary/nagios-generated.cfg.post</computeroutput> to get them included "
@@ -4927,10 +4312,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Information about the nagios system is available from <ulink url=\"http://"
-#| "www.nagios.org/\"/> or in the <computeroutput>nagios3-doc</"
-#| "computeroutput> package."
 msgid ""
 "Information about Nagios is available from <ulink url=\"http://www.nagios."
 "org/\"/> or in the <computeroutput>nagios3-doc</computeroutput> package."
@@ -5213,7 +4594,6 @@ msgstr "<computeroutput>git pull</computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "LDAP service needs to repaired"
 msgid "LDAP service needs to be reconfigured"
 msgstr "LDAP-tjenesten trenger å bli reparert"
 
@@ -5232,9 +4612,6 @@ msgstr "Gjenoppretter LTSP chroot"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
-#| "will automatically support both thin-clients and diskless workstations."
 msgid ""
 "On the LTSP server(s) the LTSP chroot should be recreated. The new chroot "
 "will still support both thin-clients and diskless workstations."
@@ -5468,12 +4845,6 @@ msgstr "Endre størrelse på partisjoner"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Most partitions in Debian Edu are logical LVM volumes.  Only the /boot/ "
-#| "partition is not. With the Debian/Lenny release of Debian Edu, it is "
-#| "possible to extend partitions while they are mounted.  This is a feature "
-#| "of the Linux kernel since version 2.6.10.  Shrinking partitions still "
-#| "need to happen while the partition is unmounted."
 msgid ""
 "In Debian Edu, all partitions other than the <computeroutput>/boot/</"
 "computeroutput> partition are on logical LVM volumes. With Linux kernels "
@@ -5537,14 +4908,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When resizing the partition used by the Squid proxy, the cache size in "
-#| "<computeroutput>etc/squid/squid.conf</computeroutput> need to be updated "
-#| "as well.  The helper script <computeroutput>/usr/share/debian-edu-config/"
-#| "tools/squid-update-cachedir</computeroutput> is provided to do this "
-#| "automatically, checking the current partition size of <computeroutput>/"
-#| "var/spool/squid/</computeroutput> and configuring Squid to use 80% of "
-#| "this as its cache size."
 msgid ""
 "When the partition used by the Squid proxy is resized, the value for cache "
 "size in <computeroutput>etc/squid/squid.conf</computeroutput> needs to be "
@@ -5867,15 +5230,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "running Java applications in the webbrowser"
 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 ""
-#| "Standalone Java applications are supported out of the box by the OpenJDK "
-#| "Java runtime."
 msgid ""
 "Running Java applets in the browser are supported out of the box by the "
 "OpenJDK Java runtime."
@@ -5889,9 +5248,6 @@ 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 users home "
-#| "directory and set access permissions and ownership."
 msgid ""
 "With this script the administrator can create a folder in each user's home "
 "directory and set access permissions and ownership."
@@ -5911,26 +5267,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "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\""
 msgid ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -5979,10 +5315,6 @@ 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 DVD/CDROM into a (diskless) workstation, "
-#| "there is a popup windows asking what to do with it, just like in any "
-#| "other normal installation."
 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 "
@@ -5994,12 +5326,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When users insert a USB drive or DVD/CDROM into a thin client there is no "
-#| "popup window like they are used to from their usual Desktop.  Instead it "
-#| "is automatically mounted and they have to browse to the /media/$user "
-#| "folder to access it.. This is quite difficult for many non experienced "
-#| "users."
 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 "
@@ -6023,10 +5349,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "With the following script the symlink \"Media\" is created for all users "
-#| "in the home folder for easy access to USB drives, CDROMs or whatever "
-#| "media is connected to the thin client."
 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/"
@@ -6039,16 +5361,6 @@ msgstr ""
 
 #. type: CDATA
 #, fuzzy, no-wrap
-#| msgid ""
-#| "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\""
 msgid ""
 "#!/bin/bash\n"
 " home_path=\"/skole/tjener/home0\"\n"
@@ -6091,9 +5403,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "When a remote users acknowledges the popup or uses pmount from console, a "
-#| "remote user can even mount the removable devices and access the files."
 msgid ""
 "If remote users acknowledge the popup or use pmount from the console, they "
 "can even mount the removable devices and access the files."
@@ -6174,17 +5483,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "There are some considerations to make when doing this:"
 msgid "Some considerations should be kept in mind when setting this up:"
 msgstr "Det er noen vurdereinger man må gjøre før man gjør dette:"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The clients should not be shut down when someone is using them. This is "
-#| "done by checking the output from <computeroutput>who</computeroutput>, "
-#| "and as a special case, checking for the LDM ssh connection command to "
-#| "work with LTSP thin clients."
 msgid ""
 "The clients should not be shut down when someone is using them. This is "
 "ensured by checking the output from <computeroutput>who</computeroutput>, "
@@ -6197,9 +5500,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "To avoid breaking electrical fuses, it is a good idea to make sure all "
-#| "clients do not start at the same time."
 msgid ""
 "To avoid blowing electrical fuses, it is a good idea to make sure all "
 "clients do not start at the same time."
@@ -6209,13 +5509,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "There are two different methods available to wake up clients.  One uses a "
-#| "BIOS feature and require a working and correct hardware clock, as well as "
-#| "a motherboard and BIOS version supported by <computeroutput>nvram-wakeup</"
-#| "computeroutput>, The other require a server with knowledge about all the "
-#| "clients to wake up and for all the clients to have support for wake-on-"
-#| "lan."
 msgid ""
 "There are two different methods available to wake up clients.  One uses a "
 "BIOS feature and requires a working and correct hardware clock, as well as a "
@@ -6236,18 +5529,6 @@ msgstr "Slik setter du opp shutdown-at-night"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "On clients that should turn off at night, touch <computeroutput>/etc/"
-#| "shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
-#| "(ie the output from <computeroutput>'uname -n'</computeroutput> on the "
-#| "client) to the netgroup \"shutdown-at-night-hosts\".  Adding hosts to the "
-#| "netgroup in LDAP can be done using the <computeroutput>lwat</"
-#| "computeroutput> web tool.  The clients might need to have wake-on-lan "
-#| "configured in the BIOS.  It is also important that the switches and "
-#| "routers used between the wake-on-lan server and the clients will pass the "
-#| "WOL packages to the clients even if the clients are turned off. Some "
-#| "switches fail to pass on packages to clients that are missing in the ARP "
-#| "table on the switch, and this block the WOL packages."
 msgid ""
 "On clients that should turn off at night, touch <computeroutput>/etc/"
 "shutdown-at-night/shutdown-at-night</computeroutput>, or add the hostname "
@@ -6275,13 +5556,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To enable wake-on-lan on the server, add the clients to <computeroutput>/"
-#| "etc/shutdown-at-night/clients</computeroutput>, with one line per client, "
-#| "IP address first, and MAC address (ethernet address) next, with space "
-#| "between them, or create a script <computeroutput>/etc/shutdown-at-night/"
-#| "clients-generator</computeroutput> to generate the list of clients on the "
-#| "fly."
 msgid ""
 "To enable wake-on-lan on the server, add the clients to <computeroutput>/etc/"
 "shutdown-at-night/clients</computeroutput>, with one line per client, IP "
@@ -6341,7 +5615,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Access to skolelinux server from outside a firewall"
 msgid "Access Debian-Edu servers located behind a firewall"
 msgstr "Tilgang til skolelinuxserveren fra utsiden av en brannmur"
 
@@ -6356,8 +5629,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid ""
-#| "Installing single service machines for spreading the load from main-server"
 msgid ""
 "Installing additional service machines for spreading the load from main-"
 "server"
@@ -6400,7 +5671,6 @@ msgstr "slå av tjenesten på hovedtjeneren"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "update DNS on main-server"
 msgid "update DNS (via LDAP/GOsa²) on main-server"
 msgstr "oppdater DNS på hovedtjeneren"
 
@@ -6452,16 +5722,11 @@ msgstr "Veiledninger for skrivebordet"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Modifying the kdm login screen"
 msgid "Modifying the KDM login screen"
 msgstr "Modifisere innloggingskjermen kdm"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In Debian/Lenny, the way to customize the kdm login screen was changed. "
-#| "Now, it is done by adding a file in <computeroutput>/etc/default/kdm.d/</"
-#| "computeroutput> specifying variables to override the default."
 msgid ""
 "Customisations to the KDM login screen are made by adding a file in "
 "<computeroutput>/etc/default/kdm.d/</computeroutput> specifying variables to "
@@ -6554,12 +5819,6 @@ msgstr "Avspilling av DVD"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "libdvdcss is needed for playing most commercial! DVDs. For legal reasons "
-#| "it's not included in Debian (Edu).  If you are legally allowed to use it, "
-#| "you can use the packages from deb-multimedia.org. Add the multimedia "
-#| "repository (as described just below this paragraph) and install "
-#| "multimedia and dvd libraries:"
 msgid ""
 "libdvdcss is needed for playing most commercial DVDs. For legal reasons it's "
 "not included in Debian (Edu).  If you are legally allowed to use it, you can "
@@ -6634,7 +5893,6 @@ msgstr "Veiledninger for nettverksklienter"
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Introduction to Thin clients and Diskless workstations"
 msgid "Introduction to thin clients and diskless workstations"
 msgstr "Introduksjon til Tynneklienter og Diskløse arbeidstasjoner"
 
@@ -6709,7 +5967,6 @@ msgstr "arbeidsstasjon"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP client firmware</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
@@ -6758,7 +6015,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">Thin client</emphasis>"
 msgid "<emphasis role=\"strong\">LTSP client kernel</emphasis>"
 msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
 
@@ -6774,17 +6030,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Select type of installation"
 msgid "LTSP client type selection"
 msgstr "Velg type installasjon"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Each LTSP server has two ethernet cards, one is configured in the "
-#| "10.0.2.0/23 subnet (which is shared with the main server) and another "
-#| "forming a local 192.168.0.0/24 subnet (this subnet is a seperate subnet "
-#| "for each LTSP server)."
 msgid ""
 "Each LTSP server has two ethernet cards: one configured in the main "
 "10.0.0.0/8 subnet (which is shared with the main server), and another "
@@ -6827,11 +6077,6 @@ msgstr "Konfigurering av PXE-menyen"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The PXE configuration is generated using the <computeroutput>debian-edu-"
-#| "pxeinstall</computeroutput> script.  It allow some settings to be "
-#| "overriden by adding a file <computeroutput>/etc/debian-edu/pxeinstall."
-#| "conf</computeroutput> with replacement values."
 msgid ""
 "The PXE configuration is generated using the script <computeroutput>debian-"
 "edu-pxeinstall</computeroutput>.  It allows some settings to be overridden "
@@ -6866,9 +6111,6 @@ msgstr "MENU PASSWD $4$NDk0OTUzNTQ1NTQ5$7d6KvAlVCJKRKcijtVSPfveuWPM$"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The password hash should be replaced with a MD5 hash for the wanted "
-#| "password."
 msgid ""
 "The password hash should be replaced with an MD5 hash for the desired "
 "password."
@@ -6908,9 +6150,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A line like the following needs to be added to <computeroutput>tjener:/"
-#| "etc/debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgid ""
 "For adding a custom repository add something like this to <computeroutput>/"
 "etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
@@ -6930,9 +6169,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A line like the following needs to be added to <computeroutput>tjener:/"
-#| "etc/debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgid ""
 "and then run <computeroutput>/usr/sbin/debian-edu-pxeinstall</"
 "computeroutput> once."
@@ -6942,7 +6178,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Changing the PXE menu on an LTSP server"
 msgid "Changing the PXE menu on a combined (main and LTSP) server"
 msgstr "Endrer PXE-menyen på en LTSP-server"
 
@@ -6964,10 +6199,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If one want all clients to boot as diskless workstations instead of "
-#| "getting the full PXE menu, this can be implemented by changing the "
-#| "symlink:"
 msgid ""
 "If all clients should boot as diskless workstations instead of getting the "
 "full PXE menu, this can be implemented by changing the symlink:"
@@ -6982,9 +6213,6 @@ msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboo
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If one want all clients to boot as thin clients instead, change the "
-#| "symlink like this:"
 msgid ""
 "If all clients should boot as thin clients instead, change the symlink like "
 "this:"
@@ -6999,9 +6227,6 @@ msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/px
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "See also the pxelinux documentation at <ulink url=\"http://syslinux.zytor."
-#| "com/wiki/index.php/PXELINUX\"/> ."
 msgid ""
 "See also the PXELINUX documentation at <ulink url=\"http://syslinux.zytor."
 "com/wiki/index.php/PXELINUX\"/> ."
@@ -7011,7 +6236,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Separate main- and LTSP servers"
 msgid "Separate main and LTSP server"
 msgstr "Adskilte hoved- og LTSP-tjenere"
 
@@ -7029,10 +6253,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "1.) Umount the <computeroutput>/var</computeroutput> partition, you 'll "
-#| "have to umount the <computeroutput>/var/spool/squid</computeroutput> "
-#| "partition for this to work, too:"
 msgid ""
 "copy the <computeroutput>ltsp</computeroutput> directory from "
 "<computeroutput>/var/lib/tftpboot</computeroutput> on ltspserver00 to the "
@@ -7044,10 +6264,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "1.) Umount the <computeroutput>/var</computeroutput> partition, you 'll "
-#| "have to umount the <computeroutput>/var/spool/squid</computeroutput> "
-#| "partition for this to work, too:"
 msgid ""
 "copy <computeroutput>/var/lib/tftpboot/debian-edu/default-diskless.cfg</"
 "computeroutput> to the same directory on tjener."
@@ -7165,11 +6381,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The default values is defined under <computeroutput>[default]</"
-#| "computeroutput>, to configure one client, specify which client using the "
-#| "client mac adress or ipadress like this <computeroutput>[192.168.0.10]</"
-#| "computeroutput>."
 msgid ""
 "The default values are defined under <computeroutput>[default]</"
 "computeroutput>; to configure one client, specify it in terms of its MAC "
@@ -7183,9 +6394,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Example: To make the thinclient ltsp010 use 1280x1024 resolution, add "
-#| "something like this:"
 msgid ""
 "Example: To make the thin client ltsp010 use 1280x1024 resolution, add "
 "something like this:"
@@ -7236,11 +6444,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To use ipadresses in <computeroutput>lts.conf</computeroutput> you should "
-#| "add the client mac-address to your dhcp-server. Otherwise you should use "
-#| "the client mac-address directly in you <computeroutput>lts.conf</"
-#| "computeroutput> file."
 msgid ""
 "To use IP addresses in <computeroutput>lts.conf</computeroutput> you need to "
 "add the client MAC address to your DHCP server. Otherwise you should use the "
@@ -7275,7 +6478,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Load balancing LTSP servers"
 msgid "Load-balancing LTSP servers"
 msgstr "lastbalanserte LTSP-tjenere"
 
@@ -7302,12 +6504,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "First of all, you must choose one LTSP server to be the loadbalancing "
-#| "server. All the clients will PXE-boot from this server and load the "
-#| "Skolelinux image. After the image is loaded, LDM chooses which server to "
-#| "connect to by using the \"get_hosts\" script. How this is done you decide "
-#| "later on."
 msgid ""
 "First of all, you must choose one LTSP server to be the load-balancing "
 "server. All the clients will PXE-boot from this server and load the "
@@ -7336,12 +6532,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Now you have to move your clients from the 192.168.1.0 network to the "
-#| "10.0.2.0 network. This is because when you use loadbalancing, the clients "
-#| "should have direct access to the server LDM chooses. If you leave your "
-#| "clients on the 192.168.1.0 network, all of the clients traffic will go "
-#| "through that server before it reaches the chosen LDM server."
 msgid ""
 "Now you have to move your clients from the 192.168.1.0 network to the "
 "10.0.0.0 network; attach them to the backbone network instead of the network "
@@ -7363,12 +6553,6 @@ msgstr "Del 2"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Now you have to make a \"get_hosts\" script that prints a server for LDM "
-#| "to connect to. The parameter LDM_SERVER overrides this script. In "
-#| "consequence, this parameter must not be defined if the get_hosts is going "
-#| "to be used. The get_hosts script writes on the standard output each "
-#| "server IP address or host names, in the random order."
 msgid ""
 "Now you have to make a \"get_hosts\" script that prints a server for LDM to "
 "connect to. The parameter LDM_SERVER overrides this script. In consequence, "
@@ -7393,10 +6577,6 @@ msgstr "MY_SERVER_LIST = \"xxxx xxxx xxxx\""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Replace xxxx with either the IP or hostname of the servers, list must be "
-#| "space separated. Then, put the following script in /opt/ltsp/i386/usr/lib/"
-#| "ltsp/get_hosts on the server you chose to be the loadbalancing server."
 msgid ""
 "Replace xxxx with either the IP addresses or hostnames of the servers as a "
 "space-separated list. Then, put the following script in <computeroutput>/opt/"
@@ -7447,14 +6627,6 @@ msgstr "Del 3"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Now that you've made the \"get_hosts\" script, it's time to make the ssh "
-#| "host key for the ltsp chroots. This can be done by making a file "
-#| "containing the content of /opt/ltsp/i386/etc/ssh/ssh_known_hosts from all "
-#| "the ltsp servers that will be loadbalanced. Save this file as /etc/ltsp/"
-#| "ssh_known_hosts.extra on all loadbalance servers. The last step is very "
-#| "important because ltsp-update-sshkeys runs every time a server is booted, "
-#| "and /etc/ltsp/ssh_known_hosts.extra is included if it exists."
 msgid ""
 "Now that you've made the \"get_hosts\" script, it's time to make the SSH "
 "host key for the LTSP chroots. This can be done by making a file containing "
@@ -7487,13 +6659,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "There is some obvious weaknesses with this setup. All clients get their "
-#| "image from the same server, this causes high loads on the server if many "
-#| "clients are booted at the same time. Also the clients require that server "
-#| "to always be available, without it they cannot boot or get a LDM server. "
-#| "Therefore this setup is very dependent on one server, which isn't very "
-#| "good."
 msgid ""
 "There are some obvious weaknesses with this setup. All clients get their "
 "image from the same server, which causes high loads on the server if many "
@@ -7510,7 +6675,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid "Your clients should now be loadbalanced!"
 msgid "Your clients should now be load-balanced!"
 msgstr "Dine klienter skal nå være lastbalansert!"
 
@@ -7612,14 +6776,6 @@ msgstr "Vis innlogging og sikkerhet"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Skolelinux has added several security features on the client network "
-#| "preventing unauthorised super user access, stopping password sniffing and "
-#| "other tricks which may be used on a local network. One such security "
-#| "measures is secure login using ssh wich is default with LDM. This can "
-#| "slow down some client machines which are older than 10 years, having as "
-#| "little as 160 MHz processor and 32 MB RAM. Even if not recomended, you "
-#| "can add the \"True\" value in ..."
 msgid ""
 "Skolelinux has added several security features on the client network "
 "preventing unauthorised superuser access, password sniffing, and other "
@@ -7719,7 +6875,6 @@ msgstr "X -query ltspserverXX\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "If you are on the thin client network, please run this command:"
 msgid "If you are on the thin client network, run this command:"
 msgstr "Hvis du er i tynnklientnettet, kjøre denne kommandoen:"
 
@@ -7730,9 +6885,6 @@ msgstr "X -query 192.168.0.254\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "The goal is to let your \"real\" thin client to contact the xdmcp-server "
-#| "on the 192.168.0.254 net (given a standard Skolelinux configuration)."
 msgid ""
 "The goal is to let your \"real\" thin client contact the xdmcp-server on "
 "192.168.0.254 (given a standard Skolelinux configuration)."
@@ -7742,9 +6894,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If by some reason xdmcp is accessible on your server which runs KDM , "
-#| "please add the following to /etc/kde3/kdm/Xaccess"
 msgid ""
 "If for some reason XDMCP is accessible on your server which runs KDM, add "
 "the following to <computeroutput>/etc/kde3/kdm/Xaccess</computeroutput>:"
@@ -7768,7 +6917,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "Then turn on xdmcp in kdm with the command:"
 msgid "Then turn on XDMCP in KDM with the command:"
 msgstr "Slå så på xdmcp i kdm med kommandoen:"
 
@@ -7779,7 +6927,6 @@ msgstr "sudo update-ini-file /etc/kde3/kdm/kdmrc Xdmcp Enable true\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "At the end please restart kdm by running:"
 msgid "Finally, restart KDM by running:"
 msgstr "Til slutt restartes kdm ved å kjøre:"
 
@@ -7790,7 +6937,6 @@ msgstr "sudo invoke-rc.d kdm restart\n"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "(in courtesy of Finn-Arne Johansen)"
 msgid "(with thanks to Finn-Arne Johansen)"
 msgstr "(genererøst levert av Finn-Arne Johansen)"
 
@@ -7804,11 +6950,6 @@ msgstr "Bli med i domenet"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
-#| "joined. A special service called Samba, installed on the main-server "
-#| "tjener, enables Windows clients to store profiles and userdata and also "
-#| "authenticates the users during the login."
 msgid ""
 "For Windows clients the Windows domain \"SKOLELINUX\" is available to be "
 "joined. A special service called Samba, installed on the main-server tjener, "
@@ -7822,9 +6963,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "In order to make Windows clients join the domain some (few) steps are "
-#| "required:"
 msgid ""
 "Allowing a Windows client to join the domain requires steps described in the "
 "<link linkend=\"Samba\">Debian Edu Wheezy Samba Howto</link>."
@@ -7832,12 +6970,6 @@ msgstr "For å melde windowsklienter inn i domenet må noen (få) steg utføres:
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Windows will sync the profile of domain users on every login and logout. "
-#| "Depending on how much data stored in the profile this could take some "
-#| "time. To minimize the time needed, one should deactivate things like "
-#| "local cache in browsers (you could use the squid proxycache installed on "
-#| "tjener instead) and save file into the H: volume instead of \"Own files\"."
 msgid ""
 "Windows will sync the profiles of domain users on every Windows login and "
 "logout. Depending on how much data is stored in the profile, this could take "
@@ -7857,13 +6989,6 @@ msgstr "Brukergrupper i Windows"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Groupmaps must also be added for any other user groups you add through "
-#| "<computeroutput>lwat</computeroutput>. If you want your user groups to be "
-#| "available in Windows, eg for netlogon scripts or other group dependant "
-#| "actions, you can add them using variations of the following command. "
-#| "Samba will function without these groupmaps, but Windows machines won't "
-#| "be group aware."
 msgid ""
 "Groupmaps must also be added for any other user group you add through "
 "<computeroutput>GOsa²</computeroutput>. If you want your user groups to be "
@@ -7917,11 +7042,6 @@ msgstr "XP Home"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Users bringing in their XP home laptop can still connect to Tjener using "
-#| "their skolelinux credentials, provided the workgroup is set to "
-#| "SKOLELINUX. However, they may need to disable the windows firewall before "
-#| "Tjener will appear in Network Neighbourhood (or whatever its called now)."
 msgid ""
 "Users bringing in their XP laptops from home can still connect to tjener "
 "using their skolelinux credentials, provided the workgroup is set to "
@@ -7939,13 +7059,6 @@ msgstr "Håndtere roaming-profiler"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Roaming profiles contain user work environments, which include the "
-#| "desktop items and settings. Some examples of these environments are "
-#| "personal files, desktop icons and menus, screen colors, mouse settings, "
-#| "window size and position, application configurations and network and "
-#| "printer connections. Roaming profiles are available wherever the user "
-#| "logs on, provided the server is available."
 msgid ""
 "Roaming profiles contain user work environments which include desktop items "
 "and settings. Examples include personal files, desktop icons and menus, "
@@ -7962,14 +7075,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Since the profile is copied from the server to the machine during logon, "
-#| "and copied back to the server during logout, a large profile can make "
-#| "windows login/logout painfully slow. There can be many reasons for a "
-#| "large profile, but the most common problems is that users save their "
-#| "files on the windows desktop or in the My Documents folder instead of in "
-#| "their homedir. Also some badly designed programs use the profile for "
-#| "scratch space, and other data."
 msgid ""
 "Since the profile is copied from the server to the machine during logon, and "
 "copied back to the server during logout, a large profile can make Windows "
@@ -7989,11 +7094,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">The educational approach</emphasis>: One way to "
-#| "deal with to large profiles is to explain the situation for the users. "
-#| "Tell them not to store huge files on the desktop and if they fail to "
-#| "listen it's their own fault when login is slow."
 msgid ""
 "<emphasis>The educational approach</emphasis>: one way to deal with "
 "overlarge profiles is to explain the situation to the users. Tell them not "
@@ -8007,13 +7107,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "<emphasis role=\"strong\">Tweaking the profile</emphasis>: A different "
-#| "way to deal with the problem is to remove parts of the profile, and "
-#| "redirect other parts to regular file storage. This moves the work load "
-#| "from the users to the administrator, while adding complexity to the "
-#| "installation. There are at least three ways to edit the parts that are "
-#| "removed from the roaming profile."
 msgid ""
 "<emphasis>Tweaking the profile</emphasis>: a different approach to dealing "
 "with the problem is to remove parts of the profile, and redirect other parts "
@@ -8030,24 +7123,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Example smb.conf's for roaming profiles"
 msgid "Example smb.conf files for roaming profiles"
 msgstr "Eksempler på smb.conf for roamingprofiler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Already delivered while installation, you can find an example smb.conf "
-#| "hopefully in your prefered language. You can find the config example "
-#| "files on your tjener under <emphasis><emphasis role=\"strong\">/usr/share/"
-#| "debian-edu-config/examples/</emphasis></emphasis>. The source file is in "
-#| "English and is called <emphasis><emphasis role=\"strong\">smb-roaming-"
-#| "profiles-en.conf</emphasis></emphasis>. If it is translated to German for "
-#| "example, it is named <emphasis><emphasis role=\"strong\">smb-roaming-"
-#| "profiles-de.conf</emphasis></emphasis>. So if you search a file "
-#| "translated to your prefered language, look at the country code part in "
-#| "the filename. Inside the config file are a lot of explanations, so you "
-#| "should have a look at."
 msgid ""
 "You should hopefully find an example smb.conf in your preferred language "
 "delivered by the installation on tjener under <computeroutput>/usr/share/"
@@ -8070,7 +7150,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Example smb.conf's for roaming profiles"
 msgid "Machine policies for roaming profiles"
 msgstr "Eksempler på smb.conf for roamingprofiler"
 
@@ -8081,7 +7160,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid "Pick a freshly installed Windows computer, and run gpedit.msc"
 msgid ""
 "Pick a freshly installed Windows computer, and run <computeroutput>gpedit."
 "msc</computeroutput>"
@@ -8089,13 +7167,6 @@ msgstr "bruk en nyinstallert windowsmaskin og kjør gpedit.msc"
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Under the selection User Configuration -> Administrative Templates -"
-#| "> System -> User Profiles -> Exclude directories in roaming "
-#| "profile, you can enter a semicolon separated string of directories to "
-#| "exclude from the profile, the directories are internationalized and must "
-#| "be written in your own language the way they are in the profile. Example "
-#| "of directories to exclude are"
 msgid ""
 "Under the selection \"User Configuration\" -> \"Administrative Templates"
 "\" -> \"System\" -> \"User Profiles\" -> \"Exclude directories in "
@@ -8137,9 +7208,6 @@ msgstr "Lagre endringer, og forlat editoren."
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> "
-#| "to all other windows machines."
 msgid ""
 "Copy <computeroutput>c:\\windows\\system32\\GroupPolicy</computeroutput> to "
 "all other Windows machines."
@@ -8149,9 +7217,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "It's a good idea to copy it to your windows os deployment system to have "
-#| "it included at install time."
 msgid ""
 "It's a good idea to copy it to your Windows OS deployment system to have it "
 "included at install time."
@@ -8161,17 +7226,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Example smb.conf's for roaming profiles"
 msgid "Global policies for roaming profiles"
 msgstr "Eksempler på smb.conf for roamingprofiler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "By using the legacy windows policy editor (<computeroutput>poledit.exe</"
-#| "computeroutput>), you can can create a Policy file (NTConfig.pol) file "
-#| "and put it in your netlogon share on tjener. This has the advantage of "
-#| "working almost instantly on all windows machines."
 msgid ""
 "By using the legacy Windows policy editor (<computeroutput>poledit.exe</"
 "computeroutput>), you can can create a Policy file (NTConfig.pol) and put it "
@@ -8187,10 +7246,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Since some time the policy editor standalone download has been removed "
-#| "from the Microsoft website, but it's still available as part of the ORK "
-#| "Tools."
 msgid ""
 "For some time, the policy editor standalone download has been removed from "
 "the Microsoft web site, but it's still available as part of the ORK Tools."
@@ -8201,11 +7256,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "With poledit.exe you can create .pol files. If you put such a file on "
-#| "tjener as <computeroutput>/etc/samba/netlogon/NTLOGON.POL</"
-#| "computeroutput> it will be read by the windows machine automatically and "
-#| "temporarily overwrite the registry, thus applying the changes."
 msgid ""
 "With <computeroutput>poledit.exe</computeroutput> you can create .pol files. "
 "If you put such a file on tjener as <computeroutput>/etc/samba/netlogon/"
@@ -8219,10 +7269,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To make sensible use of poledit.exe you also need to download appriate ."
-#| "adm files for your operating system and applications, otherwise you "
-#| "cannot define many settings in poledit.exe."
 msgid ""
 "To make sensible use of <computeroutput>poledit.exe</computeroutput> you "
 "also need to download appropriate .adm files for your operating system and "
@@ -8235,11 +7281,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Be aware that the new group policy tools, <computeroutput>gpedit.msc</"
-#| "computeroutput> and <computeroutput>gpmc.msc</computeroutput> cannot "
-#| "create .pol files, they either only work for the local machine or need an "
-#| "active directory server."
 msgid ""
 "Be aware that the new group policy tools, <computeroutput>gpedit.msc</"
 "computeroutput> and <computeroutput>gpmc.msc</computeroutput>, cannot "
@@ -8253,9 +7294,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "If you understand german, <ulink url=\"http://gruppenrichtlinien.de\"/> "
-#| "is a very good website on this topic."
 msgid ""
 "If you understand German, <ulink url=\"http://gruppenrichtlinien.de\"/> is a "
 "very good web site on this topic."
@@ -8289,9 +7327,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Use the menu <computeroutput>Edit menu->New->String Value</"
-#| "computeroutput>."
 msgid "Use the menu \"Edit menu\" -> \"New\" -> \"String Value\"."
 msgstr ""
 "Bruk menyen <computeroutput>Edit menu->New->String Value</computeroutput>."
@@ -8302,9 +7337,6 @@ msgstr "Kall den <computeroutput>ExcludeProfileDirs</computeroutput>"
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Enter a semicolon sepatated string of paths to exclude. (same way as "
-#| "machine policy)"
 msgid ""
 "Enter a semicolon-separated list of paths to exclude (in the same way as for "
 "a machine policy)"
@@ -8314,10 +7346,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Now you can choose to export this registry key as a .reg file, Mark a "
-#| "selection, right click and select export. Save the file and you can "
-#| "double click it, or add it to a script to spread it to other machines."
 msgid ""
 "Now you can choose to export this registry key as a .reg file. Mark a "
 "selection, right-click, and select \"Export\"."
@@ -8328,10 +7356,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Now you can choose to export this registry key as a .reg file, Mark a "
-#| "selection, right click and select export. Save the file and you can "
-#| "double click it, or add it to a script to spread it to other machines."
 msgid ""
 "Save the file and you can double click it, or add it to a script to spread "
 "it to other machines."
@@ -8370,18 +7394,11 @@ msgstr "<ulink url=\"http://www.css.taylor.edu/~nehresma/samba.html\"/>"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Redirecting parts of profile"
 msgid "Redirecting profile directories"
 msgstr "Omadressere til deler av profilen"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Sometimes just removing the directory from the profile is not enough. You "
-#| "may experience that users loose files because they mistakenly save things "
-#| "into my documents, when this is not saved in the profiles. Also you may "
-#| "want to redirect the directories some badly programed applications use to "
-#| "normal network shares."
 msgid ""
 "Sometimes just removing directories from the profile is not enough. You may "
 "find that users lose files because they mistakenly save things into \"My "
@@ -8397,18 +7414,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Using machine policies"
 msgid "Redirecting using machine policies"
 msgstr "Bruk av maskinregler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Everything under Using machine policies above applies. You edit using "
-#| "gpedit.msc and copy the Policy to all machines The redirection should be "
-#| "available under User Configuration -> Windows Settings->Folder "
-#| "Redirection Things that can be nice to redirect are Desktop or My "
-#| "Documents."
 msgid ""
 "All the instructions given above about machine policies apply here too.  You "
 "can use <computeroutput>gpedit.msc</computeroutput> to edit the policy and "
@@ -8425,10 +7435,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "One thing to remember is that if you enable folder redirection, those "
-#| "folders are automatically added to the syncroniced folders list. If you "
-#| "do not want this, you should also disable that in following"
 msgid ""
 "One thing to remember is that if you enable folder redirection, those "
 "folders are automatically added to the synchronised folders list. If you do "
@@ -8440,9 +7446,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "User Configuration -> Administrative Templates -> Network -> "
-#| "Offline Files"
 msgid ""
 "\"User Configuration\" -> \"Administrative Templates\" -> \"Network\" -"
 "> \"Offline Files\""
@@ -8450,9 +7453,6 @@ msgstr "Brukeroppsett -> Administrative Maler -> Nettverk -> Frakoblete filer"
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Computer Configuration -> Administrative Templates -> Network -> "
-#| "Offline Files"
 msgid ""
 "\"Computer Configuration\" -> \"Administrative Templates\" -> \"Network"
 "\" -> \"Offline Files\""
@@ -8461,15 +7461,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Using global policies"
 msgid "Redirecting using global policies"
 msgstr "Bruk av globale regler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "FIXME explain how to use profiles from global policies for windows "
-#| "machines in the skolelinux network"
 msgid ""
 "FIXME: explain how to use profiles from global policies for Windows machines "
 "in the skolelinux network"
@@ -8483,16 +7479,11 @@ msgstr "Unngå roaming-profiler"
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Using a local policy"
 msgid "Disabling roaming using a local policy"
 msgstr "Bruk av lokale regler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Using local policies you can disable roaming profile on individual "
-#| "machines. This is often wanted on special machines, for instance on "
-#| "dedicated machines, or machines that have lower then usual bandwith."
 msgid ""
 "Using local policies, you can disable the roaming profile on individual "
 "machines. This is often wanted on special machines - for instance on "
@@ -8504,9 +7495,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Administrative Templates -> system -> User Profiles -> Only "
-#| "allow local profiles"
 msgid ""
 "You can use the machine policy method describe above; the key is in "
 "\"Administrative Templates\" -> \"System\" -> \"User Profiles\" -> "
@@ -8517,7 +7505,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Using global policies"
 msgid "Disabling roaming using global policies"
 msgstr "Bruk av globale regler"
 
@@ -8528,18 +7515,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
 #, fuzzy
-#| msgid "Using a local policy"
 msgid "Disabling roaming in smb.conf"
 msgstr "Bruk av lokale regler"
 
 #. type: Content of: <article><section><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "By editing the samba config you can disable roaming profiles for the "
-#| "entire network. Perhaps everyone have their own dedicated machine? and "
-#| "nobody else is allowed to touch it.  To disable the roaming profiles for "
-#| "the entire network you can alter the smb.conf file on tjener and unset "
-#| "the logon path and logon home variables, and restart samba."
 msgid ""
 "If, perhaps, everyone has their own dedicated machine, and nobody else is "
 "allowed to touch it, editing the Samba configuration will let you disable "
@@ -8564,13 +7544,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Directory Service (OpenLDAP) [ldap]"
 msgid "Remote Desktop"
 msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Directory Service (OpenLDAP) [ldap]"
 msgid "Remote Desktop Service"
 msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
 
@@ -8600,7 +7578,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Directory Service (OpenLDAP) [ldap]"
 msgid "Available Remote Desktop clients"
 msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
 
@@ -8621,10 +7598,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "VNC client (Virtual Network Computer) gives access to Skolelinux "
-#| "remotely. Just install the <computeroutput>xvncviewer</computeroutput> "
-#| "package."
 msgid ""
 "VNC client (Virtual Network Computer) gives access to Skolelinux remotely.  "
 "An alternative client package is <computeroutput>xvncviewer</computeroutput>."
@@ -8634,11 +7607,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "NX graphical client gives students and teachers access to Skolelinux "
-#| "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
-#| "provided NX support to all their students since 2005. They report that "
-#| "the solution is stable."
 msgid ""
 "NX graphical client gives students and teachers access to Skolelinux "
 "remotely on Windows, Mac or Linux PC. One municipality in Norway has "
@@ -8674,7 +7642,6 @@ msgstr ""
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Installing Debian Edu"
 msgid "Samba in Debian Edu"
 msgstr "Installasjon av DebianEdu"
 
@@ -8688,7 +7655,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Getting started"
 msgid "Getting Started"
 msgstr "Komme igang"
 
@@ -8765,7 +7731,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Domain Name System"
 msgid "Domain Membership"
 msgstr "Domain Name System"
 
@@ -8978,14 +7943,6 @@ msgstr "moodle"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Moodle is a course management system (CMS) - a free, Open Source software "
-#| "package designed using sound pedagogical principles, to help educators "
-#| "create effective online learning communities. You can download and use it "
-#| "on any computer you have handy (including webhosts), yet it can scale "
-#| "from a single-teacher site to a University with 200,000 students. Some "
-#| "schools in France use moodle to keep track of students' facilities and "
-#| "credit points."
 msgid ""
 "<ulink url=\"http://packages.debian.org/stable/moodle#\">Moodle</ulink> is a "
 "free, Open Source course management system - software designed using sound "
@@ -9060,15 +8017,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Restricting pupils network access"
 msgid "Restricting pupils' network access"
 msgstr "Begrense nettadgang for elever"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Some schools use squidguard or dansguardian to restrict internet access.  "
-#| "FIXME: explain how to install and use squidguard and/or dansguardian"
 msgid ""
 "Some schools use <ulink url=\"http://packages.debian.org/stable/squidguard#"
 "\">Squidguard</ulink> or <ulink url=\"http://packages.debian.org/stable/"
@@ -9079,7 +8032,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "Installing Debian Edu"
 msgid "Smart-Board integration"
 msgstr "Installasjon av DebianEdu"
 
@@ -9125,9 +8077,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "A line like the following needs to be added to <computeroutput>tjener:/"
-#| "etc/debian-edu/www/debian-edu-install.dat</computeroutput>"
 msgid ""
 "Add the following lines to <computeroutput>/etc/debian-edu/www/debian-edu-"
 "install.dat.local</computeroutput>:"
@@ -9169,10 +8118,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "add the following lines to <computeroutput>/etc/apt/preferences</"
-#| "computeroutput> (the file probably does not exist, so you might have to "
-#| "create it):"
 msgid ""
 "Using an editor add the following lines to <computeroutput>/etc/apt/sources."
 "list</computeroutput> in the chroot:"
@@ -9190,7 +8135,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
-#| msgid "Start the Registry Editor."
 msgid "Start the editor like this:"
 msgstr "Start registereditoren"
 
@@ -9216,12 +8160,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| 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.)"
 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 "
@@ -9260,10 +8198,6 @@ msgstr "legges til tjeneren i filen /opt/ltsp/i386/etc/lts.conf."
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Using <computeroutput>lwat</computeroutput> to change their password, "
-#| "ensures that linux (userPassword) and samba (sabmaNTPassword and "
-#| "smbaLMPassword) passwords are the same."
 msgid ""
 "Using GOsa² to change the password ensures that Kerberos (krbPrincipalKey), "
 "LDAP (userPassword) and Samba (sambaNTPassword and sambaLMPassword) "
@@ -9288,11 +8222,6 @@ msgstr "Bruk av maskinregler"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To be able to send and receive mails outside the internal network, the "
-#| "adminstrator needs to configure the mailserver <computeroutput>exim4</"
-#| "computeroutput> according to the local situation, <computeroutput>dpkg-"
-#| "reconfigure exim4-config</computeroutput> is a good first step to do this."
 msgid ""
 "All users can send and receive mails within the internal network. To allow "
 "mail outside the internal network, the adminstrator needs to configure the "
@@ -9334,7 +8263,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Changing kioskmode on diskless workstations"
 msgid "Obtaining a Kerberos ticket to read email on diskless workstations"
 msgstr "Endre kioskmodus på halvtykke arbeidstasjoner"
 
@@ -9362,11 +8290,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "On local machines, which are workstations and LTSP servers, and diskless "
-#| "workstations, <computeroutput>kmix</computeroutput> works as usual. "
-#| "<computeroutput>alsamixer</computeroutput> can also be used to change the "
-#| "sound volume."
 msgid ""
 "On other machines (workstations, LTSP servers, and diskless workstations), "
 "<computeroutput>kmix</computeroutput> or <computeroutput>alsamixer</"
@@ -9455,9 +8378,6 @@ msgstr "Bidra globalt"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Internationally we are organized in <ulink url=\"http://wiki.debian.org/"
-#| "DebianEdu/Teams/\">different teams</ulink> working on different subjects."
 msgid ""
 "Internationally we are organised into various <ulink url=\"http://wiki."
 "debian.org/DebianEdu/Teams/\">teams</ulink> working on different subjects."
@@ -9497,11 +8417,6 @@ msgstr "Dokumentasjonskrivere og oversettere"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "This document needs your help! First and foremost, it is not finished "
-#| "yet: If you read it, you will notice various FIXMEs within the text. If "
-#| "you happen to know (a bit of) what needs to be explained there, please "
-#| "consider sharing your knowledge with us."
 msgid ""
 "This document needs your help! First and foremost, it is not finished yet: "
 "if you read it, you will notice various FIXMEs within the text. If you "
@@ -9607,8 +8522,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "#skolelinux on irc.debian.org - IRC channel to support norwegian users"
 msgid "#skolelinux on irc.debian.org - IRC channel to support Norwegian users"
 msgstr "#skolelinux på irc.oftc.net - IRC-kanal for support av norske brukere"
 
@@ -9635,8 +8548,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "#skolelinux.de on irc.debian.org - IRC channel to support german users"
 msgid "#skolelinux.de on irc.debian.org - IRC channel to support German users"
 msgstr ""
 "#skolelinux.de på irc.oftc.net - IRC-kanal for support av tyske brukere"
@@ -9705,7 +8616,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Installation"
 msgid "Installation changes"
 msgstr "Installasjon"
 
@@ -9729,7 +8639,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Linux kernel version 2.6.18"
 msgid "Linux kernel 3.2.x"
 msgstr "Linux kjerneversjon 2.6.18"
 
@@ -9801,7 +8710,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Documentation writers and translators"
 msgid "Documentation and translation updates"
 msgstr "Dokumentasjonskrivere og oversettere"
 
@@ -10015,10 +8923,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "You can checkout the <computeroutput>debian-edu-doc</computeroutput> "
-#| "source anonymously with the following command (you need to have the "
-#| "<computeroutput>git</computeroutput> package installed for this to work):"
 msgid ""
 "You can check out the <computeroutput>debian-edu-doc</computeroutput> source "
 "anonymously with the following command (you need to have the "
@@ -10091,10 +8995,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "Basic information about Alioth (the host where our SVN repository is "
-#| "located) and SVN is available at <ulink url=\"http://wiki.debian.org/"
-#| "Alioth/Git\"/>."
 msgid ""
 "Basic information about Alioth (the host where our Git repository is "
 "located) and Git is available at <ulink url=\"http://wiki.debian.org/Alioth/"
@@ -10122,7 +9022,6 @@ msgstr "Meld fra om eventuelle problemer."
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Appendix A - The GNU Public License"
 msgid "Appendix A - The GNU General Public License"
 msgstr "Vedlegg A - GNU Generell Offentlig Lisens"
 
@@ -10702,13 +9601,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid "<emphasis role=\"strong\">NO WARRANTY</emphasis>"
 msgid "<emphasis role=\"strong\">END OF TERMS AND CONDITIONS</emphasis>"
 msgstr "<emphasis role='strong'>NO WARRANTY</emphasis>"
 
 #. type: Content of: <article><section><title>
 #, fuzzy
-#| msgid "Appendix B - about Debian Edu Live CD/DVDs"
 msgid "Appendix B - no Debian Edu Live CD/DVDs for Wheezy yet"
 msgstr "Vedlegg B - om Debian Edu Live CD/DVDer"
 
@@ -10741,15 +9638,6 @@ msgstr "Aktiverer oversettelser og regional støtte"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "To activate a specific translation, boot using "
-#| "<computeroutput>locale=ll_CC.UTF-8</computeroutput> as a boot option, "
-#| "where ll_CC.UTF-8 is the locale name you want.  To aciviate a given "
-#| "keyboard layout, use the <computeroutput>keyb=KB</computeroutput> option "
-#| "where KB is the wanted keyboard layout.  More information on this feature "
-#| "<ulink url=\"http://wiki.debian.org/DebianLive/l10n\">is available from "
-#| "the live cd build script documentation</ulink>.  Here is a list of "
-#| "commonly used locale codes:"
 msgid ""
 "To activate a specific translation, boot using <computeroutput>locale=ll_CC."
 "UTF-8</computeroutput> as a boot option, where ll_CC.UTF-8 is the locale "
@@ -10878,7 +9766,6 @@ msgstr "Ting man må vite"
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "the password for the user is \"user\", root has no passwd set."
 msgid "The password for the user is \"user\"; root has no passwd set."
 msgstr "passordet for user er «user», root har ingen passord."
 
@@ -11063,7 +9950,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Sound with LTSP clients"
 msgid "Speed up LTSP client boot."
 msgstr "Lyd med LTSP-klienter"
 
@@ -11127,10 +10013,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "For squeeze Debian Edu has switched to <computeroutput>powerdns</"
-#| "computeroutput> as nameserver. It's however possible to stay with "
-#| "<computeroutput>bind9</computeroutput>."
 msgid ""
 "The <computeroutput>.iso</computeroutput> images can directly be copied onto "
 "USB sticks, for example by using <computeroutput>dd</computeroutput> or even "
@@ -11189,7 +10071,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Linux kernel version 2.6.18"
 msgid "Linux kernel 2.6.32"
 msgstr "Linux kjerneversjon 2.6.18"
 
@@ -11203,7 +10084,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "OpenOffice.org 1.1."
 msgid "OpenOffice.org 3.2.1"
 msgstr "OpenOffice.org 1.1."
 
@@ -11246,7 +10126,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "Installation"
 msgid "Infrastructural changes"
 msgstr "Installasjon"
 
@@ -11264,9 +10143,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Change <computeroutput>$allowPwSet = false ;</computeroutput> to "
-#| "<computeroutput>$allowPwSet = true ;</computeroutput>"
 msgid ""
 "The DHCP network for 10.0.0.0/8 has been renamed from "
 "<computeroutput>barebone</computeroutput> to <computeroutput>intern</"
@@ -11384,7 +10260,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "User Administration (lwat)"
 msgid "New administration tool: GOsa²"
 msgstr "Brukeradministrasjon (lwat)"
 
@@ -11487,9 +10362,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "(The <computeroutput>debian-edu-doc</computeroutput> source package "
-#| "contains this image as a <computeroutput>dia</computeroutput> file.)"
 msgid ""
 "<computeroutput>freerdp-x11</computeroutput> is installed by default as RDP "
 "and VNC client. (Previously <computeroutput>rdesktop</computeroutput> was "
@@ -11665,11 +10537,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Everything that is new in Debian 5.0.4, see the <ulink url=\"http://wiki."
-#| "debian.org/DebianEdu/Documentation/Lenny/"
-#| "Features#NewfeaturesintheDebian5.0.4onwhichDebianEdu5.0.4.2B-edu0isbased"
-#| "\">following paragraph</ulink> for details."
 msgid ""
 "Everything that is new in Debian 5.0.4; see the <link linkend=\"AppendixC--"
 "New_features_in_Debian_5.0.4_upon_which_Debian_Edu_5.0.4.2B-edu0_is_based"
@@ -11682,12 +10549,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "More than 80 applications relevant for education are included based on "
-#| "user feedback and user statistics (through <ulink url=\"http://popcon."
-#| "skolelinux.org/\">Debian Edu popularity contest</ulink>).  The full list "
-#| "of packages are listed in the <ulink url=\"http://blends.alioth.debian."
-#| "org/edu/tasks/\">task overview page</ulink>."
 msgid ""
 "More than 80 applications relevant for education are included based on user "
 "feedback and user statistics (through <ulink url=\"http://popcon.skolelinux."
@@ -11760,9 +10621,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Main-server is set up as a PXE server for booting thin clients and "
-#| "diskless workstations and for installing to clients' hard or flash drives."
 msgid ""
 "Main-server is set up as a PXE server for booting thin clients and diskless "
 "workstations, and for installing to clients' hard or flash drives."
@@ -11773,11 +10631,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "The configuration for DNS and DHCP is stored in LDAP and can be edited "
-#| "using <computeroutput>lwat</computeroutput>. The DNS server has been "
-#| "switched from <computeroutput>bind9</computeroutput> to "
-#| "<computeroutput>power-dns</computeroutput>."
 msgid ""
 "The configuration for DNS and DHCP is stored in LDAP and can be edited using "
 "<computeroutput>lwat</computeroutput>. The DNS server has been switched from "
@@ -11791,10 +10644,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "LDAP server for directory services (NSS) are now located using a SRV "
-#| "record in DNS instead of hardcoding the 'ldap' DNS name.  LDAP server for "
-#| "password checks (PAM) is still using the hardcoded 'ldap' DNS name."
 msgid ""
 "LDAP server for directory services (NSS) is located using a SRV record in "
 "DNS instead of hardcoding the 'ldap' DNS name.  LDAP server for password "
@@ -11806,21 +10655,16 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "Multi arch (amd64/i386/powerpc) net installer CD."
 msgid "Multi-architecture (amd64/i386/powerpc) net installer CD."
 msgstr "Multiarkitektur CD (amd64/i386/powerpc) for nettinstallasjon."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "(Most) Packages are downloaded from over the Internet."
 msgid "(Most) Packages are downloaded over the Internet."
 msgstr "(De fleste) Pakker lastes ned over internet. "
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Multi arch (amd64/i386) installer DVD capable of installing without "
-#| "network."
 msgid ""
 "Multi-architecture (amd64/i386) installer DVD capable of installing without "
 "network."
@@ -11830,9 +10674,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "PulseAudio is provided in addition to ALSA and OSS for sound on "
-#| "workstations and diskless workstations machines."
 msgid ""
 "PulseAudio is provided in addition to ALSA and OSS for sound on workstations "
 "and diskless workstation machines."
@@ -11942,9 +10783,6 @@ msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Includes more than 40 bug fixes, improvements and security updates that "
-#| "came to our attentention after the 3.0r0 release"
 msgid ""
 "Includes more than 40 bug fixes, improvements and security updates that came "
 "to our attention after the 3.0r0 release"
@@ -12010,14 +10848,11 @@ msgstr "Automatisk versjonskontroll av oppsettsfiler i /etc/ ved hjelp av svk."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid "File systems sizes can be extended while the file system is mounted."
 msgid "File systems can be extended while the file system is mounted."
 msgstr "Filsystemer kan utvides mens filsystemet er montert."
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
 #, fuzzy
-#| msgid ""
-#| "Support automatically extending file system based on predefined rules."
 msgid ""
 "Support for automatically extending file systems based on predefined rules."
 msgstr ""
@@ -12125,15 +10960,11 @@ msgstr "KDE versjon 2.2."
 
 #. type: Content of: <article><section><section><title>
 #, fuzzy
-#| msgid "More information on older releases"
 msgid "More information on even older releases"
 msgstr "Mer informasjon om eldre utgivelser"
 
 #. type: Content of: <article><section><section><para>
 #, fuzzy
-#| msgid ""
-#| "More information on the older releases can be found at <ulink url="
-#| "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
 msgid ""
 "More information on even older releases can be found at <ulink url=\"http://"
 "developer.skolelinux.no/info/cdbygging/news.html\"/>."


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