[debian-edu-commits] debian-edu/debian-edu-doc.git (#411) - wheezy (branch) updated: 1.0_20080315-3-gad0599a
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:17:32 UTC 2013
The branch, wheezy has been updated
via ad0599aa7f1bf3aff44303627ac611812e509c01 (commit)
from 46bd217a9635d73c9a7f1017176fc977dc514471 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
documentation/release-manual/release-manual.de.po | 96 ++++++----
documentation/release-manual/release-manual.es.po | 55 +++---
documentation/release-manual/release-manual.it.po | 194 +++++++++++++--------
documentation/release-manual/release-manual.nb.po | 94 ++++++----
documentation/release-manual/release-manual.pot | 49 +++---
documentation/release-manual/release-manual.xml | 30 ++--
6 files changed, 313 insertions(+), 205 deletions(-)
The diff of changes is:
diff --git a/documentation/release-manual/release-manual.de.po b/documentation/release-manual/release-manual.de.po
index a22160e..b006ff1 100644
--- a/documentation/release-manual/release-manual.de.po
+++ b/documentation/release-manual/release-manual.de.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-15 12:05+0100\n"
+"POT-Creation-Date: 2008-03-30 15:39+0200\n"
"PO-Revision-Date: 2008-02-15 00:29+0100\n"
"Last-Translator: Roland F.Teichert <rfteichert at imail.de>\n"
"Language-Team: Deutsch <de at li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
#, fuzzy
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2008-03-15</computeroutput>."
+"computeroutput> package on <computeroutput>2008-03-30</computeroutput>."
msgstr ""
"Dieses Dokument wurde am <computeroutput>2008-02-06</computeroutput> in das "
"Paket <computeroutput>debian-edu-doc </computeroutput> gepackt."
@@ -1223,7 +1223,7 @@ msgstr ""
# type: Content of: <article><para><section><section><title>
#: release-manual.xml:308
#, fuzzy
-msgid "Hardware requierements"
+msgid "Hardware requirements"
msgstr "Anforderungen an das Netzwerk"
# type: Content of: <article><section><itemizedlist><listitem>
@@ -1336,10 +1336,10 @@ msgstr ""
"ulink> ."
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:332 release-manual.xml:384 release-manual.xml:2349
-#: release-manual.xml:2386 release-manual.xml:2457
-msgid "<phrase>:-) </phrase>"
-msgstr "<phrase>:-) </phrase>"
+#: release-manual.xml:332 release-manual.xml:476 release-manual.xml:560
+#: release-manual.xml:1504 release-manual.xml:1990
+msgid "<phrase>:) </phrase>"
+msgstr "<phrase>:) </phrase>"
# type: Content of: <article><section><title>
#: release-manual.xml:341
@@ -1404,34 +1404,30 @@ msgid ""
"disable the DHCP server on the router.)"
msgstr ""
-# type: Content of: <article><para><section><section><section><para>
+# type: Content of: <article><section><section><para>
#: release-manual.xml:359
msgid ""
-"If you are looking for a i386 based solution, we recommend <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw </ulink>. If you need something for an embedded router we "
-"recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, check here for "
-"<ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware </"
-"ulink>. If you are into BSD unix, <ulink url='http://www.pfsense."
-"org/'>pfsense </ulink> and <ulink url='http://m0n0.ch/wall/'>m0n0wall </"
-"ulink> are good choices. Though since they are BSD based, we think they are "
-"better suited for more experienced administrators."
-msgstr ""
-"Wenn Sie nach einer i386 basierten Lösung suchen, empfehlen wir: <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> oder <ulink url='http://www.zelow."
-"no/floppyfw'>floppyfw </ulink>. Wenn Sie etwas benötigen für einen "
-"integrierten Router, empfehlen wir: <ulink url='http://openwrt.org'>OpenWRT "
-"</ulink>, sehen Sie hier wegen Hardwareunterstützung: <ulink url='http://"
-"wiki.openwrt.org/TableOfHardware'>supported hardware </ulink>. Wenn Sie ein "
-"BSD Unix nutzen sind, <ulink url='http://www.pfsense.org/'>pfsense </ulink> "
-"und <ulink url='http://m0n0.ch/wall/'>m0n0wall </ulink> eine gute Wahl. "
-"Allerdings sind die BSD basierten Systeme unseres Erachtens besser für "
-"erfahrene Administratoren geeignet."
+"If you are looking for a i386 based solution (so that you can reuse an old "
+"PC), we recommend <ulink url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
+"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: release-manual.xml:363
+msgid ""
+"If you need something for an embedded router or accesspoint we recommend "
+"using <ulink url='http://openwrt.org'>OpenWRT </ulink>, though of course you "
+"can also use the original firmware. Using the original firmware is easier, "
+"using OpenWRT gives you more choices and control. Check the OpenWRT webpages "
+"for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported "
+"hardware </ulink>."
+msgstr ""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:367
+#, fuzzy
msgid ""
-"It's possible to use a different network setup, this is the <ulink "
+"It is possible to use a different network setup, this is the <ulink "
"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented "
"procedure </ulink> to do this. If you are not forced to do this by an "
"existing network infrastructure, we recommend against doing so and recommend "
@@ -1468,6 +1464,12 @@ msgstr ""
"Edu/Skolelinux einfach nur mal ausprobieren wollen, müssen Sie sich weiter "
"keinen Gedanken machen. Das wird sicher funktionieren. <inlinemediaobject>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386
+#: release-manual.xml:2457
+msgid "<phrase>:-) </phrase>"
+msgstr "<phrase>:-) </phrase>"
+
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:389
#, fuzzy
@@ -1689,12 +1691,6 @@ msgstr ""
"no'>cd at skolelinux.no </ulink> und wir werden Ihnen umgehend die Kosten und "
"Zahlungsweise mitteilen. <inlinemediaobject>"
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504
-#: release-manual.xml:1990
-msgid "<phrase>:) </phrase>"
-msgstr "<phrase>:) </phrase>"
-
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:479
msgid ""
@@ -7484,6 +7480,30 @@ msgstr ""
"no/cd-etch-live/'>HTTP </ulink> oder rsync von ftp.skolelinux.org im "
"Verzeichnis cd-etch-live/ erhältlich."
+# type: Content of: <article><para><section><section><section><para>
+#~ msgid ""
+#~ "If you are looking for a i386 based solution, we recommend <ulink "
+#~ "url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow."
+#~ "no/floppyfw'>floppyfw </ulink>. If you need something for an embedded "
+#~ "router we recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, "
+#~ "check here for <ulink url='http://wiki.openwrt.org/"
+#~ "TableOfHardware'>supported hardware </ulink>. If you are into BSD unix, "
+#~ "<ulink url='http://www.pfsense.org/'>pfsense </ulink> and <ulink "
+#~ "url='http://m0n0.ch/wall/'>m0n0wall </ulink> are good choices. Though "
+#~ "since they are BSD based, we think they are better suited for more "
+#~ "experienced administrators."
+#~ msgstr ""
+#~ "Wenn Sie nach einer i386 basierten Lösung suchen, empfehlen wir: <ulink "
+#~ "url='http://www.ipcop.org'>IPCop </ulink> oder <ulink url='http://www."
+#~ "zelow.no/floppyfw'>floppyfw </ulink>. Wenn Sie etwas benötigen für einen "
+#~ "integrierten Router, empfehlen wir: <ulink url='http://openwrt."
+#~ "org'>OpenWRT </ulink>, sehen Sie hier wegen Hardwareunterstützung: <ulink "
+#~ "url='http://wiki.openwrt.org/TableOfHardware'>supported hardware </"
+#~ "ulink>. Wenn Sie ein BSD Unix nutzen sind, <ulink url='http://www.pfsense."
+#~ "org/'>pfsense </ulink> und <ulink url='http://m0n0.ch/wall/'>m0n0wall </"
+#~ "ulink> eine gute Wahl. Allerdings sind die BSD basierten Systeme unseres "
+#~ "Erachtens besser für erfahrene Administratoren geeignet."
+
# type: Content of: <article><section><section><section><para>
#~ msgid ""
#~ "If sound doesn't sound properly in thin clients when browsing certain "
@@ -7498,10 +7518,12 @@ msgstr ""
# type: CDATA
#~ msgid ""
-#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/libflashsupport_1.0~2219-1_i386.deb\n"
+#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/"
+#~ "libflashsupport_1.0~2219-1_i386.deb\n"
#~ "]]"
#~ msgstr ""
-#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/libflashsupport_1.0~2219-1_i386.deb\n"
+#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/"
+#~ "libflashsupport_1.0~2219-1_i386.deb\n"
#~ "]]"
# type: Content of: <article><section><section><section><para>
diff --git a/documentation/release-manual/release-manual.es.po b/documentation/release-manual/release-manual.es.po
index e0afe02..07122b3 100644
--- a/documentation/release-manual/release-manual.es.po
+++ b/documentation/release-manual/release-manual.es.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2008-03-15 12:05+0100\n"
+"POT-Creation-Date: 2008-03-30 15:39+0200\n"
"PO-Revision-Date: 2007-11-14 15:05+0100\n"
"Last-Translator: \n"
"Language-Team: <es at li.org>\n"
@@ -41,7 +41,7 @@ msgstr ""
#: release-manual.xml:8
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2008-03-15</computeroutput>."
+"computeroutput> package on <computeroutput>2008-03-30</computeroutput>."
msgstr ""
# type: Content of: <article><para><section><para>
@@ -1121,7 +1121,7 @@ msgstr ""
# type: Content of: <article><para><section><title>
#: release-manual.xml:308
#, fuzzy
-msgid "Hardware requierements"
+msgid "Hardware requirements"
msgstr "Requisitos"
# type: Content of: <article><section><itemizedlist><listitem>
@@ -1221,10 +1221,10 @@ msgstr ""
"HowTo/SiteSummary </ulink>"
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:332 release-manual.xml:384 release-manual.xml:2349
-#: release-manual.xml:2386 release-manual.xml:2457
-msgid "<phrase>:-) </phrase>"
-msgstr "<phrase>:-) </phrase>"
+#: release-manual.xml:332 release-manual.xml:476 release-manual.xml:560
+#: release-manual.xml:1504 release-manual.xml:1990
+msgid "<phrase>:) </phrase>"
+msgstr "<phrase>:) </phrase>"
# type: Content of: <article><section><title>
#: release-manual.xml:341
@@ -1283,24 +1283,29 @@ msgid ""
"disable the DHCP server on the router.)"
msgstr ""
-# type: Content of: <article><para><section><section><section><para>
+# type: Content of: <article><section><section><para>
#: release-manual.xml:359
msgid ""
-"If you are looking for a i386 based solution, we recommend <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw </ulink>. If you need something for an embedded router we "
-"recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, check here for "
-"<ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware </"
-"ulink>. If you are into BSD unix, <ulink url='http://www.pfsense."
-"org/'>pfsense </ulink> and <ulink url='http://m0n0.ch/wall/'>m0n0wall </"
-"ulink> are good choices. Though since they are BSD based, we think they are "
-"better suited for more experienced administrators."
+"If you are looking for a i386 based solution (so that you can reuse an old "
+"PC), we recommend <ulink url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
+"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>."
msgstr ""
-# type: Content of: <article><section><section><section><para>
+# type: Content of: <article><section><section><para>
+#: release-manual.xml:363
+msgid ""
+"If you need something for an embedded router or accesspoint we recommend "
+"using <ulink url='http://openwrt.org'>OpenWRT </ulink>, though of course you "
+"can also use the original firmware. Using the original firmware is easier, "
+"using OpenWRT gives you more choices and control. Check the OpenWRT webpages "
+"for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported "
+"hardware </ulink>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
#: release-manual.xml:367
msgid ""
-"It's possible to use a different network setup, this is the <ulink "
+"It is possible to use a different network setup, this is the <ulink "
"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented "
"procedure </ulink> to do this. If you are not forced to do this by an "
"existing network infrastructure, we recommend against doing so and recommend "
@@ -1329,6 +1334,12 @@ msgstr ""
"quieres probar Debian-Edu no lo necesitas, debería funcionar "
"<inlinemediaobject>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386
+#: release-manual.xml:2457
+msgid "<phrase>:-) </phrase>"
+msgstr "<phrase>:-) </phrase>"
+
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:389
#, fuzzy
@@ -1514,12 +1525,6 @@ msgid ""
"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504
-#: release-manual.xml:1990
-msgid "<phrase>:) </phrase>"
-msgstr "<phrase>:) </phrase>"
-
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:479
msgid ""
diff --git a/documentation/release-manual/release-manual.it.po b/documentation/release-manual/release-manual.it.po
index be4b8b3..417c083 100644
--- a/documentation/release-manual/release-manual.it.po
+++ b/documentation/release-manual/release-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2008-03-15 12:06+0100\n"
+"POT-Creation-Date: 2008-03-30 15:39+0200\n"
"PO-Revision-Date: 2008-03-18 21:00+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: italian <debian-edu at lists.debian.org>\n"
@@ -37,9 +37,10 @@ msgstr ""
# type: Content of: <article><section><para>
#: release-manual.xml:8
+#, fuzzy
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2008-03-15</computeroutput>."
+"computeroutput> package on <computeroutput>2008-03-30</computeroutput>."
msgstr ""
"Questo documento è stato inserito nel pacchetto <computeroutput>debian-edu-"
"doc </computeroutput> il <computeroutput>2008-03-15</computeroutput>."
@@ -848,8 +849,10 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:191
-msgid "- access to home directories (*~/.)? - home directories - shared directories?"
-msgstr "- accesso alle home directory (*~/.)? - home directory - directory condivise?"
+msgid ""
+"- access to home directories (*~/.)? - home directories - shared directories?"
+msgstr ""
+"- accesso alle home directory (*~/.)? - home directory - directory condivise?"
# type: Content of: <article><section><section><title>
#: release-manual.xml:197
@@ -861,7 +864,8 @@ msgstr "note a caso"
msgid ""
"These are random notes concerning things which should be included in this "
"document."
-msgstr "Queste sono note a caso che dovrebbero essere incluse in questo documento."
+msgstr ""
+"Queste sono note a caso che dovrebbero essere incluse in questo documento."
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:200
@@ -1172,7 +1176,8 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: release-manual.xml:308
-msgid "Hardware requierements"
+#, fuzzy
+msgid "Hardware requirements"
msgstr "Requisiti hardware"
# type: Content of: <article><section><itemizedlist><listitem>
@@ -1283,11 +1288,11 @@ msgstr ""
"org/DebianEdu/Hardware/'>http://wiki.debian.org/DebianEdu/Hardware/ </"
"ulink> . Questa lista è ancora incompleta <inlinemediaobject>"
-# type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
-#: release-manual.xml:332 release-manual.xml:384 release-manual.xml:2349
-#: release-manual.xml:2386 release-manual.xml:2457
-msgid "<phrase>:-) </phrase>"
-msgstr "<phrase>:-) </phrase>"
+# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
+#: release-manual.xml:332 release-manual.xml:476 release-manual.xml:560
+#: release-manual.xml:1504 release-manual.xml:1990
+msgid "<phrase>:) </phrase>"
+msgstr "<phrase>:) </phrase>"
# type: Content of: <article><section><title>
#: release-manual.xml:341
@@ -1353,33 +1358,30 @@ msgstr ""
"perderanno alcune funzionalità e alcune procedure documentate funzioneranno "
"in maniera diversa. Così è meglio disabilitare il server DHCP nel router.)"
-# type: Content of: <article><section><section><section><para>
+# type: Content of: <article><section><section><para>
#: release-manual.xml:359
msgid ""
-"If you are looking for a i386 based solution, we recommend <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw </ulink>. If you need something for an embedded router we "
-"recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, check here for "
-"<ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware </"
-"ulink>. If you are into BSD unix, <ulink url='http://www.pfsense."
-"org/'>pfsense </ulink> and <ulink url='http://m0n0.ch/wall/'>m0n0wall </"
-"ulink> are good choices. Though since they are BSD based, we think they are "
-"better suited for more experienced administrators."
-msgstr ""
-"Se si sta cercando una soluzione per un computer i386, si consiglia <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> o <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw </ulink>. Se si vuole un router incorporato la soluzione "
-"migliore è <ulink url='http://openwrt.org'>OpenWRT </ulink>, verifica <ulink "
-"url='http://wiki.openwrt.org/TableOfHardware'> per l'hardware supportato </"
-"ulink>. Se si ha BSD unix, <ulink url='http://www.pfsense.org/'>pfsense </"
-"ulink> e <ulink url='http://m0n0.ch/wall/'>m0n0wall </ulink> sono buone "
-"scelte. Anche se essendo sviluppate in BSD, pensiamo che siano adattiper "
-"amministratori con maggiore esperienza."
+"If you are looking for a i386 based solution (so that you can reuse an old "
+"PC), we recommend <ulink url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
+"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: release-manual.xml:363
+msgid ""
+"If you need something for an embedded router or accesspoint we recommend "
+"using <ulink url='http://openwrt.org'>OpenWRT </ulink>, though of course you "
+"can also use the original firmware. Using the original firmware is easier, "
+"using OpenWRT gives you more choices and control. Check the OpenWRT webpages "
+"for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported "
+"hardware </ulink>."
+msgstr ""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:367
+#, fuzzy
msgid ""
-"It's possible to use a different network setup, this is the <ulink "
+"It is possible to use a different network setup, this is the <ulink "
"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented "
"procedure </ulink> to do this. If you are not forced to do this by an "
"existing network infrastructure, we recommend against doing so and recommend "
@@ -1412,6 +1414,12 @@ msgstr ""
"vuole invece provare Debian Edu/Skolelinux, non ci sono problemi, dovrebbe "
"funzionare<inlinemediaobject>"
+# type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
+#: release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386
+#: release-manual.xml:2457
+msgid "<phrase>:-) </phrase>"
+msgstr "<phrase>:-) </phrase>"
+
# type: Content of: <article><section><section><para>
#: release-manual.xml:389
msgid ""
@@ -1628,12 +1636,6 @@ msgstr ""
"<ulink url='mailto:cd at skolelinux.no'>cd at skolelinux.no </ulink> e informeremo "
"sul dettagglio dei pagamenti (per l'invio dei media) <inlinemediaobject>"
-# type: Content of: <article><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
-#: release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504
-#: release-manual.xml:1990
-msgid "<phrase>:) </phrase>"
-msgstr "<phrase>:) </phrase>"
-
# type: Content of: <article><section><section><para>
#: release-manual.xml:479
msgid ""
@@ -1803,7 +1805,8 @@ msgstr "Scegliere un time-zone"
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:531
msgid "Choose a keyboard keymap (usually the countrys default is fine)"
-msgstr "Scegliere una mappa di tastiera (in genere la tastiera di default va bene)"
+msgstr ""
+"Scegliere una mappa di tastiera (in genere la tastiera di default va bene)"
# type: Content of: <article><section><section><itemizedlist><listitem><para>
#: release-manual.xml:533
@@ -1918,7 +1921,8 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:555
-msgid "say yes to automatic partioning, it will destroy the data on the harddrives!"
+msgid ""
+"say yes to automatic partioning, it will destroy the data on the harddrives!"
msgstr ""
"rispondi yes al partizionamento automatico, questo distruggerà tutti i dati "
"negli hard disk!"
@@ -2077,7 +2081,8 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: release-manual.xml:615
-msgid "Screenshot tour through an i386 main-server + thin-client-server installation"
+msgid ""
+"Screenshot tour through an i386 main-server + thin-client-server installation"
msgstr ""
"Schermi di esempio per una installazione i386 server principale+ thin-client-"
"server"
@@ -3399,7 +3404,8 @@ msgstr "Aggiornamento da Debian Edu sarge"
# type: Content of: <article><section><section><para>
#: release-manual.xml:1202
-msgid "Please read this chapter completly before you start upgrading your systems."
+msgid ""
+"Please read this chapter completly before you start upgrading your systems."
msgstr ""
"Occorre leggere completamente questo capitolo prima di cominciare a fare "
"l'aggiornamento del sistema."
@@ -3442,12 +3448,14 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem>
#: release-manual.xml:1214
msgid "vg_data which holds the Data Partition as /skole/tjener/home0, ..."
-msgstr "vg_data che contiene i dati della partizione come /skole/tjener/home0, ..."
+msgstr ""
+"vg_data che contiene i dati della partizione come /skole/tjener/home0, ..."
# type: Content of: <article><section><section><section><itemizedlist><listitem>
#: release-manual.xml:1215
msgid "vg_system contains System Partitions as /var, /usr /var/spool/squid"
-msgstr "vg_system contiene la partizione del Sistema come /var, /usr /var/spool/squid"
+msgstr ""
+"vg_system contiene la partizione del Sistema come /var, /usr /var/spool/squid"
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1218
@@ -3645,7 +3653,8 @@ msgstr "* Configurare nagios-common."
msgid ""
"Here you have to enter a password for the <emphasis>nagiosadmin </emphasis> "
"user."
-msgstr "Occorre inserire una password per l'utente <emphasis>nagiosadmin </emphasis>."
+msgstr ""
+"Occorre inserire una password per l'utente <emphasis>nagiosadmin </emphasis>."
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1285
@@ -3706,7 +3715,8 @@ msgstr "Al prompt inserire: <emphasis>ldaps://ldap/ </emphasis>"
# type: Content of: <article><section><section><section><orderedlist><listitem><para>
#: release-manual.xml:1307
-msgid "Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
+msgid ""
+"Change the prompt to: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
msgstr "Al prompt inserire: <emphasis>dc=skole,dc=skolelinux,dc=no </emphasis>"
# type: Content of: <article><section><section><section><orderedlist><listitem>
@@ -3907,7 +3917,8 @@ msgstr "aptitude remove courier-ldap]]"
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1369
-msgid "and wait until it is finished.Then restart the dist-upgrade process again."
+msgid ""
+"and wait until it is finished.Then restart the dist-upgrade process again."
msgstr "e aspettare fino alla fine.Poi riavviare di nuovo dist-upgrade."
# type: Content of: <article><section><section><section><para>
@@ -4033,8 +4044,10 @@ msgstr "HowTo"
# type: Content of: <article><section><itemizedlist><listitem><para>
#: release-manual.xml:1414
-msgid "HowTos for <link linkend=\"Administration\">general administration</link>"
-msgstr "HowTo per <link linkend=\"Administration\">amministrazione generale</link>"
+msgid ""
+"HowTos for <link linkend=\"Administration\">general administration</link>"
+msgstr ""
+"HowTo per <link linkend=\"Administration\">amministrazione generale</link>"
# type: Content of: <article><section><itemizedlist><listitem><para>
#: release-manual.xml:1417
@@ -4073,7 +4086,8 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: release-manual.xml:1438
-msgid "Installing single service machines for spreading the load from main-server"
+msgid ""
+"Installing single service machines for spreading the load from main-server"
msgstr ""
"Installare singoli servizi sulle macchine per distribuire il carico del "
"server principale"
@@ -4240,8 +4254,10 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1497
-msgid "To manually commit a file, because you don't want to wait up to an hour:"
-msgstr "Per registrare i manualmente cambiamenti di un file senza aspettare un'ora:"
+msgid ""
+"To manually commit a file, because you don't want to wait up to an hour:"
+msgstr ""
+"Per registrare i manualmente cambiamenti di un file senza aspettare un'ora:"
# type: CDATA
#: release-manual.xml:1500
@@ -4303,7 +4319,8 @@ msgstr ""
msgid ""
"This adds all files in /etc to svk and also activates the hourly commit "
"cronjob."
-msgstr "Il comando aggiunge in /etc tutti i file a svk e attiva il commit cronjob."
+msgstr ""
+"Il comando aggiunge in /etc tutti i file a svk e attiva il commit cronjob."
# type: Content of: <article><section><section><title>
#: release-manual.xml:1530
@@ -4394,7 +4411,8 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1553
msgid "For example, to extend home0 to 30GB you use the following commands:"
-msgstr "Per esempio per aumentare home0 a 30GB si può usare i seguenti comandi:"
+msgstr ""
+"Per esempio per aumentare home0 a 30GB si può usare i seguenti comandi:"
# type: CDATA
#: release-manual.xml:1556
@@ -4795,7 +4813,8 @@ msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:1743
msgid "customized set of icons appears on student desktops"
-msgstr "personalizzare l'insieme delle icone che appaiano nel desktop degli studenti"
+msgstr ""
+"personalizzare l'insieme delle icone che appaiano nel desktop degli studenti"
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:1744
@@ -4814,12 +4833,14 @@ msgstr "adept non è partito"
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:1746
msgid "makes sure that students cannot start another kde session"
-msgstr "occorre assicurarsi che gli studenti non inizino con un'altra sezione di kde"
+msgstr ""
+"occorre assicurarsi che gli studenti non inizino con un'altra sezione di kde"
# type: Content of: <article><section><section><itemizedlist><listitem>
#: release-manual.xml:1747
msgid "disables possibility to gain root access for students"
-msgstr "disabilitare la possibilità di acquisire l'accesso di root per gli studenti"
+msgstr ""
+"disabilitare la possibilità di acquisire l'accesso di root per gli studenti"
# type: Content of: <article><section><section><para>
#: release-manual.xml:1750
@@ -5295,7 +5316,8 @@ msgstr "MODULE_01 = \"snd-pcm-oss\""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:1945
msgid "should be added to the server in the /opt/ltsp/i386/etc/lts.conf file."
-msgstr "dovrebbe essere aggiunta al server nel file /opt/ltsp/i386/etc/lts.conf"
+msgstr ""
+"dovrebbe essere aggiunta al server nel file /opt/ltsp/i386/etc/lts.conf"
# type: Content of: <article><section><section><title>
#: release-manual.xml:1951
@@ -5353,7 +5375,8 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: release-manual.xml:1975
msgid "If you are on the thin client network, please run this command:"
-msgstr "Se siamo suun thin client nella retenetwork, occorre eseguire questo comando:"
+msgstr ""
+"Se siamo suun thin client nella retenetwork, occorre eseguire questo comando:"
# type: CDATA
#: release-manual.xml:1978
@@ -5475,7 +5498,8 @@ msgstr ""
msgid ""
"1. Create a user with membership in the \"admins\" group (if not already "
"existing)"
-msgstr "1. Creare un utente (se già non esiste) come membro del gruppo \"admins\""
+msgstr ""
+"1. Creare un utente (se già non esiste) come membro del gruppo \"admins\""
# type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:2024
@@ -5541,7 +5565,8 @@ msgstr ""
# type: Content of: <article><section><section><section><para>
#: release-manual.xml:2039
msgid "4. Join the domain as usual using the user added in step 1."
-msgstr "4. Collegarsi al dominio normalmente usando l'utente definito al passo 1."
+msgstr ""
+"4. Collegarsi al dominio normalmente usando l'utente definito al passo 1."
# type: Content of: <article><section><section><section><itemizedlist><listitem>
#: release-manual.xml:2040
@@ -5716,12 +5741,14 @@ msgstr "Usare una politica per le macchine"
# type: Content of: <article><section><section><section><section><para>
#: release-manual.xml:2085
msgid "Machine policies can be edited and copied to all the other computers."
-msgstr "Si può modificare la policy della macchina e copiarla in altri computer."
+msgstr ""
+"Si può modificare la policy della macchina e copiarla in altri computer."
# type: Content of: <article><section><section><section><section><orderedlist><listitem>
#: release-manual.xml:2086
msgid "Pick a freshly installed Windows computer, and run gpedit.msc"
-msgstr "Scegliere un computer con windows appena installato e eseguire gpedit.msc"
+msgstr ""
+"Scegliere un computer con windows appena installato e eseguire gpedit.msc"
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: release-manual.xml:2088
@@ -5838,8 +5865,10 @@ msgstr ""
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: release-manual.xml:2125
-msgid "Use the menu <computeroutput>Edit menu->New->String Value </computeroutput>."
-msgstr "Usare il menu <computeroutput>Edit menu->New->String Value </computeroutput>."
+msgid ""
+"Use the menu <computeroutput>Edit menu->New->String Value </computeroutput>."
+msgstr ""
+"Usare il menu <computeroutput>Edit menu->New->String Value </computeroutput>."
# type: Content of: <article><section><section><section><section><orderedlist><listitem><para>
#: release-manual.xml:2129
@@ -5917,8 +5946,10 @@ msgstr ""
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:2172
-msgid "User Configuration -> Administrative Templates -> Network -> Offline Files"
-msgstr "User Configuration -> Administrative Templates -> Network -> Offline Files"
+msgid ""
+"User Configuration -> Administrative Templates -> Network -> Offline Files"
+msgstr ""
+"User Configuration -> Administrative Templates -> Network -> Offline Files"
# type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
#: release-manual.xml:2175
@@ -6486,7 +6517,8 @@ msgstr ""
# type: Content of: <article><section><section><section><itemizedlist><listitem>
#: release-manual.xml:2476
msgid "#skolelinux on irc.debian.org - IRC channel to support norwegian users"
-msgstr "#skolelinux on irc.debian.org - IRC channel per aiutare utenti norvegesi"
+msgstr ""
+"#skolelinux on irc.debian.org - IRC channel per aiutare utenti norvegesi"
# type: Content of: <article><section><section><section><title>
#: release-manual.xml:2482
@@ -7580,7 +7612,8 @@ msgstr "Accorgimenti da conoscere"
# type: Content of: <article><section><section><section><itemizedlist><listitem>
#: release-manual.xml:2840
msgid "the password for the user is \"user\", root has no passwd set."
-msgstr "la password per gli utenti è \"user\", root non ha una password selezionata."
+msgstr ""
+"la password per gli utenti è \"user\", root non ha una password selezionata."
# type: Content of: <article><section><section><section><title>
#: release-manual.xml:2846
@@ -7609,3 +7642,26 @@ msgstr ""
"skolelinux.org/cd-etch-live/'>HTTP </ulink> o rsync da ftp.skolelinux.org at "
"cd-etch-live/."
+# type: Content of: <article><section><section><section><para>
+#~ msgid ""
+#~ "If you are looking for a i386 based solution, we recommend <ulink "
+#~ "url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow."
+#~ "no/floppyfw'>floppyfw </ulink>. If you need something for an embedded "
+#~ "router we recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, "
+#~ "check here for <ulink url='http://wiki.openwrt.org/"
+#~ "TableOfHardware'>supported hardware </ulink>. If you are into BSD unix, "
+#~ "<ulink url='http://www.pfsense.org/'>pfsense </ulink> and <ulink "
+#~ "url='http://m0n0.ch/wall/'>m0n0wall </ulink> are good choices. Though "
+#~ "since they are BSD based, we think they are better suited for more "
+#~ "experienced administrators."
+#~ msgstr ""
+#~ "Se si sta cercando una soluzione per un computer i386, si consiglia "
+#~ "<ulink url='http://www.ipcop.org'>IPCop </ulink> o <ulink url='http://www."
+#~ "zelow.no/floppyfw'>floppyfw </ulink>. Se si vuole un router incorporato "
+#~ "la soluzione migliore è <ulink url='http://openwrt.org'>OpenWRT </ulink>, "
+#~ "verifica <ulink url='http://wiki.openwrt.org/TableOfHardware'> per "
+#~ "l'hardware supportato </ulink>. Se si ha BSD unix, <ulink url='http://"
+#~ "www.pfsense.org/'>pfsense </ulink> e <ulink url='http://m0n0.ch/"
+#~ "wall/'>m0n0wall </ulink> sono buone scelte. Anche se essendo sviluppate "
+#~ "in BSD, pensiamo che siano adattiper amministratori con maggiore "
+#~ "esperienza."
diff --git a/documentation/release-manual/release-manual.nb.po b/documentation/release-manual/release-manual.nb.po
index 1469e28..06e8db4 100644
--- a/documentation/release-manual/release-manual.nb.po
+++ b/documentation/release-manual/release-manual.nb.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
-"POT-Creation-Date: 2008-03-15 12:06+0100\n"
+"POT-Creation-Date: 2008-03-30 15:39+0200\n"
"PO-Revision-Date: 2008-02-24 21:09+0100\n"
"Last-Translator: Håvard Korsvoll <korsvoll at skulelinux.no>\n"
"Language-Team: Norwegian Bokmål <i18n-no at lister.ping.uio.no>\n"
@@ -41,7 +41,7 @@ msgstr ""
#, fuzzy
msgid ""
"This document was put into the <computeroutput>debian-edu-doc </"
-"computeroutput> package on <computeroutput>2008-03-15</computeroutput>."
+"computeroutput> package on <computeroutput>2008-03-30</computeroutput>."
msgstr ""
"Dette dokumentet ble plassert i pakken <computeroutput>debian-edu-doc</"
"computeroutput> på tidspunktet <computeroutput>2008-01-19</computeroutput>."
@@ -1161,7 +1161,7 @@ msgstr ""
# type: Content of: <article><para><section><section><title>
#: release-manual.xml:308
#, fuzzy
-msgid "Hardware requierements"
+msgid "Hardware requirements"
msgstr "Nettverkskrav"
# type: Content of: <article><section><itemizedlist><listitem>
@@ -1272,10 +1272,10 @@ msgstr ""
"org/DebianEdu/Hardware/'>http://wiki.debian.org/DebianEdu/Hardware/</ulink>."
# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:332 release-manual.xml:384 release-manual.xml:2349
-#: release-manual.xml:2386 release-manual.xml:2457
-msgid "<phrase>:-) </phrase>"
-msgstr "<phrase>:-) </phrase>"
+#: release-manual.xml:332 release-manual.xml:476 release-manual.xml:560
+#: release-manual.xml:1504 release-manual.xml:1990
+msgid "<phrase>:) </phrase>"
+msgstr "<phrase>:) </phrase>"
# type: Content of: <article><section><title>
#: release-manual.xml:341
@@ -1340,33 +1340,30 @@ msgid ""
"disable the DHCP server on the router.)"
msgstr ""
-# type: Content of: <article><para><section><section><section><para>
+# type: Content of: <article><section><section><para>
#: release-manual.xml:359
msgid ""
-"If you are looking for a i386 based solution, we recommend <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw </ulink>. If you need something for an embedded router we "
-"recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, check here for "
-"<ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware </"
-"ulink>. If you are into BSD unix, <ulink url='http://www.pfsense."
-"org/'>pfsense </ulink> and <ulink url='http://m0n0.ch/wall/'>m0n0wall </"
-"ulink> are good choices. Though since they are BSD based, we think they are "
-"better suited for more experienced administrators."
-msgstr ""
-"Viss du ser etter en i386-basert løsning, kan vi anbefale <ulink url='http://"
-"www.ipcop.org'>IPCop</ulink> eller <ulink url='http://www.zelow.no/"
-"floppyfw'>floppyfw</ulink>. Viss du trenger noe for en innebygd ruter kan vi "
-"anbefale <ulink url='http://openwrt.org'>OpenWRT</ulink>, se her for <ulink "
-"url='http://wiki.openwrt.org/TableOfHardware'>støttet maskinvare</ulink>. "
-"Viss du liker BSD unix, <ulink url='http://www.pfsense.org/'>pfsense</ulink> "
-"og <ulink url='http://m0n0.ch/wall/'>mOnOwall</ulink> er gode alternativer. "
-"Men siden de er BSD-basert, tror vi de er mer tilpasset erfarne "
-"administratorer."
+"If you are looking for a i386 based solution (so that you can reuse an old "
+"PC), we recommend <ulink url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
+"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: release-manual.xml:363
+msgid ""
+"If you need something for an embedded router or accesspoint we recommend "
+"using <ulink url='http://openwrt.org'>OpenWRT </ulink>, though of course you "
+"can also use the original firmware. Using the original firmware is easier, "
+"using OpenWRT gives you more choices and control. Check the OpenWRT webpages "
+"for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported "
+"hardware </ulink>."
+msgstr ""
# type: Content of: <article><para><section><section><section><para>
#: release-manual.xml:367
+#, fuzzy
msgid ""
-"It's possible to use a different network setup, this is the <ulink "
+"It is possible to use a different network setup, this is the <ulink "
"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented "
"procedure </ulink> to do this. If you are not forced to do this by an "
"existing network infrastructure, we recommend against doing so and recommend "
@@ -1401,6 +1398,12 @@ msgstr ""
"bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det skal bare "
"fungere <inlinemediaobject>"
+# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386
+#: release-manual.xml:2457
+msgid "<phrase>:-) </phrase>"
+msgstr "<phrase>:-) </phrase>"
+
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:389
#, fuzzy
@@ -1619,12 +1622,6 @@ msgstr ""
"post til <ulink url='mailto:cd at skolelinux.no'>cd at skolelinux.no</ulink> og vi "
"vil diskutere hvordan du får betalt<inlinemediaobject>"
-# type: Content of: <article><para><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504
-#: release-manual.xml:1990
-msgid "<phrase>:) </phrase>"
-msgstr "<phrase>:) </phrase>"
-
# type: Content of: <article><para><section><section><para>
#: release-manual.xml:479
msgid ""
@@ -7267,6 +7264,29 @@ msgstr ""
"no/cd-etch-live/'>HTTP</ulink> eller rsync fra ftp.skolelinux.org ved cd-"
"etch-live/"
+# type: Content of: <article><para><section><section><section><para>
+#~ msgid ""
+#~ "If you are looking for a i386 based solution, we recommend <ulink "
+#~ "url='http://www.ipcop.org'>IPCop </ulink> or <ulink url='http://www.zelow."
+#~ "no/floppyfw'>floppyfw </ulink>. If you need something for an embedded "
+#~ "router we recommend <ulink url='http://openwrt.org'>OpenWRT </ulink>, "
+#~ "check here for <ulink url='http://wiki.openwrt.org/"
+#~ "TableOfHardware'>supported hardware </ulink>. If you are into BSD unix, "
+#~ "<ulink url='http://www.pfsense.org/'>pfsense </ulink> and <ulink "
+#~ "url='http://m0n0.ch/wall/'>m0n0wall </ulink> are good choices. Though "
+#~ "since they are BSD based, we think they are better suited for more "
+#~ "experienced administrators."
+#~ msgstr ""
+#~ "Viss du ser etter en i386-basert løsning, kan vi anbefale <ulink "
+#~ "url='http://www.ipcop.org'>IPCop</ulink> eller <ulink url='http://www."
+#~ "zelow.no/floppyfw'>floppyfw</ulink>. Viss du trenger noe for en innebygd "
+#~ "ruter kan vi anbefale <ulink url='http://openwrt.org'>OpenWRT</ulink>, se "
+#~ "her for <ulink url='http://wiki.openwrt.org/TableOfHardware'>støttet "
+#~ "maskinvare</ulink>. Viss du liker BSD unix, <ulink url='http://www."
+#~ "pfsense.org/'>pfsense</ulink> og <ulink url='http://m0n0.ch/"
+#~ "wall/'>mOnOwall</ulink> er gode alternativer. Men siden de er BSD-basert, "
+#~ "tror vi de er mer tilpasset erfarne administratorer."
+
# type: Content of: <article><section><section><section><para>
#~ msgid ""
#~ "If sound doesn't sound properly in thin clients when browsing certain "
@@ -7279,10 +7299,12 @@ msgstr ""
# type: CDATA
#~ msgid ""
-#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/libflashsupport_1.0~2219-1_i386.deb\n"
+#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/"
+#~ "libflashsupport_1.0~2219-1_i386.deb\n"
#~ "]]"
#~ msgstr ""
-#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/libflashsupport_1.0~2219-1_i386.deb\n"
+#~ "wget http://pulseaudio.vdbonline.net/libflashsupport/"
+#~ "libflashsupport_1.0~2219-1_i386.deb\n"
#~ "]]"
# type: Content of: <article><section><section><section><para>
diff --git a/documentation/release-manual/release-manual.pot b/documentation/release-manual/release-manual.pot
index 931d8cf..e6a8f42 100644
--- a/documentation/release-manual/release-manual.pot
+++ b/documentation/release-manual/release-manual.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-03-15 12:05+0100\n"
+"POT-Creation-Date: 2008-03-30 15:38+0200\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"
@@ -35,7 +35,7 @@ msgstr ""
#: release-manual.xml:8
msgid ""
"This document was put into the <computeroutput>debian-edu-doc "
-"</computeroutput> package on <computeroutput>2008-03-15</computeroutput>."
+"</computeroutput> package on <computeroutput>2008-03-30</computeroutput>."
msgstr ""
# type: Content of: <article><section><para>
@@ -905,7 +905,7 @@ msgstr ""
# type: Content of: <article><section><section><title>
#: release-manual.xml:308
-msgid "Hardware requierements"
+msgid "Hardware requirements"
msgstr ""
# type: Content of: <article><section><section><itemizedlist><listitem>
@@ -994,9 +994,9 @@ msgid ""
"</ulink> . This list is not nearly complete <inlinemediaobject>"
msgstr ""
-# type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
-#: release-manual.xml:332 release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386 release-manual.xml:2457
-msgid "<phrase>:-) </phrase>"
+# type: Content of: <article><section><section><para><inlinemediaobject><textobject>
+#: release-manual.xml:332 release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504 release-manual.xml:1990
+msgid "<phrase>:) </phrase>"
msgstr ""
# type: Content of: <article><section><title>
@@ -1055,23 +1055,26 @@ msgstr ""
# type: Content of: <article><section><section><para>
#: release-manual.xml:359
msgid ""
-"If you are looking for a i386 based solution, we recommend <ulink "
-"url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
-"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>. If you need something "
-"for an embedded router we recommend <ulink url='http://openwrt.org'>OpenWRT "
-"</ulink>, check here for <ulink "
-"url='http://wiki.openwrt.org/TableOfHardware'>supported hardware "
-"</ulink>. If you are into BSD unix, <ulink "
-"url='http://www.pfsense.org/'>pfsense </ulink> and <ulink "
-"url='http://m0n0.ch/wall/'>m0n0wall </ulink> are good choices. Though since "
-"they are BSD based, we think they are better suited for more experienced "
-"administrators."
+"If you are looking for a i386 based solution (so that you can reuse an old "
+"PC), we recommend <ulink url='http://www.ipcop.org'>IPCop </ulink> or <ulink "
+"url='http://www.zelow.no/floppyfw'>floppyfw </ulink>."
+msgstr ""
+
+# type: Content of: <article><section><section><para>
+#: release-manual.xml:363
+msgid ""
+"If you need something for an embedded router or accesspoint we recommend "
+"using <ulink url='http://openwrt.org'>OpenWRT </ulink>, though of course you "
+"can also use the original firmware. Using the original firmware is easier, "
+"using OpenWRT gives you more choices and control. Check the OpenWRT webpages "
+"for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported "
+"hardware </ulink>."
msgstr ""
# type: Content of: <article><section><section><para>
#: release-manual.xml:367
msgid ""
-"It's possible to use a different network setup, this is the <ulink "
+"It is possible to use a different network setup, this is the <ulink "
"url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented "
"procedure </ulink> to do this. If you are not forced to do this by an "
"existing network infrastructure, we recommend against doing so and recommend "
@@ -1094,6 +1097,11 @@ msgid ""
"though, it should just work <inlinemediaobject>"
msgstr ""
+# type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject>
+#: release-manual.xml:384 release-manual.xml:2349 release-manual.xml:2386 release-manual.xml:2457
+msgid "<phrase>:-) </phrase>"
+msgstr ""
+
# type: Content of: <article><section><section><para>
#: release-manual.xml:389
msgid ""
@@ -1272,11 +1280,6 @@ msgid ""
"the payment details (for shipping and media) <inlinemediaobject>"
msgstr ""
-# type: Content of: <article><section><section><para><inlinemediaobject><textobject>
-#: release-manual.xml:476 release-manual.xml:560 release-manual.xml:1504 release-manual.xml:1990
-msgid "<phrase>:) </phrase>"
-msgstr ""
-
# type: Content of: <article><section><section><para>
#: release-manual.xml:479
msgid ""
diff --git a/documentation/release-manual/release-manual.xml b/documentation/release-manual/release-manual.xml
index fe00124..7d2776f 100644
--- a/documentation/release-manual/release-manual.xml
+++ b/documentation/release-manual/release-manual.xml
@@ -6,7 +6,7 @@
</emphasis>) release manual for the Debian Edu Etch 3.0 release.
</para>
<para>This document was put into the <computeroutput>debian-edu-doc
-</computeroutput> package on <computeroutput>2008-03-15</computeroutput>.
+</computeroutput> package on <computeroutput>2008-03-30</computeroutput>.
</para>
<para>The version at <ulink url='http://wiki.debian.org/DebianEdu/Documentation/Etch'>http://wiki.debian.org/DebianEdu/Documentation/Etch
</ulink> is a wiki and updated frequently.
@@ -301,15 +301,15 @@
</title>
<para>
</para>
-<para>There are different ways of set up a Skolelinux solution. It can be installed on just one standalone PC or a regional wide solution at many schools operated centrally. This variety of configurations makes a huge difference on how things are set up regarding network components, servers and client machines.
+<para>There are different ways of set up a Skolelinux solution. It can be installed on just one standalone PC or a regional wide solution at many schools operated centrally. This variety of configurations makes a huge difference on how things are set up regarding network components, servers and client machines.
</para>
<section>
-<title>Hardware requierements
-</title><itemizedlist><listitem>the computers running Debian Edu / Skolelinux must have either i386, amd64 or powerpc processors. <itemizedlist><listitem>On powerpc, the installation media will only boot on machines of the newworld sub-architecture, which are the systems from apple with a translucent case
+<title>Hardware requirements
+</title><itemizedlist><listitem>the computers running Debian Edu / Skolelinux must have either i386, amd64 or powerpc processors. <itemizedlist><listitem>On powerpc, the installation media will only boot on machines of the newworld sub-architecture, which are the systems from apple with a translucent case
</listitem>
</itemizedlist>
-</listitem><listitem>thin client (LTSP) servers need two network cards when using the default network architecture: <itemizedlist><listitem>eth0 connected to the main network (10.0.2.0/23)
+</listitem><listitem>thin client (LTSP) servers need two network cards when using the default network architecture: <itemizedlist><listitem>eth0 connected to the main network (10.0.2.0/23)
</listitem><listitem>eth1 (192.168.0.0/24) serving the thin-clients
</listitem>
</itemizedlist>
@@ -329,7 +329,7 @@
</title>
<para>A list of tested hardware is provided from <ulink url='http://wiki.debian.org/DebianEdu/Hardware/'>http://wiki.debian.org/DebianEdu/Hardware/
</ulink> . This list is not nearly complete <inlinemediaobject><imageobject><imagedata width='15' fileref='./images/smile.png' depth='15'/>
-</imageobject><textobject><phrase>:-)
+</imageobject><textobject><phrase>:)
</phrase>
</textobject>
</inlinemediaobject>
@@ -345,26 +345,26 @@
</computeroutput>-profile installed
</para>
</listitem><listitem>workstation(s) and/or thin client (LTSP) server(s)
-</listitem><listitem>thin clients clients
+</listitem><listitem>thin clients clients
</listitem>
</itemizedlist>
<section>
<title>Internet router
</title>
-<para>A router/gateway, connected to the internet on the external interface and running on the IP address 10.0.2.1 on the internal interface, is needed to connect to the internet.
+<para>A router/gateway, connected to the internet on the external interface and running on the IP address 10.0.2.1 on the internal interface, is needed to connect to the internet.
</para>
<para>The router should not run a DHCP server, it can run a DNS server, though this is not needed and will not be used. (If the router runs a DHCP server you must disable the DHCP server on the main server and you will loose some features and certain documented procedures will work differently. So better disable the DHCP server on the router.)
</para>
-<para>If you are looking for a i386 based solution, we recommend <ulink url='http://www.ipcop.org'>IPCop
+<para>If you are looking for a i386 based solution (so that you can reuse an old PC), we recommend <ulink url='http://www.ipcop.org'>IPCop
</ulink> or <ulink url='http://www.zelow.no/floppyfw'>floppyfw
-</ulink>. If you need something for an embedded router we recommend <ulink url='http://openwrt.org'>OpenWRT
-</ulink>, check here for <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware
-</ulink>. If you are into BSD unix, <ulink url='http://www.pfsense.org/'>pfsense
-</ulink> and <ulink url='http://m0n0.ch/wall/'>m0n0wall
-</ulink> are good choices. Though since they are BSD based, we think they are better suited for more experienced administrators.
+</ulink>.
+</para>
+<para>If you need something for an embedded router or accesspoint we recommend using <ulink url='http://openwrt.org'>OpenWRT
+</ulink>, though of course you can also use the original firmware. Using the original firmware is easier, using OpenWRT gives you more choices and control. Check the OpenWRT webpages for a list of <ulink url='http://wiki.openwrt.org/TableOfHardware'>supported hardware
+</ulink>.
</para>
-<para>It's possible to use a different network setup, this is the <ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented procedure
+<para>It is possible to use a different network setup, this is the <ulink url='http://wiki.debian.org/DebianEdu/HowTo/ChangeIpSubnet'>documented procedure
</ulink> to do this. If you are not forced to do this by an existing network infrastructure, we recommend against doing so and recommend you stay with the default <link linkend="Architecture">network architecture</link>.
</para>
</section>
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