[SCM] live-manual branch, debian, updated. debian/2.0.0-1-25-g04c3836
Daniel Baumann
daniel at debian.org
Fri Dec 17 12:52:41 UTC 2010
The following commit has been merged in the debian branch:
commit 04c383628a03e041efe279dfcab67ee46fa9c454
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Dec 17 13:52:02 2010 +0100
Unfuzzy an Italian translation string.
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 7619537..3703714 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -360,10 +360,11 @@ code{
}code
Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
3~ Netboot testing HowTo
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 7619537..3703714 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -360,10 +360,11 @@ code{
}code
Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
3~ Netboot testing HowTo
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index de7f884..97baa78 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -373,10 +373,12 @@ code{
}code
-Configurare questi tre servizi può essere un po' problematico. Serve un po'
-di pazienza per farli funzionare assieme. Giacché il procedimento è molto
-simile, la sezione per l'avvio TFTP da rete del manuale del Debian Installer
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html può essere d'aiuto.
+Setting up these three services can be a little tricky. You might need some
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
3~ Come provare una netboot
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index c798eb9..e6958a2 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -715,9 +715,11 @@ msgstr ""
#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 1271072..1dc0647 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -715,9 +715,11 @@ msgstr ""
#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 044cf16..a5a397e 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\n"
"PO-Revision-Date: 2010-12-16 15:04+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -762,15 +762,19 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:236
-#, fuzzy, no-wrap
-#| msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+#, no-wrap
msgid ""
"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
" range 192.168.0.1 192.168.0.254;\n"
" next-server servername;\n"
" filename \"pxelinux.0\";\n"
"}\n"
-msgstr "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
+msgstr ""
+"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
+"}\n"
#. type: Plain text
#: en/user_basics.ssi:240
@@ -853,11 +857,19 @@ msgstr "# exportfs -rv"
#. type: Plain text
#: en/user_basics.ssi:276
+#, fuzzy
+#| msgid ""
+#| "Setting up these three services can be a little tricky. You might need "
+#| "some patience to get all of them working together. The Debian Installer "
+#| "Manual's TFTP Net Booting section at http://d-i.alioth.debian.org/manual/"
+#| "en.i386/ch04s05.html might help as that process is very similar."
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
"Configurare questi tre servizi può essere un po' problematico. Serve un po' "
"di pazienza per farli funzionare assieme. Giacché il procedimento è molto "
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 8fce478..8f58fe8 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -715,9 +715,11 @@ msgstr ""
#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 18e0e23..46f0e79 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -716,9 +716,11 @@ msgstr ""
#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index bebabe8..cf5ed24 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-17 13:34+0100\n"
+"POT-Creation-Date: 2010-12-17 13:44+0100\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"
@@ -715,9 +715,11 @@ msgstr ""
#: en/user_basics.ssi:276
msgid ""
"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 7619537..3703714 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -360,10 +360,11 @@ code{
}code
Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
3~ Netboot testing HowTo
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 7619537..3703714 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -360,10 +360,11 @@ code{
}code
Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
3~ Netboot testing HowTo
--
live-manual
More information about the debian-live-changes
mailing list