[debian-edu-commits] debian-edu/debian-edu-doc.git (#1466) - master (branch) updated: 1.5_20130228_7.0-2-g0756363
David Prévot
taffit at alioth.debian.org
Tue May 7 20:13:48 UTC 2013
The branch, master has been updated
via 07563638d3c1846c699359b1e50c5bc30689ed66 (commit)
from 0c8eab50c1b50e71d62302a4cfa02a91d6c0e61c (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 07563638d3c1846c699359b1e50c5bc30689ed66
Author: David Prévot <taffit at debian.org>
Date: Tue May 7 16:12:44 2013 -0400
Updated manuals and images from wiki; PO files (1300t 28f 18u)
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386827 -> 386808 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386934 -> 386913 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386867 -> 386850 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386860 -> 386843 bytes
.../debian-edu-wheezy-manual.da.po | 549 ++++++++++++++------
.../debian-edu-wheezy-manual.de.po | 549 ++++++++++++++------
.../debian-edu-wheezy-manual.es.po | 354 ++++++++-----
.../debian-edu-wheezy-manual.fr.po | 550 ++++++++++++++------
.../debian-edu-wheezy-manual.it.po | 547 ++++++++++++++------
.../debian-edu-wheezy-manual.nb.po | 339 ++++++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 296 ++++++-----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 154 +++---
documentation/debian-edu-wheezy/fixme-status.txt | 13 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386827 -> 386808 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386934 -> 386913 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386867 -> 386850 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386860 -> 386843 bytes
17 files changed, 2285 insertions(+), 1066 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 51d464e..9df4e2e 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 6d15634..a5a33d6 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index ae6e3a6..f9b0494 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index 3e8a129..09aade3 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 2c60a11..3f1ff59 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -101,9 +101,15 @@ msgstr ""
"traditionelle tynde klienter."
#. type: Content of: <article><section><para>
-msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+#, 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, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
"Flere undervisningsprogramer såsom celestia, drgeo, gcompris, geogebra, "
@@ -252,10 +258,16 @@ msgstr ""
"køres hukommelsestest (memtest), eller startes op fra den lokale harddisk."
#. 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 next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
"Dette er designet til at kunne ændres - det vil sige, du kan få NFS-root i "
"syslinux til at pege på en af LTSP-serverne eller ændre next-server i DHCP "
@@ -421,7 +433,9 @@ msgid "Electronic Post Office"
msgstr "Elektronisk postkontor"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+#, fuzzy
+#| msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr "IMAP/POP3 (Dovecot)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -563,14 +577,22 @@ msgstr ""
"for Windows- og Macintoshklienter."
#. 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 "
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Som standard sættes posten kun op for lokal levering (dvs. indenfor skolen), "
"dog kan e-post-levering til det større internet sættes op, hvis skolen har "
@@ -1098,8 +1120,13 @@ msgstr ""
"For kørsel af Iceweasel/Firefox og OpenOffice.org, er 128 MiB RAM et minimum."
#. 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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1128,12 +1155,20 @@ msgstr ""
"dem for swap, da det er langt hurtigere end netværksswapping."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"På arbejdsstationer med begrænset RAM kan stavekontrollen få OpenOffice.org "
"til at hænge hvis swapområdet er for lille. Systemadministratoren må så "
@@ -1208,11 +1243,17 @@ msgid "You need exactly one main server, the tjener."
msgstr "Du skal kun have en hovedserver, tjeneren."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 50 (diskless) workstations on the main network."
+#, 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>
-msgid "You can have up to 20 LTSP servers on the main network."
+#, 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."
msgstr "Du kan have op til 20 LTSP-servere på hovednetværket."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1373,9 +1414,14 @@ msgstr ""
"eller rsync via:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: these download URLs need to be adapted for wheezy still... They "
+#| "currently don't work"
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
"FIXME: these download URLs need to be adapted for wheezy still... They "
"currently don't work"
@@ -1417,25 +1463,37 @@ 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/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.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.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.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.0.0+r0-"
-"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-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>"
@@ -1954,6 +2012,15 @@ msgstr ""
"hovedserver eller som en server for tynde klinter for at være brugbar efter "
"installationen."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2232,10 +2299,15 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
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. Diskless workstations must be added with GOsa² just "
-"like normal workstations or thin client servers."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Denne opsætning tillader at diskløse arbejdsstationer og tynde klienter kan "
"startes op fra hovednetværket. Diskløse arbejdsstationer skal tilføjes med "
@@ -2828,12 +2900,26 @@ msgstr ""
"brugernavne hvis det fulde navn indeholder ikke-ASCII-tegn."
#. 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 "
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -2882,6 +2968,10 @@ msgstr ""
"hjørne."
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3007,6 +3097,12 @@ msgstr "Avanceret brugerhåndtering"
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3203,14 +3299,22 @@ msgstr ""
"i denne manual."
#. 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. (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."
+"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 "
+"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."
msgstr ""
"For at tilføje en maskine, så brug GOsa²-hovedmenuen, systemer, tilføj. "
"(vælg netdevice, ikke server da det vil efterlade dig med et systemobjekt "
@@ -4238,19 +4342,20 @@ msgid "LDAP service needs to be reconfigured"
msgstr "LDAP-tjeneste skal konfigureres igen"
#. type: Content of: <article><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 ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
"LDAP-opsætningen har ændret sig meget fra Lenny til Squeeze. Måden "
"brugerkontoer, adgangskoder, netværksopsætning, tjenester og maskiner "
@@ -4715,7 +4820,9 @@ msgstr ""
"Kerberos. Den bruges dog hovedsagelig for testformål."
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+#, 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)"
#. type: Content of: <article><section><section><para>
@@ -4729,9 +4836,14 @@ msgstr ""
"<ulink url=\"http://wiki.debian.org/StableUpdates\">stable-updates </ulink>."
#. 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 pointreleases are "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
"Selvom du kan bruge stable-updates direkte, så er det ikke et krav: stable-"
@@ -4770,13 +4882,18 @@ msgstr ""
"at du bruger alle tilgængelige backporte.</emphasis>"
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+#, fuzzy
+#| msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr "Brug af backports.debian.org er nemt:"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
-"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"
msgstr ""
"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
@@ -4784,16 +4901,40 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+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 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
msgstr ""
"Tidligere var ekstra konfiguration krævet for at få opdateringer installeret "
"automatisk for backports, men siden 2011 har programpakken <ulink url="
"\"http://backports.debian.org/news/squeeze-backports_and_lenny-backports-"
"sloppy_started/\">squeeze-backports</ulink> gjort dette unødvendigt."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Upgrading with a CD or DVD ROM"
msgstr "Opgradering med en cd eller dvd-rom"
@@ -5618,6 +5759,14 @@ msgstr ""
"serveren. Diskløse arbejdsstationer er en glimrende måde at genbruge nyere "
"udstyr med den same lave vedligeholdelsesomkostning som tynde klienter."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -5692,14 +5841,22 @@ msgstr ""
"efter installationen."
#. type: Content of: <article><section><section><section><title>
-msgid "Machine type selection based on the network"
-msgstr "Valg af maskintype baseret på netværket"
+#, 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 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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
"Hver LTSP-server har to ethernetkort: Et konfigureret i undernettet "
"10.0.0.0/8 (som deles med hovedserveren), og en anden der udgør et lokalt "
@@ -5707,13 +5864,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"Diskløse arbejdsstationer henter IP-adresser tildelt i det private undernet "
-"10.0.0.0/8, mens tynde klienter er forbundet i det separate undernet "
-"192.168.0.0/24."
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -5885,57 +6052,6 @@ msgstr ""
"Se også PXELINUX-dokumentationen på <ulink url=\"http://syslinux.zytor.com/"
"wiki/index.php/PXELINUX\"/> ."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-"Hvis klienter på 192.168.x.x-grænsefladen for en server for tynde klienter "
-"skal starte op som diskløse arbejdsstationer i stedet for tynde klienter, så "
-"rediger"
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-"og tilføj et »3« (ingen anførelsestegn) til slutningen af linjen, for at "
-"angive kørselsniveau 3."
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr "Filen skal så se således ud:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-"Når der tilføjes sådan en arbejdsstation i GOsa², så brug en IP-adresse der "
-"matcher LTSP-servergrænsefladens IP-adresse på den tynde klients net (som "
-"standard 192.168.0.254, dynamisk dhcp-interval startende ved 192.168.0.20)."
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr "Adskil hoved- og LTSP-servere"
@@ -8406,7 +8522,7 @@ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
msgid "Installation changes"
msgstr "Installationsændringer"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -8421,7 +8537,9 @@ msgid "Software updates"
msgstr "Programopdateringer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr "Alt som også er nyt i Debian Wheezy:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8429,8 +8547,10 @@ msgid "Linux kernel 3.2.x"
msgstr "Linuxkerne version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
-msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.8.4 og GNOME 3.4"
+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.)"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Web browser Iceweasel 10 ESR"
@@ -8441,6 +8561,18 @@ msgid "LibreOffice 3.5.4"
msgstr "LibreOffice 3.5.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr "Undervisningsprogrampakken GCompris 12.01"
@@ -8461,9 +8593,15 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr "Virtual stargazer Stellarium 0.11.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+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"
@@ -8481,24 +8619,16 @@ msgstr ""
"\">installationsmanualen</ulink>."
#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Ændringer i infrastruktur"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr "FIXME: to be documented, if any"
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr "Opdateringer af dokumentation og oversættelser"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
-"Disse skabeloner er nu tilgængelige på FIXME sprog."
+"Disse skabeloner er nu tilgængelige på 28 sprog."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8510,22 +8640,64 @@ msgstr ""
"dansk. Delvist oversatte versioner findes for norsk bokmål og spansk."
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Regressioner"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#, fuzzy
+#| msgid "Other LDAP related changes"
+msgid "LDAP related changes"
msgstr "Andre LDAP-relaterede ændringer"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr "Andre ændringer"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr "Regressioner"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
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, "
@@ -8536,8 +8708,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Dette dokument er underlagt ophavsretten og skrevet af Holger Levsen (2007, "
"2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, "
@@ -8647,11 +8819,17 @@ msgid "Translations of this document"
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 "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Fuldt oversatte versioner af dette dokument på tysk, italiensk, fransk og "
"dansk er tilgængelige. Ufuldstændige oversættelser findes for norsk bokmål "
@@ -9936,6 +10114,10 @@ msgstr ""
"ulink> og <ulink url=\"http://www.debian.org/releases/squeeze/installmanual"
"\">installationsmanualen</ulink>."
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Ændringer i infrastruktur"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -10027,14 +10209,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
-"Disse skabeloner er nu tilgængelige på 28 sprog."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10239,6 +10413,10 @@ msgstr ""
"RDP- og VNC-klient. (Tidligere blev <computeroutput>rdesktop</"
"computeroutput> installeret i stedet for)."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Andre LDAP-relaterede ændringer"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -10873,6 +11051,81 @@ msgstr ""
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+#~ msgstr ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#~ msgid "Machine type selection based on the network"
+#~ msgstr "Valg af maskintype baseret på netværket"
+
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "Diskløse arbejdsstationer henter IP-adresser tildelt i det private "
+#~ "undernet 10.0.0.0/8, mens tynde klienter er forbundet i det separate "
+#~ "undernet 192.168.0.0/24."
+
+#~ msgid ""
+#~ "If clients on the 192.168.x.x interface of a thin client server should "
+#~ "boot as diskless workstations instead of thin clients, edit"
+#~ msgstr ""
+#~ "Hvis klienter på 192.168.x.x-grænsefladen for en server for tynde "
+#~ "klienter skal starte op som diskløse arbejdsstationer i stedet for tynde "
+#~ "klienter, så rediger"
+
+#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+#~ msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+
+#~ msgid ""
+#~ "and add a '3' (no quotes) to the end of the kernel argument line, to "
+#~ "specify runlevel 3."
+#~ msgstr ""
+#~ "og tilføj et »3« (ingen anførelsestegn) til slutningen af linjen, for at "
+#~ "angive kørselsniveau 3."
+
+#~ msgid "The file should then look like this:"
+#~ msgstr "Filen skal så se således ud:"
+
+#~ msgid ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+#~ msgstr ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+
+#~ msgid ""
+#~ "When adding such a workstation in GOsa², use an IP address matching the "
+#~ "LTSP server interface IP address on the thin client net (by default "
+#~ "192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
+#~ msgstr ""
+#~ "Når der tilføjes sådan en arbejdsstation i GOsa², så brug en IP-adresse "
+#~ "der matcher LTSP-servergrænsefladens IP-adresse på den tynde klients net "
+#~ "(som standard 192.168.0.254, dynamisk dhcp-interval startende ved "
+#~ "192.168.0.20)."
+
+#~ msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+#~ msgstr "Skrivebordsmiljøerne KDE »Plasma« 4.8.4 og GNOME 3.4"
+
+#~ msgid "FIXME: to be documented, if any"
+#~ msgstr "FIXME: to be documented, if any"
+
+#~ msgid ""
+#~ "Translation updates for the templates used in the installer. These "
+#~ "templates are now available in FIXME languages."
+#~ msgstr ""
+#~ "Oversættelsesopdateringer for skabelonerne brugt i "
+#~ "installationsprogrammet. Disse skabeloner er nu tilgængelige på FIXME "
+#~ "sprog."
+
+#~ msgid ""
#~ "Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released "
#~ "2013-0?-??"
#~ msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index 7035b69..768bf31 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2013-02-24 23:14+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -113,9 +113,15 @@ msgstr ""
"traditionelle Thin Clients - ist dadurch verfügbar."
#. type: Content of: <article><section><para>
-msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+#, 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, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
"Mehrere für den Unterricht geeignete Anwendungen wie celestia, drgeo, "
@@ -268,10 +274,16 @@ msgstr ""
"(Memtest) ausgeführt oder von der lokalen Festplatte gestartet werden soll."
#. 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 next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
"Dies ist so angelegt, dass es veränderbar ist; in Syslinux kann NFS-Root "
"einem LTSP-Server zugeordnet werden oder es kann durch Setzen des DHCP-"
@@ -437,7 +449,9 @@ msgid "Electronic Post Office"
msgstr "Elektronisches Postamt"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+#, fuzzy
+#| msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr "IMAP/POP3 (Dovecot)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -580,14 +594,22 @@ msgstr ""
"bedient."
#. 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 "
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Das E-Mail-System ist nur zur lokalen Auslieferung vorkonfiguriert (d.h. "
"innerhalb der Schule). Die E-Mail-Zustellung kann aber, sofern die Schule "
@@ -1131,8 +1153,13 @@ msgstr ""
"MiB RAM zur Verfügung stehen."
#. 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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1163,12 +1190,20 @@ msgstr ""
"Auslagerung über das Netzwerk."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"Auf Workstations mit sehr wenig RAM kann die Rechtschreibkontrolle von "
"OpenOffice hängen bleiben, weil der Swap-Speicher zu klein ist. Dann muss "
@@ -1247,13 +1282,19 @@ msgid "You need exactly one main server, the tjener."
msgstr "Sie benötigen genau einen Hauptserver, genannt »tjener«."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 50 (diskless) workstations on the main network."
+#, 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 ""
"Sie können bis zu 50 (plattenlose) Arbeitsplatzrechner im Hauptnetzwerk "
"verwenden."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 20 LTSP servers on the main network."
+#, 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."
msgstr "Sie können bis zu 20 LTSP-Server im Hauptnetzwerk verwenden."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1418,9 +1459,14 @@ msgstr ""
"heruntergeladen werden:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: these download URLs need to be adapted for wheezy still... They "
+#| "currently don't work"
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
"FIXME: these download URLs need to be adapted for wheezy still... They "
"currently don't work"
@@ -1462,25 +1508,37 @@ msgstr ""
"Prozessorarchitektur ist erhältlich mittels"
#. 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/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.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.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.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.0.0+r0-"
-"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-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>"
@@ -2005,6 +2063,15 @@ msgstr ""
"oder als »Terminal-Server« dienen soll, muss zwei Netzwerkkarten haben, "
"damit sie dem Zweck entsprechend genutzt werden kann."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2290,10 +2357,15 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
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. Diskless workstations must be added with GOsa² just "
-"like normal workstations or thin client servers."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Dieses Setup erlaubt es, Diskless Workstations und Thin Clients aus dem "
"Hauptnetzwerk zu booten. Diskless Workstations müssen mit GOsa² wie normale "
@@ -2888,12 +2960,26 @@ msgstr ""
"ungültigen Kennungen führen."
#. 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 "
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -2944,6 +3030,10 @@ msgstr ""
"auf »Passwort setzen«."
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3075,6 +3165,12 @@ msgstr "Fortgeschrittene Nutzerverwaltung"
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3277,14 +3373,22 @@ msgstr ""
"linkend=\"Architecture\">Kapitel über die Netzwerkstruktur</link> zu finden."
#. 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. (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."
+"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 "
+"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."
msgstr ""
"Um eine Maschine hinzufügen, benutzen Sie das GOsa²-Menü, dort Systeme und "
"als Aktion »Hinzufügen«. Wählen Sie »Netzwerk-Gerät«, nicht »Server«, da das "
@@ -4344,19 +4448,20 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Der LDAP-Service muss muss neu eingerichtet werden"
#. type: Content of: <article><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 ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
"Mit dem Wechsel von Lenny nach Squeeze hat sich die LDAP-Einrichtung "
"wesentlich geändert. Es gibt große Unterschiede im Hinblick aus "
@@ -4837,7 +4942,9 @@ msgstr ""
"Kerberos-Passwort zu setzen. Es ist eher für Testzwecke vorgesehen."
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+#, fuzzy
+#| msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr "Die Verwendung von »stable-updates« (früher volatile)"
#. type: Content of: <article><section><section><para>
@@ -4851,9 +4958,14 @@ msgstr ""
"\"http://wiki.debian.org/StableUpdates\">stable-updates</ulink> enthalten."
#. 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 pointreleases are "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
"Es ist möglich, aber nicht notwendig, stable-updates direkt zu verwenden: "
@@ -4892,13 +5004,18 @@ msgstr ""
"emphasis>"
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+#, fuzzy
+#| msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr "Die Nutzung von backports.debian.org ist einfach:"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
-"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"
msgstr ""
"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
@@ -4906,10 +5023,28 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+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 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
msgstr ""
"Früher war eine zusätzliche Konfiguration erforderlich, um für installierte "
"Backports automatisch Updates zu bekommen; seit 2011 ist dies wegen der "
@@ -4917,6 +5052,12 @@ msgstr ""
"backports_and_lenny-backports-sloppy_started/\">squeeze-backports</ulink> "
"überflüssig."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Upgrading with a CD or DVD ROM"
msgstr "Upgrade mit einer CD- oder einer DVD-ROM"
@@ -5761,6 +5902,14 @@ msgstr ""
"Möglichkeit, neuere Hardware mit ebenso geringem Wartungsaufwand wie Thin "
"Clients verwenden zu können."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -5836,14 +5985,22 @@ msgstr ""
"kernels</computeroutput> aus."
#. type: Content of: <article><section><section><section><title>
-msgid "Machine type selection based on the network"
-msgstr "Festlegen der Rechnerart abhängig vom Subnetz"
+#, fuzzy
+#| msgid "Select type of installation"
+msgid "LTSP client type selection"
+msgstr "Art der Installation auswählen"
#. 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 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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
"Jeder LTSP-Server hat zwei Ethernet-Karten. Eine ist für das Subnetz "
"10.0.0.0/8 (in dem auch der Hauptserver liegt) konfiguriert. Die andere "
@@ -5852,13 +6009,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"Diskless Workstations erhalten IP-Adressen aus dem privaten Subnetz "
-"10.0.0.0/8, während sich Thin Clients im separaten Subnetz 192.168.0.0/24 "
-"befinden."
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -6031,58 +6198,6 @@ msgstr ""
"Siehe auch die PXELINUX-Dokumentation unter <ulink url=\"http://syslinux."
"zytor.com/wiki/index.php/PXELINUX\"/> ."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-"Wenn die Clients im Netz 192.168.x.x eines Terminal-Servers als Diskless "
-"Workstations anstatt als Thin Clients starten sollen, dann editieren Sie"
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-"und fügen Sie am Ende der Zeile mit den Kernelargumenten eine '3' (ohne "
-"Anführungszeichen) hinzu, um das Runlevel 3 festzulegen "
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr "Der Dateiinhalt sollte dann folgendermaßen aussehen:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-"Definieren Sie eine IP-Adresse, die zur IP-Adresse der Netzwerkschnittstelle "
-"des LTSP-Servers im Thin-Client-Netzwerk passt, wenn Sie solch einen "
-"Arbeitsplatzrechner in GOsa² hinzufügen. Standardmäßig hat dort der LTSP-"
-"Server die IP 192.168.0.254; der dynamische DHCP-Bereich beginnt mit "
-"192.168.0.20."
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr "Trennung von Hauptserver und LTSP-Servern"
@@ -8623,7 +8738,7 @@ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
msgid "Installation changes"
msgstr "Änderungen der Installation"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -8638,7 +8753,9 @@ msgid "Software updates"
msgstr "Aktualisierung von Software"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr "Alles, was in Debian »Wheezy« neu ist:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8646,8 +8763,10 @@ msgid "Linux kernel 3.2.x"
msgstr "Linux-Kernel in der Version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
-msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.8.4 und GNOME 3.4"
+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.)"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Web browser Iceweasel 10 ESR"
@@ -8658,6 +8777,18 @@ msgid "LibreOffice 3.5.4"
msgstr "LibreOffice 3.5.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr "Lehrprogramme GCompris 12.01"
@@ -8678,9 +8809,15 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr "Virtueller Sternenhimmel Stellarium 0.11.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+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 enthält mehr als 10.000 neue installierbare Pakete, "
"eingeschlossen der Browser Chromium."
@@ -8698,24 +8835,16 @@ msgstr ""
"Installationshandbuch</ulink> zu finden."
#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Änderungen der Infrastruktur"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr "FIXME: to be documented, if any"
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr "Aktualisierung von Dokumentation und Übersetzungen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
-"liegen nun für FIXME Sprachen vor."
+"liegen nun für 28 Sprachen vor."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8728,22 +8857,64 @@ msgstr ""
"Versionen gibt es in Norwegisch Bokmål und in Spanisch."
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Rückschritte"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#, fuzzy
+#| msgid "Other LDAP related changes"
+msgid "LDAP related changes"
msgstr "Sonstige Änderungen mit Bezug auf LDAP"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr "Sonstige Änderungen"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr "Rückschritte"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright und Autoren"
#. 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, "
@@ -8754,8 +8925,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Dieses Dokument wurde u. a. von folgenden Personen verfasst: Holger Levsen "
"(2007, 2008, 2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, "
@@ -8864,11 +9035,17 @@ msgid "Translations of this document"
msgstr "Übersetzungen dieses Dokuments"
#. 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 "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Vollständige Übersetzungen dieses Dokuments ins Deutsche, Italienische, "
"Französische und Dänische sind vorhanden. Es gibt unvollständige "
@@ -10173,6 +10350,10 @@ msgstr ""
"<ulink url=\"http://www.debian.org/releases/squeeze/installmanual\">Debian-"
"Installationshandbuch</ulink> zu finden."
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Änderungen der Infrastruktur"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -10265,14 +10446,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
-"liegen nun für 28 Sprachen vor."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10487,6 +10660,10 @@ msgstr ""
"und VNC-Client installiert. (Früher wurde stattdessen "
"<computeroutput>rdesktop</computeroutput> installiert."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Sonstige Änderungen mit Bezug auf LDAP"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -11133,6 +11310,80 @@ msgstr ""
"werden."
#~ msgid ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+#~ msgstr ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#~ msgid "Machine type selection based on the network"
+#~ msgstr "Festlegen der Rechnerart abhängig vom Subnetz"
+
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "Diskless Workstations erhalten IP-Adressen aus dem privaten Subnetz "
+#~ "10.0.0.0/8, während sich Thin Clients im separaten Subnetz 192.168.0.0/24 "
+#~ "befinden."
+
+#~ msgid ""
+#~ "If clients on the 192.168.x.x interface of a thin client server should "
+#~ "boot as diskless workstations instead of thin clients, edit"
+#~ msgstr ""
+#~ "Wenn die Clients im Netz 192.168.x.x eines Terminal-Servers als Diskless "
+#~ "Workstations anstatt als Thin Clients starten sollen, dann editieren Sie"
+
+#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+#~ msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+
+#~ msgid ""
+#~ "and add a '3' (no quotes) to the end of the kernel argument line, to "
+#~ "specify runlevel 3."
+#~ msgstr ""
+#~ "und fügen Sie am Ende der Zeile mit den Kernelargumenten eine '3' (ohne "
+#~ "Anführungszeichen) hinzu, um das Runlevel 3 festzulegen "
+
+#~ msgid "The file should then look like this:"
+#~ msgstr "Der Dateiinhalt sollte dann folgendermaßen aussehen:"
+
+#~ msgid ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+#~ msgstr ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+
+#~ msgid ""
+#~ "When adding such a workstation in GOsa², use an IP address matching the "
+#~ "LTSP server interface IP address on the thin client net (by default "
+#~ "192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
+#~ msgstr ""
+#~ "Definieren Sie eine IP-Adresse, die zur IP-Adresse der "
+#~ "Netzwerkschnittstelle des LTSP-Servers im Thin-Client-Netzwerk passt, "
+#~ "wenn Sie solch einen Arbeitsplatzrechner in GOsa² hinzufügen. "
+#~ "Standardmäßig hat dort der LTSP-Server die IP 192.168.0.254; der "
+#~ "dynamische DHCP-Bereich beginnt mit 192.168.0.20."
+
+#~ msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+#~ msgstr "Graphische Arbeitsumgebungen KDE »Plasma« 4.8.4 und GNOME 3.4"
+
+#~ msgid "FIXME: to be documented, if any"
+#~ msgstr "FIXME: to be documented, if any"
+
+#~ msgid ""
+#~ "Translation updates for the templates used in the installer. These "
+#~ "templates are now available in FIXME languages."
+#~ msgstr ""
+#~ "Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. "
+#~ "Diese liegen nun für FIXME Sprachen vor."
+
+#~ msgid ""
#~ "Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released "
#~ "2013-0?-??"
#~ msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 7649bf4..28ad9aa 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -119,8 +119,8 @@ msgstr ""
#| "default desktop setup, which can be extended easily and almost endlessly "
#| "via the Debian universe."
msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+"Several educational applications like celestia, drgeo, gcompris, kalzium, "
+"kgeography, solfege and scratch are included in the default desktop setup, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
"Múltiples aplicaciones educativas como : drgeo, gcompris, geogebra, kalzium, "
@@ -280,10 +280,16 @@ msgstr ""
"sin disco, prueba de memoria o iniciar desde disco local. "
#. 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 next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
"Esto está diseñado para ser modificado - es decir, usted puede tener la raíz "
"en NFS en el punto syslinux a uno de los servidores LTSP o cambiar al "
@@ -452,7 +458,9 @@ msgid "Electronic Post Office"
msgstr "Oficina de Correo Electrónico"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+#, fuzzy
+#| msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr "IMAP/POP (Dovecot)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -610,8 +618,7 @@ msgid ""
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Por defecto, el correo está configurado para envío local (dentro de la "
"escuela), aunque se puede configurar el envío a todo Internet si la escuela "
@@ -1318,7 +1325,7 @@ msgstr ""
#| "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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1360,12 +1367,20 @@ msgstr ""
"red."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"En estaciones de trabajo con poca memoria RAM, el corrector ortográfico de "
"OpenOffice.org puede causar que se cuelgue, ya que el espacio para "
@@ -1462,14 +1477,18 @@ msgid "You need exactly one main server, the tjener."
msgstr "necesitas exactamente, un servidor principal, el tjener"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 50 (diskless) workstations on the main network."
+#, 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 ""
"puedes tener hasta 50 estaciones de trabajo (sin disco) en la red principal."
#. 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 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."
msgstr "puedes tener hasta 20 servidores ltsp en la red principal"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1700,8 +1719,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1760,8 +1780,8 @@ msgstr ""
#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
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>"
+"<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>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1772,8 +1792,8 @@ msgstr ""
#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
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>"
+"<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>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1784,8 +1804,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
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>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -2468,6 +2488,15 @@ msgid ""
"server or as a thin client server to become usefull after the installation."
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
@@ -2815,8 +2844,8 @@ msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
#| "normal workstations or thin client servers."
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."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Esta opción permite iniciar a las estaciones sin disco y clientes delgados a "
"través de la red principal. Las estaciones sin disco deben de ser agregadas "
@@ -3489,7 +3518,7 @@ msgid ""
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -3518,6 +3547,10 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3643,6 +3676,12 @@ msgstr "Administración avanzada de usuarios."
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3836,13 +3875,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"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 "
+"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."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4784,17 +4822,11 @@ msgstr "el servicio LDAP necesita ser reparado"
#. type: Content of: <article><section><section><para>
msgid ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -5242,7 +5274,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -5255,7 +5287,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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 "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
@@ -5281,22 +5313,39 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"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"
msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Backports are automatically updated (if available) just like other packages. "
+"(Previously, extra configuration was needed to achieve this, but since 2011 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -5984,6 +6033,14 @@ msgstr ""
"sin necesidad de instalaciones en los clientes. Los directorios home y las "
"configuraciones de sistema son guardadas en el servidor."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -6045,30 +6102,37 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Machine type selection based on the network"
-msgstr ""
-"<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
-"indicaciones básicas:"
+#| msgid "Select type of installation"
+msgid "LTSP client type selection"
+msgstr "Seleccione el tipo de instalación"
#. type: Content of: <article><section><section><section><para>
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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"La configuración de red en los clientes se hace \"automáticamente\" con "
-"DHCP. Los clientes normales reciben direcciones IP en el rango privado "
-"10.0.2.0/23, y los clientes ligeros se conectan a su servidor de clientes "
-"ligeros via la subred separada 192.168.0.0/24 (esto asegura que el tráfico "
-"de los clientes ligeros no interfiere con el resto de los servicios de red)."
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -6207,44 +6271,6 @@ msgid ""
"com/wiki/index.php/PXELINUX\"/> ."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr "El archivo debería verse como esto:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
#, fuzzy
msgid "Separate main- and LTSP servers"
@@ -8292,7 +8318,7 @@ msgstr ""
msgid "Installation changes"
msgstr "Cambios en la instalación"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "Further information can be found in the <ulink url=\"http://www.debian."
@@ -8311,7 +8337,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8321,7 +8347,9 @@ msgid "Linux kernel 3.2.x"
msgstr "Versión del kernel linux 2.6.18"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+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.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8333,6 +8361,18 @@ msgid "LibreOffice 3.5.4"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr ""
@@ -8353,9 +8393,11 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Debian Wheezy includes about 37000 packages available for installation."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8377,23 +8419,13 @@ msgstr ""
"installmanual\">manual de instalación</ulink>."
#. type: Content of: <article><section><section><section><title>
-#, fuzzy
-#| msgid "Installation"
-msgid "Infrastructural changes"
-msgstr "Instalación"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr "Actualizaciones en documentación y traducciones"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8404,11 +8436,16 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr ""
+#, fuzzy
+#| msgid "package on"
+msgid "LDAP related changes"
+msgstr "paquete en"
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -8417,6 +8454,29 @@ msgstr ""
msgid "Other changes"
msgstr "paquete en"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright y authores"
@@ -8433,8 +8493,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Esto documento ha sido escrito con copyright de Holger Levsen, Petter "
"Reinholdtsen, Daniel Heß and Patrick Winnertz 2007 y distribuido bajo la "
@@ -8536,8 +8596,8 @@ msgstr "Traducciones de este documento"
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."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Todavía no están disponibles traducciones de este documento, puesto que el "
"propio documento está incompleto. Hay traducciones incompletas para noruego "
@@ -9566,6 +9626,12 @@ msgstr ""
"publicación</ulink> y el <ulink url=\"http://www.debian.org/releases/squeeze/"
"installmanual\">manual de instalación</ulink>."
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Installation"
+msgid "Infrastructural changes"
+msgstr "Instalación"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid "The 10.0.0.0/8 network is now used instead of 10.0.2.0/23."
@@ -9661,12 +9727,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -9844,6 +9904,10 @@ msgstr ""
"El fuente del paquete <computeroutput>debian-edu-doc</computeroutput>incluye "
"esta imagen como un archivo <computeroutput>dia</computeroutput>."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -10568,6 +10632,28 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~ msgid "Machine type selection based on the network"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
+#~ "indicaciones básicas:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "La configuración de red en los clientes se hace \"automáticamente\" con "
+#~ "DHCP. Los clientes normales reciben direcciones IP en el rango privado "
+#~ "10.0.2.0/23, y los clientes ligeros se conectan a su servidor de clientes "
+#~ "ligeros via la subred separada 192.168.0.0/24 (esto asegura que el "
+#~ "tráfico de los clientes ligeros no interfiere con el resto de los "
+#~ "servicios de red)."
+
+#~ msgid "The file should then look like this:"
+#~ msgstr "El archivo debería verse como esto:"
+
+#, fuzzy
#~| msgid ""
#~| "New in Debian Edu 6.0.3 beta2 Codename \"Squeeze\" released 2012-01-07"
#~ msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index c6e699c..6978179 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2013-01-20 22:51+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -102,9 +102,15 @@ msgstr ""
"travail sans disque telles que les clients légers."
#. type: Content of: <article><section><para>
-msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+#, 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, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
"Plusieurs applications éducatives telles que celestia, drgeo, gcompris, "
@@ -257,10 +263,16 @@ msgstr ""
"de travail sans disque, exécuter memtest, ou démarrer du disque dur local."
#. 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 next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
"C'est conçu pour être modifié — c'est-à-dire que vous pouvez faire pointer "
"la racine NFS de syslinux sur un des serveurs LTSP ou modifier le serveur "
@@ -428,7 +440,9 @@ msgid "Electronic Post Office"
msgstr "Courrier électronique"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+#, fuzzy
+#| msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr "IMAP/POP3 (Dovecot)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -571,14 +585,22 @@ msgstr ""
"SMB pour les clients Windows et Macintosh."
#. 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 "
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Par défaut, le courrier électronique est configuré pour ne délivrer les "
"messages que localement (c'est-à-dire à l'intérieur de l'école), bien qu'il "
@@ -1131,8 +1153,13 @@ msgstr ""
"minimum."
#. 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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1164,12 +1191,20 @@ msgstr ""
"réseau."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"Sur les stations de travail avec peu de mémoire vive, le correcteur "
"orthographique peut faire planter OpenOffice.org si la taille du fichier "
@@ -1247,13 +1282,19 @@ msgid "You need exactly one main server, the tjener."
msgstr "Vous avez besoin d'exactement un serveur principal, tjener."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 50 (diskless) workstations on the main network."
+#, 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 ""
"Vous pouvez avoir jusqu'à 50 stations de travail (sans disque) sur le réseau "
"principal."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 20 LTSP servers on the main network."
+#, 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."
msgstr "Vous pouvez avoir jusqu'à 20 serveurs LTSP sur le réseau principal."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1418,9 +1459,14 @@ msgstr ""
"utilisant FTP, HTTP ou rsync :"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: these download URLs need to be adapted for wheezy still... They "
+#| "currently don't work"
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
"FIXME: these download URLs need to be adapted for wheezy still... They "
"currently don't work"
@@ -1462,25 +1508,37 @@ msgstr ""
"machines i386 et amd64 est disponible :"
#. 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/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.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.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.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.0.0+r0-"
-"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-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>"
@@ -2009,6 +2067,15 @@ msgstr ""
"dans la machine qui sera configurée comme serveur principal combiné et comme "
"serveur de clients légers pour pouvoir l'utiliser après l'installation."
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2295,10 +2362,15 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
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. Diskless workstations must be added with GOsa² just "
-"like normal workstations or thin client servers."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Cette configuration permet également d'amorcer des stations de travail sans "
"disque et des clients légers à partir du réseau principal. Les stations de "
@@ -2900,12 +2972,26 @@ msgstr ""
"identifiants invalides si le nom complet comprend des caractères non ASCII."
#. 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 "
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -2956,6 +3042,10 @@ msgstr ""
"dans le coin inférieur droit."
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3085,6 +3175,12 @@ msgstr "Gestion avancée des utilisateurs"
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3287,14 +3383,22 @@ msgstr ""
"\"Architecture\">Architecture</link> de ce manuel."
#. 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. (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."
+"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 "
+"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."
msgstr ""
"Pour ajouter une machine, utilisez le menu principal de GOsa², Systèmes, "
"Créer (choisissez « Périphérique réseau », mais pas « Serveur » car vous "
@@ -4357,19 +4461,20 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Le service LDAP doit être reconfiguré"
#. type: Content of: <article><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 ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
"La configuration LDAP a beaucoup changé entre Lenny et Squeeze. La façon "
"dont les comptes des utilisateurs, les mots de passe, les paramètres réseau, "
@@ -4848,7 +4953,9 @@ msgstr ""
"de passe dans Kerberos. Il est surtout utile pour des tests."
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+#, fuzzy
+#| msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr "Utiliser stable-updates (anciennement appelé volatile)"
#. type: Content of: <article><section><section><para>
@@ -4862,9 +4969,14 @@ msgstr ""
"paquets qui étaient auparavant maintenus sur volatile.debian.org."
#. 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 pointreleases are "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
"Bien que vous puissiez utiliser les dépôts stable-updates directement, vous "
@@ -4907,13 +5019,18 @@ msgstr ""
"utiliser tous ceux qui sont disponibles.</emphasis>"
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+#, fuzzy
+#| msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr "Utiliser backport.debian.org est simple :"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
-"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"
msgstr ""
"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
@@ -4921,10 +5038,28 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+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 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
msgstr ""
"Auparavant, la mise à jour automatique des paquets rétroportés nécessitait "
"une étape supplémentaire de configuration. Grâce à la <ulink url=\"http://"
@@ -4932,6 +5067,12 @@ msgstr ""
"sloppy_started/\">suite squeeze-backports</ulink> depuis 2011, cette étape "
"est maintenant inutile."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Upgrading with a CD or DVD ROM"
msgstr "Mettre à jour avec un CD ou DVD"
@@ -5775,6 +5916,14 @@ msgstr ""
"façon de réutiliser du matériel plus récent avec le même coût réduit de "
"maintenance que les clients légers."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -5851,14 +6000,22 @@ msgstr ""
"computeroutput> après l'installation."
#. type: Content of: <article><section><section><section><title>
-msgid "Machine type selection based on the network"
-msgstr "Sélection du type de machine en fonction du réseau"
+#, fuzzy
+#| msgid "Select type of installation"
+msgid "LTSP client type selection"
+msgstr "Choisir un type d'installation"
#. 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 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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
"Chaque serveur LTSP possède deux cartes réseau, une est configurée dans le "
"sous-réseau 10.0.0.0/8 (partagé avec le serveur principal), et l'autre forme "
@@ -5867,13 +6024,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"Les stations de travail sans disque dur reçoivent une adresse IP appartenant "
-"au sous-réseau privé 10.0.0.0/8, tandis que les clients légers sont "
-"connectés à leur serveur de clients légers sur le sous-réseau 192.168.0.0/24."
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -6048,58 +6215,6 @@ msgstr ""
"Consultez aussi la documentation de PXELINUX à <ulink url=\"http://syslinux."
"zytor.com/wiki/index.php/PXELINUX\"/>."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-"Si les clients sur l'interface 192.168.x.x d'un serveur de clients légers "
-"doivent être amorcés comme des stations de travail sans disque dur plutôt "
-"que comme des clients légers, modifiez"
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-"et ajoutez un « 3 » (sans guillemets) à la fin de la ligne des paramètres du "
-"noyau pour préciser le niveau d'exécution numéro 3."
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr "Le fichier devrait alors ressembler à ceci :"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-"Lorsque vous ajoutez une telle station de travail dans GOsa², utilisez une "
-"adresse IP correspondant à l'adresse IP de l'interface du serveur LTSP sur "
-"le réseau de clients légers (par défaut 192.168.0.254, l'intervalle de DHCP "
-"dynamique commençant à 192.168.0.20)."
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr "Séparer le serveur principal du serveur LTSP"
@@ -8658,7 +8773,7 @@ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
msgid "Installation changes"
msgstr "Changements dans l'installation"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -8673,7 +8788,9 @@ msgid "Software updates"
msgstr "Mises à jour des logiciels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr "Toutes les nouveautés de Debian « Wheezy » :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8681,8 +8798,10 @@ msgid "Linux kernel 3.2.x"
msgstr "Noyau Linux version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
-msgstr "Environnements de bureau KDE « Plasma » 4.8.4 et GNOME 3.4"
+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.)"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Web browser Iceweasel 10 ESR"
@@ -8693,6 +8812,18 @@ msgid "LibreOffice 3.5.4"
msgstr "LibreOffice 3.5.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr "Boîte à outils éducative GCompris 12.01"
@@ -8713,9 +8844,15 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr "Planétarium virtuel Stellarium 0.11.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+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 contient plus de 10 000 nouveaux paquets prêts à être "
"installés, dont le navigateur Chromium."
@@ -8733,24 +8870,16 @@ msgstr ""
"wheezy/installmanual\">manuel d'installation</ulink>."
#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Changements d'infrastructure"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr "FIXME: to be documented, if any"
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr "Mises à jour des documentations et des traductions"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
-"Ces chaînes sont maintenant disponibles en FIXME langues."
+"Ces chaînes sont maintenant disponibles en 28 langues."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8763,22 +8892,64 @@ msgstr ""
"et norvégien Bokmål."
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Régressions"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#, fuzzy
+#| msgid "Other LDAP related changes"
+msgid "LDAP related changes"
msgstr "Autres changements liés à LDAP"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr "Autres changements"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr "Régressions"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Droits d'auteur et auteurs"
#. 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, "
@@ -8789,8 +8960,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Ce document a été écrit (droits d'auteur) par Holger Levsen (2007, 2008, "
"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001, 2002, 2003, 2004, "
@@ -8901,11 +9072,17 @@ msgid "Translations of this document"
msgstr "Traductions de ce document"
#. 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 "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Des versions complètement traduites de ce document sont disponibles en "
"allemand, italien, français et danois. Des versions incomplètes en norvégien "
@@ -10218,6 +10395,10 @@ msgstr ""
"\">notes de publication</ulink> et le <ulink url=\"http://www.debian.org/"
"releases/squeeze/installmanual\">manuel d'installation</ulink>."
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Changements d'infrastructure"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -10314,14 +10495,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
-"Ces chaînes sont maintenant disponibles en 28 langues."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10531,6 +10704,10 @@ msgstr ""
"installé par défaut (à la place de <computeroutput>rdesktop</"
"computeroutput>)."
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Autres changements liés à LDAP"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -11195,6 +11372,81 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+#~ msgstr ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#~ msgid "Machine type selection based on the network"
+#~ msgstr "Sélection du type de machine en fonction du réseau"
+
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "Les stations de travail sans disque dur reçoivent une adresse IP "
+#~ "appartenant au sous-réseau privé 10.0.0.0/8, tandis que les clients "
+#~ "légers sont connectés à leur serveur de clients légers sur le sous-réseau "
+#~ "192.168.0.0/24."
+
+#~ msgid ""
+#~ "If clients on the 192.168.x.x interface of a thin client server should "
+#~ "boot as diskless workstations instead of thin clients, edit"
+#~ msgstr ""
+#~ "Si les clients sur l'interface 192.168.x.x d'un serveur de clients légers "
+#~ "doivent être amorcés comme des stations de travail sans disque dur plutôt "
+#~ "que comme des clients légers, modifiez"
+
+#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+#~ msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+
+#~ msgid ""
+#~ "and add a '3' (no quotes) to the end of the kernel argument line, to "
+#~ "specify runlevel 3."
+#~ msgstr ""
+#~ "et ajoutez un « 3 » (sans guillemets) à la fin de la ligne des paramètres "
+#~ "du noyau pour préciser le niveau d'exécution numéro 3."
+
+#~ msgid "The file should then look like this:"
+#~ msgstr "Le fichier devrait alors ressembler à ceci :"
+
+#~ msgid ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+#~ msgstr ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+
+#~ msgid ""
+#~ "When adding such a workstation in GOsa², use an IP address matching the "
+#~ "LTSP server interface IP address on the thin client net (by default "
+#~ "192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
+#~ msgstr ""
+#~ "Lorsque vous ajoutez une telle station de travail dans GOsa², utilisez "
+#~ "une adresse IP correspondant à l'adresse IP de l'interface du serveur "
+#~ "LTSP sur le réseau de clients légers (par défaut 192.168.0.254, "
+#~ "l'intervalle de DHCP dynamique commençant à 192.168.0.20)."
+
+#~ msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+#~ msgstr "Environnements de bureau KDE « Plasma » 4.8.4 et GNOME 3.4"
+
+#~ msgid "FIXME: to be documented, if any"
+#~ msgstr "FIXME: to be documented, if any"
+
+#~ msgid ""
+#~ "Translation updates for the templates used in the installer. These "
+#~ "templates are now available in FIXME languages."
+#~ msgstr ""
+#~ "Mise à jour des traduction pour les chaînes utilisées dans "
+#~ "l'installateur. Ces chaînes sont maintenant disponibles en FIXME langues."
+
+#~ msgid ""
#~ "Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released "
#~ "2013-0?-??"
#~ msgstr ""
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 0163357..99b1f39 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2013-01-23 19:02+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -102,9 +102,15 @@ msgstr ""
"per macchine senza disco come i tradizionali thin-clients."
#. type: Content of: <article><section><para>
-msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+#, 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, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
"Diverse applicazioni didattiche come celestia, drgeo, gcompris, geogebra, "
@@ -252,10 +258,16 @@ msgstr ""
"workstation, eseguire memtest, o avviare dall'hard disk locale."
#. 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 next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
"Questo naturalmente può essere modificato, cioè si può avere la NFS-root in "
"syslinux che punta ad un server ltsp o si può cambiare il next-server in "
@@ -420,7 +432,9 @@ msgid "Electronic Post Office"
msgstr "Electronic Post Office"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+#, fuzzy
+#| msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr "IMAP/POP3 (Dovecot)"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -563,14 +577,22 @@ msgstr ""
"Macintosh."
#. 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 "
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Di default le email sono impostate solo per la posta locale (cioè "
"all'interno della scuola), sebbene la spedizione di email attraverso "
@@ -1104,8 +1126,13 @@ msgstr ""
"MiB RAM come minimo."
#. 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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1135,12 +1162,20 @@ msgstr ""
"memoria di swap in quanto più veloce dello swapping di rete."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"Sulle workstation con poca memoria il correttore ortografico di OpenOffice."
"org funziona male se la swap è troppo piccola. In questo caso "
@@ -1215,12 +1250,18 @@ msgid "You need exactly one main server, the tjener."
msgstr "Occorre avere un solo server principale, tjener"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 50 (diskless) workstations on the main network."
+#, 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 ""
"Si possono avere fino a 50 (diskless) workstation sulla rete principale"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "You can have up to 20 LTSP servers on the main network."
+#, 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."
msgstr "Si possono avere fino a 20 server LTSP sulla rete principale"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1381,9 +1422,14 @@ msgstr ""
"FTP, HTTP o rsync:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: these download URLs need to be adapted for wheezy still... They "
+#| "currently don't work"
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
"FIXME: these download URLs need to be adapted for wheezy still... They "
"currently don't work"
@@ -1425,25 +1471,37 @@ msgstr ""
"disponibile a "
#. 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/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.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.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.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-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>"
#. 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.0.0+r0-"
-"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-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>"
@@ -1966,6 +2024,15 @@ msgstr ""
"macchina che funzionerà da server combinato o come server thin client, che "
"saranno utili dopo l'installazione. "
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -2241,10 +2308,15 @@ msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
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. Diskless workstations must be added with GOsa² just "
-"like normal workstations or thin client servers."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Questa configurazione permette anche di avviare diskless workstation e thin "
"client sulla rete principale. Le diskless workstation devono essere aggiunte "
@@ -2838,12 +2910,26 @@ msgstr ""
"se il nome completocontiene caratteri non ASCII."
#. 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 "
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -2893,6 +2979,10 @@ msgstr ""
"password due volte, quindi fare clic su \"Set password\" in basso a destra."
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3019,6 +3109,12 @@ msgstr "Gestione avanzata degli utenti"
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3218,14 +3314,22 @@ msgstr ""
"link> di questo manuale."
#. type: Content of: <article><section><section><para>
-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."
+#, 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 "
+"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."
msgstr ""
"Per aggiungere una macchina, usare il menu principale di GOsa², systems, "
"add. (Scegliere netdevice, non server che vi lascerà con un oggetto di "
@@ -4263,19 +4367,20 @@ msgid "LDAP service needs to be reconfigured"
msgstr "Il servizio LDAP ha bisogno di essere riconfigurato"
#. type: Content of: <article><section><section><para>
-msgid ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-
-#. type: Content of: <article><section><section><para>
-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."
+#, 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-"
+"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."
msgstr ""
"La configurazione di LDAP è molto cambiata da Lenny a Squeeze. Il modo di "
"trattare gli acconti utenti, le password, la configurazione di rete, i "
@@ -4739,7 +4844,9 @@ msgstr ""
"kerberos. E' molto utile per i test."
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+#, fuzzy
+#| msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr "Usare stable-updates (precedentemente conosciuto come volatile)"
#. type: Content of: <article><section><section><para>
@@ -4753,9 +4860,14 @@ msgstr ""
"wiki.debian.org/StableUpdates\">stable-updates suite</ulink>."
#. 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 pointreleases are "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
"Sebbene sia possibile utilizzare direttamente stable-updates, non c'è da "
@@ -4795,13 +4907,18 @@ msgstr ""
"emphasis>"
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+#, fuzzy
+#| msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr "Usare backports.debian.org è semplice:"
#. type: CDATA
-#, no-wrap
+#, 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"
msgid ""
-"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"
msgstr ""
"echo \"deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free\" >> /etc/apt/sources.list\n"
@@ -4809,10 +4926,28 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+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 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
msgstr ""
"Precedentemente, configurazioni extra erano necessarie per avere "
"aggiornamenti installati automaticamente per backport, ma dal 2011 la <ulink "
@@ -4820,6 +4955,12 @@ msgstr ""
"sloppy_started/\">nuova suite squeeze-backports</ulink> rende questo non "
"necessario."
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
+msgstr ""
+
#. type: Content of: <article><section><section><title>
msgid "Upgrading with a CD or DVD ROM"
msgstr "Aggiornamento da CD o DVD"
@@ -5642,6 +5783,14 @@ msgstr ""
"riusare hardware più nuovo con gli stessi bassi costi di manutenzione dei "
"thin clients."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -5716,14 +5865,22 @@ msgstr ""
"dopo l'installazione."
#. type: Content of: <article><section><section><section><title>
-msgid "Machine type selection based on the network"
-msgstr "Selezione del tipo di macchina basata sulla rete"
+#, fuzzy
+#| msgid "Select type of installation"
+msgid "LTSP client type selection"
+msgstr "Selezionare il tipo d'installazione"
#. 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 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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
"Ogni server LTSP ha due schede di rete ethernet, una è configurata nella "
"sottorete 10.0.0.0/8 (condivisa con il server principale) e l'altra che "
@@ -5732,13 +5889,23 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"Le Diskless workstation hanno indirizzi IP della rete privata 10.0.0.0/8, "
-"mentre i thin-client sono connessi al loro thin-client-server con una "
-"sottorete separata 192.168.0.0/24"
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -5909,57 +6076,6 @@ msgstr ""
"Vedi anche la documentazione PXELINUX a<ulink url=\"http://syslinux.zytor."
"com/wiki/index.php/PXELINUX\"/> ."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-"Se si vuole che i client sulla scheda 192.168.x.x di un server thin client "
-"server facciano il boot come diskless workstations invece che thin client, "
-"modificare"
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-"e aggiungere un '3' (senza virgolette) alla fine della linea che ha come "
-"argomento il kernel e specificare runlevel 3."
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr "Il file dovrebbe assomigliare a questo:"
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-"Quando si aggiunge una workstation in Gosa², utilizzare un indirizzo IP che "
-"appartenga alla rete gestita dal server LTSP (di default 192.168.0.254, "
-"l'intervallo del dhcp dinamico inizia da 192.168.0.20)."
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr "Separare il server principale e i server LTSP"
@@ -8459,7 +8575,7 @@ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
msgid "Installation changes"
msgstr "Cambiamenti nell'installazione"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -8474,7 +8590,9 @@ msgid "Software updates"
msgstr "Aggiornamenti software"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr "Tutto ciò che è nuovo in Debian Wheezy"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8482,8 +8600,10 @@ msgid "Linux kernel 3.2.x"
msgstr "Linux kernel 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
-msgstr "Ambienti di desktop KDE \"Plasma\" 4.8.4 e GNOME 3.4"
+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.)"
+msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Web browser Iceweasel 10 ESR"
@@ -8494,6 +8614,18 @@ msgid "LibreOffice 3.5.4"
msgstr "LibreOffice 3.5.4"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr "Software educativo GCompris 12.01"
@@ -8514,9 +8646,15 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr "Virtual stargazer Stellarium 0.11.3"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+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 include più di 10,000 nuovi pacchetti disponibili per "
"l'installazione, compreso il browser Chromium"
@@ -8534,24 +8672,16 @@ msgstr ""
"\">installation manual</ulink>."
#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr "Modifiche infrastrutturali"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr "FIXME: to be documented, if any"
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr "Aggiornamenti della documentazione e delle traduzioni"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
"Aggionate le traduzioni per i template usati dall'installer. Questi template "
-"sono disponibili in FIXME lingue."
+"sono disponibili in 28 lingue."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -8564,22 +8694,64 @@ msgstr ""
"Bokmal e spagnolo."
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
-msgstr "Regressioni"
-
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#, fuzzy
+#| msgid "Other LDAP related changes"
+msgid "LDAP related changes"
msgstr "Altre modifiche relative a LDAP"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
+msgstr ""
+
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr "Altre modifiche"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr "Regressioni"
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright e autori"
#. 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, "
@@ -8590,8 +8762,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Questo documento è scritto e sotto copyright da Holger Levsen (2007, 2008, "
"2009, 2010, 2011, 2012, 2013), Petter Reinholdtsen (2001,2002, 2003, 2004, "
@@ -8699,11 +8871,17 @@ msgid "Translations of this document"
msgstr "Traduzioni di questo documento"
#. 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 "
-"Spanish; <ulink url=\"http://maintainer.skolelinux.org/debian-edu-doc/"
-"\">take a look here</ulink> for your own language."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Esistono traduzioni complete di questo documento in Tedesco, Italiano, "
"Francese e Danese. Esistono traduzioni incomplete in Norvegese Bokmål e "
@@ -9990,6 +10168,10 @@ msgstr ""
"ulink> e nell'<ulink url=\"http://www.debian.org/releases/squeeze/"
"installmanual\">installation manual</ulink>."
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr "Modifiche infrastrutturali"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -10081,14 +10263,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-"Aggionate le traduzioni per i template usati dall'installer. Questi template "
-"sono disponibili in 28 lingue."
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10294,6 +10468,10 @@ msgstr ""
"client RDP e VNC. (Precedentemente era invece <computeroutput>rdesktop</"
"computeroutput>.)"
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr "Altre modifiche relative a LDAP"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -10936,6 +11114,79 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+#~ msgstr ""
+#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
+
+#~ msgid "Machine type selection based on the network"
+#~ msgstr "Selezione del tipo di macchina basata sulla rete"
+
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "Le Diskless workstation hanno indirizzi IP della rete privata 10.0.0.0/8, "
+#~ "mentre i thin-client sono connessi al loro thin-client-server con una "
+#~ "sottorete separata 192.168.0.0/24"
+
+#~ msgid ""
+#~ "If clients on the 192.168.x.x interface of a thin client server should "
+#~ "boot as diskless workstations instead of thin clients, edit"
+#~ msgstr ""
+#~ "Se si vuole che i client sulla scheda 192.168.x.x di un server thin "
+#~ "client server facciano il boot come diskless workstations invece che thin "
+#~ "client, modificare"
+
+#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+#~ msgstr "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+
+#~ msgid ""
+#~ "and add a '3' (no quotes) to the end of the kernel argument line, to "
+#~ "specify runlevel 3."
+#~ msgstr ""
+#~ "e aggiungere un '3' (senza virgolette) alla fine della linea che ha come "
+#~ "argomento il kernel e specificare runlevel 3."
+
+#~ msgid "The file should then look like this:"
+#~ msgstr "Il file dovrebbe assomigliare a questo:"
+
+#~ msgid ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+#~ msgstr ""
+#~ "default ltsp\n"
+#~ "\n"
+#~ "label ltsp\n"
+#~ "kernel vmlinuz\n"
+#~ "append ro initrd=initrd.img boot=nfs quiet 3"
+
+#~ msgid ""
+#~ "When adding such a workstation in GOsa², use an IP address matching the "
+#~ "LTSP server interface IP address on the thin client net (by default "
+#~ "192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
+#~ msgstr ""
+#~ "Quando si aggiunge una workstation in Gosa², utilizzare un indirizzo IP "
+#~ "che appartenga alla rete gestita dal server LTSP (di default "
+#~ "192.168.0.254, l'intervallo del dhcp dinamico inizia da 192.168.0.20)."
+
+#~ msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+#~ msgstr "Ambienti di desktop KDE \"Plasma\" 4.8.4 e GNOME 3.4"
+
+#~ msgid "FIXME: to be documented, if any"
+#~ msgstr "FIXME: to be documented, if any"
+
+#~ msgid ""
+#~ "Translation updates for the templates used in the installer. These "
+#~ "templates are now available in FIXME languages."
+#~ msgstr ""
+#~ "Aggionate le traduzioni per i template usati dall'installer. Questi "
+#~ "template sono disponibili in FIXME lingue."
+
+#~ msgid ""
#~ "Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released "
#~ "2013-0?-??"
#~ msgstr ""
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 f72b6f3..c38cfc3 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -95,8 +95,8 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+"Several educational applications like celestia, drgeo, gcompris, kalzium, "
+"kgeography, solfege and scratch are included in the default desktop setup, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
@@ -259,8 +259,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -463,7 +464,7 @@ msgid "Electronic Post Office"
msgstr "Elektronisk postkontor"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr ""
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -628,8 +629,7 @@ msgid ""
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
"Som standard er e-post satt opp med bare lokal leveranse (f.eks. innen "
"skolen). Men e-postlevering for resten av nettet kan settes opp dersom "
@@ -1315,7 +1315,7 @@ msgstr ""
#| "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, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -1355,12 +1355,20 @@ msgstr ""
"for lokal swap da dette er raskere enn nettverks-swap."
#. 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 "
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
"På arbeidsstasjoner med lite minne (RAM), kan stavekontrollen i OpenOffice."
"org føre til at klienten henger hvis vekselminnet (swap) er for lite. I "
@@ -1458,13 +1466,15 @@ 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 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 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."
msgstr "man kan ha opp til 20 ltsp-tjenere på hovednettverket"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1664,8 +1674,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1712,8 +1723,8 @@ msgstr ""
#. 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>"
+"<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>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1721,8 +1732,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.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.0+edu0~a0-"
+"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1730,8 +1741,8 @@ msgstr ""
#. 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>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -2344,6 +2355,15 @@ msgid ""
"server or as a thin client server to become usefull after the installation."
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
@@ -2664,8 +2684,8 @@ msgstr ""
#| "normal workstations or thin client servers."
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."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
"Dette oppsettet gjør at man også kan starte diskløse arbeidsstasjoener og "
"tynnklienter på hovednettet. Diskløse arbeidsstasjoener må legges til i LWAT "
@@ -3330,7 +3350,7 @@ msgid ""
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -3359,6 +3379,10 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -3485,6 +3509,12 @@ msgstr "Avansert brukerhåndtering"
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -3669,13 +3699,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"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 "
+"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."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4803,17 +4832,11 @@ msgstr "LDAP-tjenesten trenger å bli reparert"
#. type: Content of: <article><section><section><para>
msgid ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -5284,7 +5307,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -5297,7 +5320,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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 "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
@@ -5338,22 +5361,39 @@ msgstr ""
#. type: Content of: <article><section><section><para>
#, fuzzy
-msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr "Bruk av backports.org"
#. 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"
+"echo \"deb http://ftp.debian.org/debian/ wheezy-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
msgstr "deb http://ftp.debian.org/debian/ squeeze main contrib non-free"
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Backports are automatically updated (if available) just like other packages. "
+"(Previously, extra configuration was needed to achieve this, but since 2011 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -6241,6 +6281,14 @@ msgstr ""
"maskinvare med det samme lave vedlikeholdsbehovet som tynne klienter. "
"Hjemmeområder og systeminnstillinger lagres også på serveren."
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -6298,8 +6346,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-msgid "Machine type selection based on the network"
-msgstr "<emphasis role='strong'>rolle</emphasis>"
+#| msgid "Select type of installation"
+msgid "LTSP client type selection"
+msgstr "Velg type installasjon"
#. type: Content of: <article><section><section><section><para>
#, fuzzy
@@ -6309,27 +6358,34 @@ msgstr "<emphasis role='strong'>rolle</emphasis>"
#| "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 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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
"Hver LTSP-server har 2 ethernetkort. En er satt opp på 10.0.2.0/23 subnettet "
"(som er delt med hovedserveren) og det andre lager et lokalt 192.168.0..0/24 "
"subnett (dette subnettet er et separat subnett for hver LTSP-server)."
#. type: Content of: <article><section><section><section><para>
-#, fuzzy
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
-"Nettverksoppsett på klienter blir gjort automatisk ved hjelp av DHCP. "
-"Vanlige klienter blir gitt IP-adresser i det private undernettet "
-"10.0.2.0/23, mens tynnklienter kopler til den tilhørende tynnklienttjeneren "
-"via et eget undernett 192.168.0.0/24 (dette er for å sikre at "
-"nettverkstrafikk til og fra tynnklienter ikke forstyrrer resten av "
-"nettverkstjenestene)."
#. type: Content of: <article><section><section><title>
msgid "Configuring the PXE menu"
@@ -6517,44 +6573,6 @@ msgstr ""
"Se også pxelinux-dokumentasjonen hos <ulink url=\"http://syslinux.zytor.com/"
"wiki/index.php/PXELINUX\"/> ."
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-
-#. type: CDATA
-#, fuzzy, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr "Adskilte hoved- og LTSP-tjenere"
@@ -9236,7 +9254,7 @@ msgstr ""
msgid "Installation changes"
msgstr "Installasjon"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
@@ -9251,7 +9269,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9261,7 +9279,9 @@ msgid "Linux kernel 3.2.x"
msgstr "Linux kjerneversjon 2.6.18"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+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.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9273,6 +9293,18 @@ msgid "LibreOffice 3.5.4"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr ""
@@ -9293,9 +9325,11 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Debian Wheezy includes about 37000 packages available for installation."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9311,16 +9345,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><title>
#, fuzzy
-#| msgid "Installation"
-msgid "Infrastructural changes"
-msgstr "Installasjon"
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
-#, fuzzy
#| msgid "Documentation writers and translators"
msgid "Documentation and translation updates"
msgstr "Dokumentasjonskrivere og oversettere"
@@ -9328,7 +9352,7 @@ msgstr "Dokumentasjonskrivere og oversettere"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9339,17 +9363,43 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+msgid "LDAP related changes"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Opphavsrett og forfattere"
@@ -9366,8 +9416,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
"Dette dokumentet er skrevet av Holger Levsen, Petter Reinholdtsen, Daniel "
"Heß, Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten "
@@ -9472,8 +9522,8 @@ msgstr "Oversettelser av dette dokumentet"
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."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
"Ferdigoversatte versjoner av dette dokumentet er ikke tilgjengelig ennå. "
"Ufullstendige oversettelser for Norsk Bokmål, Spansk og Tysk eksisterer."
@@ -10746,6 +10796,12 @@ msgstr ""
"Mer informasjon kan man finne i <ulink url=\"http://www.debian.org/releases/"
"lenny/installmanual\"> manualen til Debian Installer</ulink>."
+#. type: Content of: <article><section><section><section><title>
+#, fuzzy
+#| msgid "Installation"
+msgid "Infrastructural changes"
+msgstr "Installasjon"
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -10823,12 +10879,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10990,6 +11040,10 @@ msgstr ""
"(Kildepakken <computeroutput>debian-edu-doc</computeroutput> inneholder "
"dette bildet som en <computeroutput>dia</computeroutput>-fil.)"
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
@@ -11631,6 +11685,27 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid "Machine type selection based on the network"
+#~ msgstr "<emphasis role='strong'>rolle</emphasis>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Diskless workstations get IP addresses assigned in the private subnet "
+#~ "10.0.0.0/8, while thin clients are connected in the separate subnet "
+#~ "192.168.0.0/24."
+#~ msgstr ""
+#~ "Nettverksoppsett på klienter blir gjort automatisk ved hjelp av DHCP. "
+#~ "Vanlige klienter blir gitt IP-adresser i det private undernettet "
+#~ "10.0.2.0/23, mens tynnklienter kopler til den tilhørende "
+#~ "tynnklienttjeneren via et eget undernett 192.168.0.0/24 (dette er for å "
+#~ "sikre at nettverkstrafikk til og fra tynnklienter ikke forstyrrer resten "
+#~ "av nettverkstjenestene)."
+
+#, fuzzy
+#~ msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
+#~ msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+
+#, fuzzy
#~ msgid ""
#~ "Changes for Debian Edu 6.0.6+r1 Codename \"Squeeze\" *UN*released "
#~ "2013-0?-??"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index a6ec9a4..f49e24a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-02-28 18:18-0400\n"
+"POT-Creation-Date: 2013-05-07 16:03-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -78,8 +78,8 @@ msgstr ""
#. type: Content of: <article><section><para>
msgid ""
-"Several educational applications like celestia, drgeo, gcompris, geogebra, "
-"kalzium, kgeography and solfege are included in the default desktop setup, "
+"Several educational applications like celestia, drgeo, gcompris, kalzium, "
+"kgeography, solfege and scratch are included in the default desktop setup, "
"which can be extended easily and almost endlessly via the Debian universe."
msgstr ""
@@ -186,8 +186,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
"This is designed to be modified - that is, you can have the NFS-root in "
-"syslinux point to one of the LTSP servers or change next-server in DHCP to "
-"have clients directly boot via PXE from the terminal server."
+"syslinux point to one of the LTSP servers or change the DHCP next-server "
+"option (stored in LDAP) to have clients directly boot via PXE from the "
+"terminal server."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -324,7 +325,7 @@ msgid "Electronic Post Office"
msgstr ""
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "IMAP/POP3 (Dovecot)"
+msgid "IMAP (Dovecot)"
msgstr ""
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -465,8 +466,7 @@ msgid ""
"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."
+"\"Users--Using_email\">access their personal mail</link> through IMAP."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -825,7 +825,7 @@ msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
-"For workstations, diskless workstations and standalone PCs, 800 MHz, 256 MiB "
+"For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB "
"RAM are minimum requirements, though 512 or 1024 MiB RAM will perform "
"considerably better. Just a faster CPU will speed things up."
msgstr ""
@@ -850,7 +850,7 @@ msgid ""
"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."
+"a 320 MiB RAM workstation solves this, and the spell checker runs smoothly."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -908,11 +908,13 @@ msgid "You need exactly one main server, the tjener."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-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 ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
-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."
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -1035,8 +1037,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: these download URLs need to be adapted for wheezy still... They "
-"currently don't work"
+"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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1069,20 +1072,20 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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>"
+"<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>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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>"
+"<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>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
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>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1468,6 +1471,15 @@ msgid ""
"server or as a thin client server to become usefull after the installation."
msgstr ""
+#. type: Content of: <article><section><section><section><para>
+msgid ""
+"The ordering of the network cards after installation can differ from the "
+"ordering during installation. The wanted ordering could be achieved by "
+"editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</"
+"computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is "
+"needed for the changes to take effect."
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Say \"yes\" or \"no\" to automatic partitioning. Be aware that saying \"yes"
@@ -1680,8 +1692,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
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."
+"on the main network. Unlike workstations, diskless workstations don't need "
+"to be added with GOsa² (but could be)."
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2141,7 +2153,7 @@ msgid ""
"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> "
+"<computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</computeroutput> "
"to <computeroutput>idGenerator=\"{%givenName[1]}{%sn[22]}{id!2}\"</"
"computeroutput> would generate the username <computeroutput>pmuster</"
"computeroutput> for a user \"Peter Muster\" and <computeroutput>pmuster01</"
@@ -2170,6 +2182,10 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><para>
+msgid "Some characters may not be allowed as part of the password."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
msgid ""
"If all went well, you can now see the new user in the user list table. You "
"should now be able to log in with that username on any Skolelinux machine "
@@ -2267,6 +2283,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
+"FIXME: this section is \"obsolete\" + non-working as the plugin feature is "
+"still missing."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para>
+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 "
@@ -2418,13 +2440,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"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 "
+"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."
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3164,17 +3185,11 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
-msgstr ""
-
-#. type: Content of: <article><section><section><para>
-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."
+"The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, "
+"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."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -3517,7 +3532,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Using stable-updates (formerly known an volatile)"
+msgid "Using stable-updates (formerly known as volatile)"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3530,7 +3545,7 @@ msgstr ""
#. type: Content of: <article><section><section><para>
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 "
+"are pushed into the stable suite regularily when stable point releases are "
"done, which roughly happens every two months."
msgstr ""
@@ -3556,22 +3571,39 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><para>
-msgid "Using backports.debian.org is simple:"
+msgid "Using backports is simple:"
msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"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"
msgstr ""
#. type: Content of: <article><section><section><para>
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."
+"After which one can install backported packages easily, the following "
+"command will install a backported version of <emphasis>tuxtype</emphasis>:"
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid "apt-get install -t wheezy-backports tuxtype"
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Backports are automatically updated (if available) just like other packages. "
+"(Previously, extra configuration was needed to achieve this, but since 2011 "
+"this [[<ulink url=\"http://backports.debian.org/news/squeeze-"
+"backports_and_lenny-backports-sloppy_started/|is\"/> not needed anymore]."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
+"Like the normal archive, backports has three sections: main, contrib and non-"
+"free."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -4175,6 +4207,14 @@ msgid ""
"with the same low maintenance cost as with thin clients."
msgstr ""
+#. type: Content of: <article><section><section><itemizedlist><listitem><para>
+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²."
+msgstr ""
+
#. type: Content of: <article><section><section><para>
msgid ""
"LTSP client boot will fail if the client's network card requires a non-free "
@@ -4225,21 +4265,35 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Machine type selection based on the network"
+msgid "LTSP client type selection"
msgstr ""
#. type: Content of: <article><section><section><section><para>
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)."
+"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 "
+"forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP "
+"server)."
msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"Diskless workstations get IP addresses assigned in the private subnet "
-"10.0.0.0/8, while thin clients are connected in the separate subnet "
-"192.168.0.0/24."
+"Using the default PXE menu, a machine could be started as diskless "
+"workstation or thin client in the main subnet 10.0.0.0/8. By default clients "
+"in the separate subnet 192.168.0.0/24 will run as diskless workstations if "
+"the amount of RAM is sufficient. If all clients in the subnet should run as "
+"thin clients, the following has to be done."
+msgstr ""
+
+#. type: CDATA
+#, no-wrap
+msgid ""
+"(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor\n"
+"and replace the line\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp quiet\"\n"
+"with\n"
+"CMDLINE_LINUX_DEFAULT=\"init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet\"\n"
+"(2)Execute 'ltsp-update-kernels'"
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -4364,44 +4418,6 @@ msgid ""
"com/wiki/index.php/PXELINUX\"/> ."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"If clients on the 192.168.x.x interface of a thin client server should boot "
-"as diskless workstations instead of thin clients, edit"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid "/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"and add a '3' (no quotes) to the end of the kernel argument line, to specify "
-"runlevel 3."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid "The file should then look like this:"
-msgstr ""
-
-#. type: CDATA
-#, no-wrap
-msgid ""
-"default ltsp\n"
-"\n"
-"label ltsp\n"
-"kernel vmlinuz\n"
-"append ro initrd=initrd.img boot=nfs quiet 3"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
-msgid ""
-"When adding such a workstation in GOsa², use an IP address matching the LTSP "
-"server interface IP address on the thin client net (by default "
-"192.168.0.254, dynamic dhcp range starting at 192.168.0.20)."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
msgid "Separate main- and LTSP servers"
msgstr ""
@@ -6235,7 +6251,7 @@ msgstr ""
msgid "Installation changes"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
"New version of debian-installer from Debian Wheezy, see <ulink url=\"http://"
"www.debian.org/releases/wheezy/installmanual\">installation manual</ulink> "
@@ -6247,7 +6263,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy:"
+msgid "Everything which is new in Debian Wheezy, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6255,7 +6271,9 @@ msgid "Linux kernel 3.2.x"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Desktop environments KDE \"Plasma\" 4.8.4 and GNOME 3.4"
+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.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6267,6 +6285,18 @@ msgid "LibreOffice 3.5.4"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "LTSP 5.4.2"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "GOsa 2.7.4"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "CUPS print system 1.5.3"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Educational toolbox GCompris 12.01"
msgstr ""
@@ -6287,9 +6317,11 @@ msgid "Virtual stargazer Stellarium 0.11.3"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid ""
-"Debian Wheezy includes over 10,000 new packages available for installation, "
-"including the Chromium browser"
+msgid "Scratch visual programming environment 1.4.0.6"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+msgid "Debian Wheezy includes about 37000 packages available for installation."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6301,21 +6333,13 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Infrastructural changes"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "FIXME: to be documented, if any"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><title>
msgid "Documentation and translation updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in FIXME languages."
+"are now available in 28 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6326,17 +6350,43 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><section><section><title>
-msgid "Regressions"
+msgid "LDAP related changes"
msgstr ""
-#. type: Content of: <article><section><section><section><title>
-msgid "Other LDAP related changes"
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"Slight changes to some objects and acls to have more types to choose from "
+"when adding systems in GOsa. Now systems can be of type server, workstation, "
+"printer, terminal or netdevice."
msgstr ""
#. type: Content of: <article><section><section><section><title>
msgid "Other changes"
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"LTSP clients start as diskless workstation / thin client can be configured "
+"via command line argument -- or individually adding an entry in lts.conf or "
+"LDAP."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"GOsa gui: Now some options that seemed to be available, but are non "
+"functional, are greyed out (or are not clickable). Some tabs are completely "
+"hidden to the end user, others even to the GOsa admin."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><title>
+msgid "Regressions"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"No mass import of user account data in GOsa (ldif or csv) available yet."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr ""
@@ -6352,8 +6402,8 @@ msgid ""
"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!"
+"Wolfgang Schweer (2012, 2013) and Bernhard Hammes (2012) and is released "
+"under the GPL2 or any later version. Enjoy!"
msgstr ""
#. type: Content of: <article><section><para>
@@ -6426,8 +6476,8 @@ msgstr ""
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."
+"Spanish. This is an <ulink url=\"http://maintainer.skolelinux.org/debian-edu-"
+"doc/\">online overview of all languages</ulink>."
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -7375,6 +7425,10 @@ msgid ""
"installmanual\">installation manual</ulink>."
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Infrastructural changes"
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"The 10.0.0.0/8 network is used instead of 10.0.2.0/23, and the default "
@@ -7446,12 +7500,6 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -7605,6 +7653,10 @@ msgid ""
"installed instead.)"
msgstr ""
+#. type: Content of: <article><section><section><section><title>
+msgid "Other LDAP related changes"
+msgstr ""
+
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Make the LDAP server handle more clients after increasing the server's file "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 4c2e417..0f519ec 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -22,7 +22,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
</para>
<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, DVD or usbstick all other machines can be installed via the network, this includes "roaming workstations" (ones that can be taken away from the school network, usually laptops or netbooks) as well as PXE booting for diskless machines like tradional thin-clients.
</para>
-<para>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.
+<para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe.
</para>
<section id="AboutDebianEdu--Some_history_and_why_two_names">
@@ -62,7 +62,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
</title>
<para>DHCPD on Tjener serves the 10.0.0.0/8 network, providing a syslinux menu via PXE-boot where you can choose whether to install a new server/workstation, boot a thin client or a diskless workstation, run memtest, or boot from the local hard disk.
</para>
-<para>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.
+<para>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 option (stored in LDAP) to have clients directly boot via PXE from the terminal server.
</para>
<para>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.
</para>
@@ -124,7 +124,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
<para> Electronic Post Office
</para></entry><entry colsep="1" rowsep="1">
-<para> IMAP/POP3 (Dovecot)
+<para> IMAP (Dovecot)
</para></entry><entry colsep="1" rowsep="1">
<para> postoffice
</para></entry></row><row rowsep="1"><entry colsep="1" rowsep="1">
@@ -190,7 +190,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
</para></entry></row></tbody></tgroup></informaltable>
<para>Personal files for each user are stored in their home directories, which are made available by the server. Home directories 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, offering access via NFS for Unix clients, SMB for Windows and Macintosh clients.
</para>
-<para>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.
+<para>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 IMAP.
</para>
<para>All services are accessible using the same username and password, thanks to the central user database for authentication and authorisation.
</para>
@@ -330,7 +330,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
<para>For running Iceweasel/Firefox and OpenOffice.org, 128 MiB RAM is a minimum requirement.
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>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.
+<para>For workstations, diskless workstations and standalone PCs, 800 MHz, 320 MiB RAM are minimum requirements, though 512 or 1024 MiB RAM will perform considerably better. Just a faster CPU will speed things up.
</para>
<itemizedlist>
<listitem>
@@ -341,7 +341,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
<para>If your diskless workstations have hard drives, it is recommended to use them for swap as it is a lot faster than network swapping.
</para></listitem></itemizedlist></listitem>
<listitem>
-<para>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.
+<para>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 320 MiB RAM workstation solves this, and the spell checker runs smoothly.
</para></listitem></itemizedlist></listitem>
<listitem>
<para>Laptops have the same requirements as for workstations since they are just movable workstations.
@@ -374,10 +374,10 @@ FIXME: we need a wheezy login shot here once we have new artwork
<para>You need exactly one main server, the tjener.
</para></listitem>
<listitem>
-<para>You can have up to 50 (diskless) workstations on the main network.
+<para>You can have hundreds of workstations on the main network.
</para></listitem>
<listitem>
-<para>You can have up to 20 LTSP servers on the main network.
+<para>You can have a lot of LTSP servers on the main network; two different subnets are preconfigured in LDAP.
</para></listitem>
<listitem>
<para>You can have hundreds of thin clients and/or diskless workstations on each LTSP server network.
@@ -431,7 +431,7 @@ FIXME: we need a wheezy login shot here once we have new artwork
<para>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 or rsync via:
</para>
<para>
-FIXME: these download URLs need to be adapted for wheezy still... They currently don't work
+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.
</para>
<itemizedlist><listitem override="none">
<para><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>
@@ -448,11 +448,11 @@ FIXME: these download URLs need to be adapted for wheezy still... They currently
<para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via
</para>
<itemizedlist><listitem override="none">
-<para><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>
+<para><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>
</para>
-<para><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>
+<para><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>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
@@ -624,8 +624,11 @@ FIXME: these download URLs need to be adapted for wheezy still... They currently
<itemizedlist><listitem override="none">
<para>This profile 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.
</para></listitem></itemizedlist></listitem></itemizedlist>
-<para>The <emphasis role="strong">Main Server</emphasis>, <emphasis role="strong">Workstation</emphasis> and <emphasis role="strong">Thin Client Server</emphasis> profiles are preselected. These profiles can be installed on one machine together if you want to install a so called <emphasis>combined main server</emphasis>. This means the main server will be a thin client server and also be used as a workstation. This is the default choice, since we assume most people will install <link linkend="Installation--Installation_over_the_network_.28PXE.29_and_booting_diskless_clients">via PXE</link> afterwards. Please note that you must have 2 network cards installed in a machine which is going to be installed as a combined main server or as a thin client server to become usefull after the installation.
-</para></listitem>
+<para>The <emphasis role="strong">Main Server</emphasis>, <emphasis role="strong">Workstation</emphasis> and <emphasis role="strong">Thin Client Server</emphasis> profiles are preselected. These profiles can be installed on one machine together if you want to install a so called <emphasis>combined main server</emphasis>. This means the main server will be a thin client server and also be used as a workstation. This is the default choice, since we assume most people will install <link linkend="Installation--Installation_over_the_network_.28PXE.29_and_booting_diskless_clients">via PXE</link> afterwards. Please note that you must have 2 network cards installed in a machine which is going to be installed as a combined main server or as a thin client server to become usefull after the installation.
+</para></listitem></itemizedlist>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> The ordering of the network cards after installation can differ from the ordering during installation. The wanted ordering could be achieved by editing <computeroutput>/etc/udev/rules.d/70-persistent-net.rules</computeroutput>: Replace eth0 with eth1 and eth1 with eth0; a reboot is needed for the changes to take effect.
+</para>
+<itemizedlist>
<listitem>
<para>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 will require more work - you will need to make sure that the required partitions are created and are big enough.
</para></listitem>
@@ -732,7 +735,7 @@ FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
</para>
<para>[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]
</para>
-<para>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.
+<para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't need to be added with GOsa² (but could be).
</para>
<para>More information about network clients can be found in the <link linkend="NetworkClients">Network clients HowTo</link> chapter.
</para>
@@ -952,14 +955,14 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
<para>As you follow the wizard, you will see that GOsa² generates a username automatically based on the real name. It automatically chooses a username that doesn't exist yet, so multiple users with the same full name are not a problem. Note that GOsa² can generate invalid usernames if the full name contains non-ASCII characters.
</para></listitem>
<listitem>
-<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard. (Username generation can be customized in <computeroutput>/etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry <computeroutput>idGenerator="{%givenName[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!)
+<para>If you don't like the generated username you can select another username offered in the drop-down box, but you do not have a free choice here in the wizard. (Username generation can be customized in <computeroutput>/etc/gosa/gosa.conf</computeroutput>, changing e.g. the default entry <computeroutput>idGenerator="{%givenName[1-6]}{%sn[1-6]}"</computeroutput> to <computeroutput>idGenerator="{%givenName[1]}{%sn[22]}{id!2}"</computeroutput> would generate the username <computeroutput>pmuster</computeroutput> for a user "Peter Muster" and <computeroutput>pmuster01</computeroutput> for the next user with the same full name. The maximum length for usernames in this case would be 25; see <computeroutput>man 5 gosa.conf</computeroutput> for more details. Backup gosa.conf before editing it!)
</para></listitem>
<listitem>
<para>When the wizard has finished, you are presented with the GOsa² screen for your new user object. Use the tabs at the top to check the completed fields.
</para></listitem></itemizedlist>
<para>After you have created the user (no need to customise fields the wizard has left empty for now), click on the "Ok" button in the bottom-right corner.
</para>
-<para>As the last step GOsa² will ask for a password for the new user. Type that in twice and then click "Set password" in the bottom-right corner.
+<para>As the last step GOsa² will ask for a password for the new user. Type that in twice and then click "Set password" in the bottom-right corner. <inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Some characters may not be allowed as part of the password.
</para>
<para>If all went well, you can now see the new user in the user list table. You should now be able to log in with that username on any Skolelinux machine within your network.
</para>
@@ -1007,6 +1010,9 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
<section id="GettingStarted--Advanced_user_management">
<title>Advanced user management
</title>
+<para>
+FIXME: this section is "obsolete" + non-working as the plugin feature is still missing.
+</para>
<para>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).
</para>
<para>These are the format guidelines for such a CSV file (GOsa² is quite intolerant about them):
@@ -1082,7 +1088,7 @@ net groupmap add unixgroup=NEW_GROUP type=domain ntgroup="NEW_GROUP"\
</title>
<para>Machine management basically allows you to manage all networked devices in your Debian Edu network. Every machine added to the LDAP directory using GOsa² has a hostname, an IP address, a MAC address and a domain name (which is usually "intern"). For a fuller description of the Debian Edu architecture see the <link linkend="Architecture">architecture</link> chapter of this manual.
</para>
-<para>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.
+<para>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 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.
</para>
<para>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.
</para>
@@ -1416,10 +1422,7 @@ enter password: █]]></screen>
<section id="Upgrades--LDAP_service_needs_to_be_reconfigured">
<title>LDAP service needs to be reconfigured
</title>
-<para>
-FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed
-</para>
-<para>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.
+<para>The LDAP setup has changed slightly from Squeeze to Wheezy. Nevertheless, 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.
</para>
</section>
@@ -1573,12 +1576,12 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
</para>
</section>
-<section id="Administration--Using_stable-updates_.28formerly_known_an_volatile.29">
-<title>Using stable-updates (formerly known an volatile)
+<section id="Administration--Using_stable-updates_.28formerly_known_as_volatile.29">
+<title>Using stable-updates (formerly known as volatile)
</title>
<para>Since the Squeeze release, Debian has included packages formerly maintained in volatile.debian.org in the 2011 created <ulink url="http://wiki.debian.org/StableUpdates">stable-updates suite</ulink>.
</para>
-<para>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.
+<para>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 done, which roughly happens every two months.
</para>
</section>
@@ -1589,10 +1592,14 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
</para>
<para>Backports are recompiled packages from Debian testing (mostly) and Debian unstable (in a few cases only, e.g. security updates), so they will run without new libraries (wherever this is possible) on a stable Debian distribution like Debian Edu. <emphasis role="strong">We recommend you to pick out individual backports which fit your needs, and not to use all backports available there.</emphasis>
</para>
-<para>Using backports.debian.org is simple:
-</para><screen><![CDATA[echo "deb http://backports.debian.org/debian-backports wheezy-backports main contrib non-free" >> /etc/apt/sources.list
+<para>Using backports is simple:
+</para><screen><![CDATA[echo "deb http://ftp.debian.org/debian/ wheezy-backports main" >> /etc/apt sources.list
apt-get update]]></screen>
-<para>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.
+<para>After which one can install backported packages easily, the following command will install a backported version of <emphasis>tuxtype</emphasis>:
+</para><screen><![CDATA[apt-get install -t wheezy-backports tuxtype]]></screen>
+<para>Backports are automatically updated (if available) just like other packages. (Previously, extra configuration was needed to achieve this, but since 2011 this [[<ulink url="http://backports.debian.org/news/squeeze-backports_and_lenny-backports-sloppy_started/|is"/> not needed anymore].
+</para>
+<para>Like the normal archive, backports has three sections: main, contrib and non-free.
</para>
</section>
@@ -1894,7 +1901,7 @@ apt-get update]]></screen>
<para><emphasis role="strong">Diskless workstation</emphasis>
</para>
<itemizedlist><listitem override="none">
-<para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients.
+<para>A diskless workstation runs all software locally. The client machines boot directly from the LTSP server without a local hard drive. Software is administered and maintained on the LTSP server, but it runs on the diskless workstation. Home directories and system settings are stored on the server too. Diskless workstations are an excellent way of reusing newer hardware with the same low maintenance cost as with thin clients. <inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> 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².
</para></listitem></itemizedlist>
<para>LTSP client boot will fail if the client's network card requires a non-free firmware. A PXE installation can be used for troubleshooting problems with netbooting a machine; if the Debian Installer complains about a missing XXX.bin file then non-free firmware has to be added to the initrd used by LTSP clients.
</para>
@@ -1920,13 +1927,18 @@ ltsp-update-kernels]]></screen>
<para>Make sure to execute <computeroutput>ltsp-update-kernels</computeroutput> after installation.
</para>
-<section id="NetworkClients--Machine_type_selection_based_on_the_network">
-<title>Machine type selection based on the network
+<section id="NetworkClients--LTSP_client_type_selection">
+<title>LTSP client type selection
</title>
-<para>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).
-</para>
-<para>Diskless workstations get IP addresses assigned in the private subnet 10.0.0.0/8, while thin clients are connected in the separate subnet 192.168.0.0/24.
+<para>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 forming a local 192.168.0.0/24 subnet (a separate subnet for each LTSP server).
</para>
+<para>Using the default PXE menu, a machine could be started as diskless workstation or thin client in the main subnet 10.0.0.0/8. By default clients in the separate subnet 192.168.0.0/24 will run as diskless workstations if the amount of RAM is sufficient. If all clients in the subnet should run as thin clients, the following has to be done.
+</para><screen><![CDATA[(1)Open the file /opt/ltsp/i386/etc/ltsp/update-kernels.conf with an editor
+and replace the line
+CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp quiet"
+with
+CMDLINE_LINUX_DEFAULT="init=/sbin/init-ltsp LTSP_FATCLIENT=false quiet"
+(2)Execute 'ltsp-update-kernels']]></screen>
</section>
</section>
@@ -1971,18 +1983,6 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</para><screen><![CDATA[ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default]]></screen>
<para>See also the PXELINUX documentation at <ulink url="http://syslinux.zytor.com/wiki/index.php/PXELINUX"/> .
</para>
-<para>If clients on the 192.168.x.x interface of a thin client server should boot as diskless workstations instead of thin clients, edit
-</para><screen><![CDATA[/var/lib/tftpboot/ltsp/i386/pxelinux.cfg/default]]></screen>
-<para> and add a '3' (no quotes) to the end of the kernel argument line, to specify runlevel 3.
-</para>
-<para>The file should then look like this:
-</para><screen><![CDATA[default ltsp
-
-label ltsp
-kernel vmlinuz
-append ro initrd=initrd.img boot=nfs quiet 3]]></screen>
-<para>When adding such a workstation in GOsa², use an IP address matching the LTSP server interface IP address on the thin client net (by default 192.168.0.254, dynamic dhcp range starting at 192.168.0.20).
-</para>
</section>
<section id="NetworkClients--Separate_main-_and_LTSP_servers">
@@ -2926,14 +2926,14 @@ FIXME: hopefully. h01ger is one it to ask gismo.
</title>
<itemizedlist>
<listitem>
-<para>Everything which is new in Debian Wheezy:
+<para>Everything which is new in Debian Wheezy, eg:
</para>
<itemizedlist>
<listitem>
<para>Linux kernel 3.2.x
</para></listitem>
<listitem>
-<para>Desktop environments KDE "Plasma" 4.8.4 and GNOME 3.4
+<para>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.)
</para></listitem>
<listitem>
<para>Web browser Iceweasel 10 ESR
@@ -2942,6 +2942,15 @@ FIXME: hopefully. h01ger is one it to ask gismo.
<para>LibreOffice 3.5.4
</para></listitem>
<listitem>
+<para>LTSP 5.4.2
+</para></listitem>
+<listitem>
+<para>GOsa 2.7.4
+</para></listitem>
+<listitem>
+<para>CUPS print system 1.5.3
+</para></listitem>
+<listitem>
<para>Educational toolbox GCompris 12.01
</para></listitem>
<listitem>
@@ -2957,7 +2966,13 @@ FIXME: hopefully. h01ger is one it to ask gismo.
<para>Virtual stargazer Stellarium 0.11.3
</para></listitem>
<listitem>
-<para>Debian Wheezy includes over 10,000 new packages available for installation, including the Chromium browser
+<para>Scratch visual programming environment 1.4.0.6
+</para></listitem>
+<listitem>
+<para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details.
+</para></listitem>
+<listitem>
+<para>Debian Wheezy includes about 37000 packages available for installation.
</para></listitem></itemizedlist>
<itemizedlist>
<listitem>
@@ -2965,56 +2980,45 @@ FIXME: hopefully. h01ger is one it to ask gismo.
</para></listitem></itemizedlist></listitem></itemizedlist>
</section>
-<section id="Features--Infrastructural_changes">
-<title>Infrastructural changes
-</title>
-<itemizedlist>
-<listitem>
-<para>
-FIXME: to be documented, if any
-</para></listitem></itemizedlist>
-</section>
-
<section id="Features--Documentation_and_translation_updates">
<title>Documentation and translation updates
</title>
<itemizedlist>
<listitem>
-<para>Translation updates for the templates used in the installer. These templates are now available in
-FIXME languages.
+<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages.
</para></listitem>
<listitem>
<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmal and Spanish.
</para></listitem></itemizedlist>
</section>
-<section id="Features--Regressions">
-<title>Regressions
+<section id="Features--LDAP_related_changes">
+<title>LDAP related changes
</title>
<itemizedlist>
<listitem>
-<para>
-FIXME: to be documented, if any
+<para>Slight changes to some objects and acls to have more types to choose from when adding systems in GOsa. Now systems can be of type server, workstation, printer, terminal or netdevice.
</para></listitem></itemizedlist>
</section>
-<section id="Features--Other_LDAP_related_changes">
-<title>Other LDAP related changes
+<section id="Features--Other_changes">
+<title>Other changes
</title>
<itemizedlist>
<listitem>
-<para>
-FIXME: to be documented, if any
+<para>LTSP clients start as diskless workstation / thin client can be configured via command line argument -- or individually adding an entry in lts.conf or LDAP.
+</para></listitem>
+<listitem>
+<para>GOsa gui: Now some options that seemed to be available, but are non functional, are greyed out (or are not clickable). Some tabs are completely hidden to the end user, others even to the GOsa admin.
</para></listitem></itemizedlist>
</section>
-<section id="Features--Other_changes">
-<title>Other changes
+<section id="Features--Regressions">
+<title>Regressions
</title>
<itemizedlist>
<listitem>
-<para>
-FIXME: to be documented, if any
+<para>No mass import of user account data in GOsa (ldif or csv) available yet.
</para></listitem></itemizedlist>
</section>
</section>
@@ -3023,7 +3027,7 @@ FIXME: to be documented, if any
<section id="CopyRight">
<title>Copyright and authors
</title>
-<para>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!
+<para>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, 2013) and Bernhard Hammes (2012) and is released under the GPL2 or any later version. Enjoy!
</para>
<para>If you add content to it, <emphasis role="strong">please only do so if you are the author. You need to release it under the same conditions</emphasis>! Then add your name here and release it under the GPL2 or later version.
</para>
@@ -3051,7 +3055,7 @@ FIXME: to be documented, if any
<section id="Translations">
<title>Translations of this document
</title>
-<para>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.
+<para>Versions of this document fully translated into German, Italian, French and Danish are available. Incomplete translations exist for Norwegian Bokmål and Spanish. This is an <ulink url="http://maintainer.skolelinux.org/debian-edu-doc/">online overview of all languages</ulink>.
</para>
<section id="Translations--HowTo_translate_this_document">
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index c6dc5d1..c644e28 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -3,12 +3,12 @@ http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AboutDebianEdu
FIXME: we need a wheezy login shot here once we have new artwork
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
-FIXME: these download URLs need to be adapted for wheezy still... They currently don't work
+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.
FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
FIXME: these screenshots need to be redone once we have wheezy artwork
----------------------------------
-http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Upgrades
-FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy//GettingStarted
+FIXME: this section is "obsolete" + non-working as the plugin feature is still missing.
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
FIXME: would it be better to explain user groups in Windows first with GOsa², and then with an example for the command line?
@@ -18,11 +18,6 @@ FIXME: describe roaming profile key for the global policy editor here
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead.
FIXME: hopefully. h01ger is one it to ask gismo.
-FIXME: to be documented, if any
-FIXME languages.
-FIXME: to be documented, if any
-FIXME: to be documented, if any
-FIXME: to be documented, if any
====================
-14 FIXMEs left to fix
+11 FIXMEs left to fix
====================
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 51d464e..9df4e2e 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 6d15634..a5a33d6 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index ae6e3a6..f9b0494 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index 3e8a129..09aade3 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list