[debian-edu-commits] debian-edu/debian-edu-doc.git (#1547) - master (branch) updated: 1.5_20130714_7.1-15-g4435a7a
David Prévot
taffit at alioth.debian.org
Sat Jul 27 07:59:00 UTC 2013
The branch, master has been updated
via 4435a7a9df2ca8938e5d06ac372c0ed576ae3ac2 (commit)
from 49b23396d4df465f0f6ef15023dd163213ba9ed2 (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 4435a7a9df2ca8938e5d06ac372c0ed576ae3ac2
Author: David Prévot <taffit at debian.org>
Date: Sat Jul 27 08:19:42 2013 +0200
Trivial unfuzzy
Automatic pass, using msguntypo.
Git-Dch: Ignore
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-wheezy-manual.da.po | 34 ++--
.../debian-edu-wheezy-manual.de.po | 64 ++++---
.../debian-edu-wheezy-manual.es.po | 38 ++--
.../debian-edu-wheezy-manual.fr.po | 30 ++--
.../debian-edu-wheezy-manual.it.po | 79 +++++----
.../debian-edu-wheezy-manual.nb.po | 182 ++++++++++----------
6 files changed, 227 insertions(+), 200 deletions(-)
The diff of changes is:
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index cb9ed71..5be6600 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-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-0400\n"
"PO-Revision-Date: 2013-07-18 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -86,7 +86,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
"Umiddelbart efter installationen af en skoleserver - der kører alle "
"tjenester krævet for et skolenetværk - sættes dette netværk op (se det næste "
@@ -2056,7 +2056,7 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
"Efter angivelse af root-adgangskoden (administratoradgangskoden) vil du "
@@ -2066,10 +2066,10 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
"Den valgte adgangskode for denne bruger <emphasis role=\"strong\">skal</"
"emphasis> have en længde på <emphasis role=\"strong\">mindst 5 tegn</"
@@ -2152,7 +2152,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
"En netinstallation (som er typen vores cd tilbyder) vil hente nogle pakker "
@@ -3446,14 +3446,20 @@ msgstr ""
"i denne manual."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis>have</"
+#| "emphasis> to be added with GOsa², but all <emphasis>can</emphasis>."
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks <emphasis>have</emphasis> to be added with "
-"GOsa², but all <emphasis>can</emphasis>."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
msgstr ""
"Diskløse arbejdsstationer og tynde klienter kan direkte startes op fra "
-"hovednetværket. Kun arbejdsstationer med diske <emphasis>skal</emphasis> tilføjes med GOsa², "
-"men alle <emphasis>kan</emphasis>."
+"hovednetværket. Kun arbejdsstationer med diske <emphasis>skal</emphasis> "
+"tilføjes med GOsa², men alle <emphasis>kan</emphasis>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3478,7 +3484,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -3503,7 +3509,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
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 c1e90b9..c8083a7 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-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-0400\n"
"PO-Revision-Date: 2013-07-09 23:59+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -97,7 +97,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
"Unmittelbar nach der Installation steht ein Schulserver zur Verfügung, auf "
"dem alle für ein Schulnetzwerk notwendigen Dienste laufen (Details dazu im "
@@ -779,8 +779,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -1525,11 +1525,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
msgid "Request a CD / DVD by mail"
@@ -2106,7 +2108,7 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
"Nach Eingabe des Passwortes für »root« werden Sie aufgefordert, ein normales "
@@ -2116,10 +2118,10 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
"Sie <emphasis role=\"strong\">müssen</emphasis> ein Passwort mit <emphasis "
"role=\"strong\">mindestens 5 Zeichen</emphasis> verwenden, da das Anmelden "
@@ -2206,7 +2208,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
"Eine Installation mittels »netinst« (Installationart mit unserer CD) wird "
@@ -3128,14 +3130,14 @@ msgstr ""
"nicht. (Die Generierung der Kennungen kann in der Datei <computeroutput>/etc/"
"gosa/gosa.conf</computeroutput> angepasst werden; es könnte z.B. die "
"Voreinstellung <computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
-"computeroutput> geändert werden in <computeroutput>idGenerator="
-"\"{%givenName[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den "
-"Benutzer »Peter Muster« die Kennung <computeroutput>pmuster</computeroutput> "
-"und für einen weiteren Benutzer mit gleichem Namen "
-"<computeroutput>pmuster01</computeroutput> generiert; in diesem Fall wären "
-"Kennungen maximal 25 Zeichen lang. Weitere Details erhalten Sie mittels "
-"<computeroutput>man 5 gosa.conf</computeroutput>. Legen Sie eine "
-"Sicherheitskopie von gosa.conf an, bevor Sie diese verändern!)"
+"computeroutput> geändert werden in <computeroutput>idGenerator=\"{%givenName"
+"[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den Benutzer »Peter "
+"Muster« die Kennung <computeroutput>pmuster</computeroutput> und für einen "
+"weiteren Benutzer mit gleichem Namen <computeroutput>pmuster01</"
+"computeroutput> generiert; in diesem Fall wären Kennungen maximal 25 Zeichen "
+"lang. Weitere Details erhalten Sie mittels <computeroutput>man 5 gosa.conf</"
+"computeroutput>. Legen Sie eine Sicherheitskopie von gosa.conf an, bevor Sie "
+"diese verändern!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -3521,15 +3523,21 @@ msgstr ""
"linkend=\"Architecture\">Kapitel über die Netzwerkstruktur</link> zu finden."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis>have</"
+#| "emphasis> to be added with GOsa², but all <emphasis>can</emphasis>."
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks <emphasis>have</emphasis> to be added with "
-"GOsa², but all <emphasis>can</emphasis>."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
msgstr ""
"Diskless Workstations und Thin Clients arbeiten unmittelbar, wenn sie mit "
"dem Hauptnetzwerk verbunden sind. Nur Arbeitsplatzrechner mit Festplatten "
-"<emphasis>müssen</emphasis> mittels GOsa² zu LDAP hinzugefügt werden; bei allen anderen <emphasis>kann</emphasis> "
-"dies erfolgen"
+"<emphasis>müssen</emphasis> mittels GOsa² zu LDAP hinzugefügt werden; bei "
+"allen anderen <emphasis>kann</emphasis> dies erfolgen"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -3554,7 +3562,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -3579,7 +3587,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
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 481fc5c..3e2dab2 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-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-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"
@@ -110,7 +110,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
"Inmediatamente después de la instalación, el servidor de la escuela "
"ejecutará todos los servicios necesarios para que la red escolar sea "
@@ -1879,8 +1879,9 @@ 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.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -2620,16 +2621,16 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2704,7 +2705,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
@@ -4110,8 +4111,9 @@ msgstr ""
#| "normal workstations or thin client servers."
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks *have* to be added with "
-"GOsa², but all *can*."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
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 "
@@ -4140,7 +4142,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -4160,7 +4162,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
msgstr ""
@@ -11029,8 +11031,8 @@ msgstr ""
#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~ "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -11040,8 +11042,8 @@ msgstr ""
#~| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
#~ msgid ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#~ "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
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 d5aac87..eb9a04a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2013-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-0400\n"
"PO-Revision-Date: 2013-07-23 16:13+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -88,7 +88,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
"Immédiatement après l'installation, un serveur faisant fonctionner tous les "
"services pour le réseau de l'école est configuré (consultez le chapitre "
@@ -2119,7 +2119,7 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
"Après avoir donné le mot de passe du superutilisateur, il vous sera demandé "
@@ -2130,10 +2130,10 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
"Le mot de passe choisi pour cet utilisateur <emphasis role=\"strong\">doit</"
"emphasis> avoir une longeur d'<emphasis role=\"strong\">au moins "
@@ -2219,7 +2219,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
"Une installation par le réseau (qui est le type d'installation proposée par "
@@ -3543,10 +3543,16 @@ msgstr ""
"\"Architecture\">Architecture</link> de ce manuel."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Diskless workstations and thin-clients work out-of-the-box when connected "
+#| "to the main network. Only workstations with disks <emphasis>have</"
+#| "emphasis> to be added with GOsa², but all <emphasis>can</emphasis>."
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks <emphasis>have</emphasis> to be added with "
-"GOsa², but all <emphasis>can</emphasis>."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
msgstr ""
"Les stations de travail sans disque et les clients légers fonctionnent sans "
"modification une fois connectés au réseau principal. Seules les stations de "
@@ -3576,7 +3582,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -3603,7 +3609,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
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 f8e300e..368cdff 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-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-0400\n"
"PO-Revision-Date: 2013-05-12 17:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -101,7 +101,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
"Immediatamente dopo l'installazione è configurato un server della scuola che "
"esegue tutti i servizi necessari per la rete scolastica (vedere il prossimo "
@@ -1538,11 +1538,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
msgstr ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
#. type: Content of: <article><section><section><title>
#, fuzzy
@@ -2134,16 +2136,16 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2231,7 +2233,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
@@ -3562,8 +3564,9 @@ msgstr ""
#, fuzzy
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks *have* to be added with "
-"GOsa², but all *can*."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
msgstr ""
"Questa configurazione permette anche di avviare diskless workstation e thin "
"client sulla rete principale. A differenza delle workstation, le diskless "
@@ -3594,7 +3597,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -3618,7 +3621,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
msgstr ""
@@ -6611,8 +6614,8 @@ msgid ""
msgstr ""
"Il valore di default è definito in <computeroutput>[default]</"
"computeroutput>, per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10] </computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>"
+"[192.168.0.10] </computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -11545,18 +11548,18 @@ msgstr ""
#~ "edu~7.0+edu0~a0-CD.iso) should work."
#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgid ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgid ""
#~ "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
@@ -15767,13 +15770,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -15785,8 +15788,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15794,8 +15797,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15812,8 +15815,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15821,8 +15824,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 9559135..faa2115 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-07-13 19:39-0400\n"
+"POT-Creation-Date: 2013-07-20 17:47-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"
@@ -90,7 +90,7 @@ msgid ""
"flash drive all other machines can be installed via the network, this "
"includes \"roaming workstations\" (ones that can be taken away from the "
"school network, usually laptops or netbooks) as well as PXE booting for "
-"diskless machines like tradional thin-clients."
+"diskless machines like traditional thin-clients."
msgstr ""
#. type: Content of: <article><section><para>
@@ -754,10 +754,10 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
"Terminal Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
@@ -1515,8 +1515,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0~b0-"
-"source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+"edu-7.1+edu0~b0-source-DVD.iso debian-edu-7.1+edu0~b0-source-DVD.iso</"
+"computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1763,8 +1764,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "./images/Installer_help.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -2096,16 +2097,16 @@ msgstr ""
msgid ""
"After giving the root password, you will be asked to create a normal user "
"account \"for non-administrative tasks\". For Debian Edu this account is "
-"very important: It is the account you will use to manage the Skolelinux "
+"very important: it is the account you will use to manage the Skolelinux "
"network."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"The choosen password for this user <emphasis role=\"strong\">must</emphasis> "
-"have a length of <emphasis role=\"strong\">at least 5 characters</emphasis> "
-"- otherwise login will not be possible. (And that's even though a shorter "
-"password will be accepted by the installer.)"
+"The password for this user <emphasis role=\"strong\">must</emphasis> have a "
+"length of <emphasis role=\"strong\">at least 5 characters</emphasis> - "
+"otherwise login will not be possible (even though a shorter password will be "
+"accepted by the installer)."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -2176,7 +2177,7 @@ msgid ""
"of packages fetched from the net varies from profile to profile but stays "
"below a gigabyte (unless you choose to install all possible desktops). Once "
"you have installed the main-server (whether a pure main-server or combi-"
-"server does not matter), further installation will use it's proxy to avoid "
+"server does not matter), further installation will use its proxy to avoid "
"downloading the same package several times from the net."
msgstr ""
@@ -2588,57 +2589,57 @@ msgstr ""
#, fuzzy
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2703,43 +2704,43 @@ msgstr ""
#, fuzzy
msgid "./images/13-Install+the+base+system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "13-Install the base system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -2770,29 +2771,29 @@ msgstr ""
#, fuzzy
msgid "./images/20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3522,8 +3523,9 @@ msgstr ""
#, fuzzy
msgid ""
"Diskless workstations and thin-clients work out-of-the-box when connected to "
-"the main network. Only workstations with disks *have* to be added with "
-"GOsa², but all *can*."
+"the main network. Only workstations with disks <emphasis role=\"strong"
+"\">have</emphasis> to be added with GOsa², but all <emphasis role=\"strong"
+"\">can</emphasis>."
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 "
@@ -3547,7 +3549,7 @@ msgid ""
"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.2 if you add the first "
-"machine this way. It may be better to first think about your network: For "
+"machine this way. It may be better to first think about your network: for "
"example you could use 10.0.0.x with x>10 and x<50 for servers, and "
"x>100 for workstations. Don't forget to activate the just added system. "
"With the exception of the main server all systems will then have a matching "
@@ -3567,7 +3569,7 @@ msgid ""
"h</computeroutput> shows usage information. Please note, that the IP "
"addresses shown after usage of <computeroutput>sitesummary2ldapdhcp</"
"computeroutput> belong to the dynamic IP range. These systems can then be "
-"modified though to suite your network: Rename each new system, activate DHCP "
+"modified though to suit your network: rename each new system, activate DHCP "
"and DNS, add it to netgroups, if needed; reboot the system afterwards. The "
"following screenshots show how this looks in practice:"
msgstr ""
@@ -3588,8 +3590,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_list.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
@@ -3599,8 +3601,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_host_details.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
@@ -3621,8 +3623,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_add_netgroup.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
@@ -4144,8 +4146,8 @@ msgstr ""
#, fuzzy
msgid "./images/slbackup-php_maintenance.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -5901,10 +5903,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -11002,16 +11004,16 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
#, fuzzy
#~ msgid ""
-#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~b0-"
-#~ "DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
+#~ "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#~ "edu-7.1+edu0~b0-DVD.iso\">debian-edu-7.1+edu0~b0-DVD.iso</ulink>"
#~ msgstr ""
#~ "<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-"
#~ "edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -11104,8 +11106,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "getting-]started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
#, fuzzy
#~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -11128,8 +11130,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -12392,8 +12394,8 @@ msgstr ""
#~ "workstation server(s):"
#~ msgstr ""
#~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på "
-#~ "arbeidsstasjonstjener(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
+#~ "(ne):"
#~ msgid ""
#~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -14720,13 +14722,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -14738,8 +14740,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14747,8 +14749,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14764,8 +14766,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -14773,8 +14775,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
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