[debian-edu-commits] debian-edu/debian-edu-doc.git (#1522) - master (branch) updated: 1.5_20130706_7.1-2-g0b23644
Holger Levsen
holger at alioth.debian.org
Sun Jul 7 14:41:49 UTC 2013
The branch, master has been updated
via 0b2364483a29c3e1e06c618f89bc7b91f777cef8 (commit)
from 1fb5464d14a2f6d3070d9ba6f958a4baa7339259 (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 0b2364483a29c3e1e06c618f89bc7b91f777cef8
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Jul 7 16:40:08 2013 +0200
Update manuals and images from the wiki.
-----------------------------------------------------------------------
Summary of changes:
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.pot | 2 +-
.../debian-edu-wheezy-manual.da.po | 121 ++++++++++--------
.../debian-edu-wheezy-manual.de.po | 122 ++++++++++--------
.../debian-edu-wheezy-manual.es.po | 131 +++++++++----------
.../debian-edu-wheezy-manual.fr.po | 134 +++++++++++---------
.../debian-edu-wheezy-manual.it.po | 121 ++++++++++--------
.../debian-edu-wheezy-manual.nb.po | 105 +++++++--------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 58 +++------
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 34 +----
documentation/debian-edu-wheezy/fixme-status.txt | 4 +-
.../debian-edu-wheezy/images/pxe-tjener.png | Bin 0 -> 114219 bytes
documentation/rosegarden/rosegarden-manual.pot | 2 +-
13 files changed, 416 insertions(+), 420 deletions(-)
create mode 100644 documentation/debian-edu-wheezy/images/pxe-tjener.png
The diff of changes is:
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 43ea9a1..41ea516 100644
--- a/documentation/audacity/audacity-manual.pot
+++ b/documentation/audacity/audacity-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 15:52+0300\n"
+"POT-Creation-Date: 2013-07-07 16:37+0300\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"
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index 0618c3d..307a085 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 15:50+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\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"
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 ba634dc..c4312f7 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-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\n"
"PO-Revision-Date: 2013-02-15 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -2139,44 +2139,13 @@ msgstr "En bemærkning om cd-installationer"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-"En netinst-installation (som er den type som vores cd tilbyder) vil hente "
-"nogle pakker fra cd'en og resten fra nettet. Antallet af pakker hentet fra "
-"nettet varierer fra profil til profil:"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Hovedserver: 8 ud af 115 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr "Hovedserver og server for tynde klienter: 618 af 1082 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr "Hovedserver og arbejdsstation: 618 af 1081 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Server for tynde klienter: 618 af 1052 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Arbejdsstation: 618 af 1051 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Uafhængig: 618 af 1020 MiB hentet."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Minimal: 12 af 83 MiB hentet."
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
@@ -2294,16 +2263,15 @@ msgstr ""
"Det er sådan her at PXE-menuen ser ud kun med profilen for <emphasis role="
"\"strong\">hovedserveren</emphasis>:"
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| msgid "pxe-tjener.png"
+msgid "./images/pxe-tjener.png"
+msgstr "pxe-tjener.png"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2321,12 +2289,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
@@ -2736,6 +2698,12 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Fjernskrivebord"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/29-Diskless-WS-LDM_Login.png"
msgstr "./images/29-Diskless-WS-KDM_Login.png"
@@ -11320,6 +11288,52 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "En netinst-installation (som er den type som vores cd tilbyder) vil hente "
+#~ "nogle pakker fra cd'en og resten fra nettet. Antallet af pakker hentet "
+#~ "fra nettet varierer fra profil til profil:"
+
+#~ msgid ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+#~ msgstr ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Hovedserver: 8 ud af 115 MiB hentet."
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr "Hovedserver og server for tynde klienter: 618 af 1082 MiB hentet."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr "Hovedserver og arbejdsstation: 618 af 1081 MiB hentet."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Server for tynde klienter: 618 af 1052 MiB hentet."
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Arbejdsstation: 618 af 1051 MiB hentet."
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Uafhængig: 618 af 1020 MiB hentet."
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Minimal: 12 af 83 MiB hentet."
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
+#~ msgid "[attachment:pxe-tjener.png]"
+#~ msgstr "[attachment:pxe-tjener.png]"
+
#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
#~ msgstr "[attachment:24-Tjener-KDE_Start.png]"
@@ -11583,9 +11597,6 @@ msgstr ""
#~ "skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu-fejlen #1395</ulink> og "
#~ "Debianfejlen <ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-#~ msgid "pxe-tjener.png"
-#~ msgstr "pxe-tjener.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for the "
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 3b30387..e055c58 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-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\n"
"PO-Revision-Date: 2013-07-05 22:12+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -2196,47 +2196,13 @@ msgstr "Eine Bemerkung zur CD-Installation"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-"Die Netinst-Installation (Installationsart mittels CD) nutzt einige Pakete "
-"von der CD und den Rest aus dem Netz. Die Menge der aus dem Netz zu ladenden "
-"Pakete hängt vom jeweiligen Installationsprofil ab."
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Hauptserver: 8 von 115 MiB werden heruntergeladen"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr ""
-"Hauptserver und Terminal-Server (Kombiserver): 618 von 1082 MiB werden "
-"heruntergeladen."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr ""
-"Hauptserver und Arbeitsplatzrechner: 618 von 1081 MiB werden heruntergeladen."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Terminal-Server: 618 von 1052 MiB werden heruntergeladen"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Arbeitsplatzrechner: 618 von 1051 MiB werden heruntergeladen"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Einzelplatzrechner: 618 von 1020 MiB werden heruntergeladen"
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Minimal: 12 von 83 MiB werden heruntergeladen"
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
@@ -2355,15 +2321,15 @@ msgstr ""
"So sieht das PXE-Menü mit dem <emphasis role=\"strong\">Hauptserver</"
"emphasis> als alleinigem Profil aus:"
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "FIXME: two PXE screenshots (with wheezy artwork) are missing here"
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
-msgstr "FIXME: two PXE screenshots (with wheezy artwork) are missing here"
+#| msgid "./images/edit_user.png"
+msgid "./images/pxe-tjener.png"
+msgstr "./images/edit_user.png"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2381,12 +2347,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-
#. type: Content of: <article><section><section><section><para>
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
@@ -2792,6 +2752,12 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "KDE-Desktop"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/29-Diskless-WS-LDM_Login.png"
msgstr "./images/29-Diskless-WS-LDM_Login.png"
@@ -11621,3 +11587,51 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "Die Netinst-Installation (Installationsart mittels CD) nutzt einige "
+#~ "Pakete von der CD und den Rest aus dem Netz. Die Menge der aus dem Netz "
+#~ "zu ladenden Pakete hängt vom jeweiligen Installationsprofil ab."
+
+#~ msgid ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+#~ msgstr ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Hauptserver: 8 von 115 MiB werden heruntergeladen"
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr ""
+#~ "Hauptserver und Terminal-Server (Kombiserver): 618 von 1082 MiB werden "
+#~ "heruntergeladen."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr ""
+#~ "Hauptserver und Arbeitsplatzrechner: 618 von 1081 MiB werden "
+#~ "heruntergeladen."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Terminal-Server: 618 von 1052 MiB werden heruntergeladen"
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Arbeitsplatzrechner: 618 von 1051 MiB werden heruntergeladen"
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Einzelplatzrechner: 618 von 1020 MiB werden heruntergeladen"
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Minimal: 12 von 83 MiB werden heruntergeladen"
+
+#, fuzzy
+#~| msgid "FIXME: two PXE screenshots (with wheezy artwork) are missing here"
+#~ msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#~ msgstr "FIXME: two PXE screenshots (with wheezy artwork) are missing here"
+
+#~ msgid "[attachment:pxe-tjener.png]"
+#~ msgstr "[attachment:pxe-tjener.png]"
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 654ecbd..f424f5c 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-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\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"
@@ -2693,57 +2693,15 @@ msgid "A note on CD installs"
msgstr "Una nota acerca de de la instalación con CD"
#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "The netinst installation (which is the type of installation our CD "
-#| "provides) will fetch some packages from the CD and the rest from the "
-#| "net. The amount of packages fetched from the net varies from profile to "
-#| "profile:"
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
-msgstr ""
-"La instalación via red (que es el tipo de instalación que el CD "
-"proporciona), buscará algunos paquetes desde el CD y los demás los "
-"descargará desde la red. El tamaño de los paquetes descargados desde la red, "
-"variarán de acuerdo al perfil seleccionado:"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-#| msgid "Main server: 8 of 115 MiB downloaded."
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Servidor principal: 8 de 115 MiB descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-"Servidor principal y servidor de clientes ligeros: 618 de 1082 MiB "
-"descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr "Servidor principal y estación de trabajo: 618 de 1081 MiB descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Servidor de clientes ligeros: 618 de 1052 MiB descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Estación de trabajo: 618 de 1051 MiB descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Equipo independiente: 618 de 1020 descargados."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Mínimo: 12 de 83 MiB descargados."
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
@@ -2889,16 +2847,16 @@ msgstr ""
"Así es como el menú PXE se mira con el perfil <emphasis role=\"strong"
"\">Servidor-Principal</emphasis>"
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
#| msgid "pxe-tjener.png"
-msgid "[attachment:pxe-tjener.png]"
+msgid "./images/pxe-tjener.png"
msgstr "pxe-tjener.png"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
+
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
@@ -2920,12 +2878,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
@@ -3393,6 +3345,12 @@ msgstr "27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Escritorio remoto"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
#| msgid "29-Diskless-WS-KDM_Login.png"
@@ -11050,6 +11008,54 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~| msgid ""
+#~| "The netinst installation (which is the type of installation our CD "
+#~| "provides) will fetch some packages from the CD and the rest from the "
+#~| "net. The amount of packages fetched from the net varies from profile to "
+#~| "profile:"
+#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "La instalación via red (que es el tipo de instalación que el CD "
+#~ "proporciona), buscará algunos paquetes desde el CD y los demás los "
+#~ "descargará desde la red. El tamaño de los paquetes descargados desde la "
+#~ "red, variarán de acuerdo al perfil seleccionado:"
+
+#, fuzzy
+#~| msgid "Main server: 8 of 115 MiB downloaded."
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Servidor principal: 8 de 115 MiB descargados."
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr ""
+#~ "Servidor principal y servidor de clientes ligeros: 618 de 1082 MiB "
+#~ "descargados."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr ""
+#~ "Servidor principal y estación de trabajo: 618 de 1081 MiB descargados."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Servidor de clientes ligeros: 618 de 1052 MiB descargados."
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Estación de trabajo: 618 de 1051 MiB descargados."
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Equipo independiente: 618 de 1020 descargados."
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Mínimo: 12 de 83 MiB descargados."
+
+#, fuzzy
+#~| msgid "pxe-tjener.png"
+#~ msgid "[attachment:pxe-tjener.png]"
+#~ msgstr "pxe-tjener.png"
+
+#, fuzzy
#~| msgid "24-Tjener-KDE_Start.png"
#~ msgid "[attachment:24-Tjener-KDE_Start.png]"
#~ msgstr "24-Tjener-KDE_Start.png"
@@ -11283,9 +11289,6 @@ msgstr ""
#~ "org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> and Debian bug "
#~ "<ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>. "
-#~ msgid "pxe-tjener.png"
-#~ msgstr "pxe-tjener.png"
-
#, fuzzy
#~| msgid ""
#~| "New in Debian Edu 6.0.3 beta2 Codename \"Wheezy\" released 2012-01-07"
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 b4923dc..90b76f7 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-07-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\n"
"PO-Revision-Date: 2013-05-14 00:39+0200\n"
"Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -2280,50 +2280,13 @@ msgstr "Note concernant l'installation depuis un CD"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-"L'installation par le réseau (qui est le type d'installation que notre CD "
-"fournit) ira chercher quelques paquets sur le CD et le reste sur Internet. "
-"Le nombre de paquets récupérés sur Internet varie selon le profil :"
-
-#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
-#| msgid ""
-#| "FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr "FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Serveur principal : 8 pour 115 Mio téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr ""
-"Serveur principal et serveur de clients légers : 618 pour 1082 Mio "
-"téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr ""
-"Serveur principal et station de travail : 618 pour 1081 Mio téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Serveur de clients légers : 618 pour 1052 Mio téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Station de travail : 618 pour 1051 Mio téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Ordinateur autonome : 618 pour 1020 Mio téléchargés."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Minimal : 12 pour 83 Mio téléchargés."
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
@@ -2443,16 +2406,15 @@ msgstr ""
"Voici à quoi ressemble le menu PXE avec uniquement le profil <emphasis role="
"\"strong\">Serveur principal</emphasis> :"
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| msgid "pxe-tjener.png"
+msgid "./images/pxe-tjener.png"
+msgstr "pxe-tjener.png"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2470,12 +2432,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-
#. type: Content of: <article><section><section><section><para>
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
@@ -2942,6 +2898,12 @@ msgstr "27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Bureaux distants"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
#| msgid "29-Diskless-WS-KDM_Login.png"
@@ -11970,6 +11932,59 @@ msgstr ""
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "L'installation par le réseau (qui est le type d'installation que notre CD "
+#~ "fournit) ira chercher quelques paquets sur le CD et le reste sur "
+#~ "Internet. Le nombre de paquets récupérés sur Internet varie selon le "
+#~ "profil :"
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+#~ msgid ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+#~ msgstr ""
+#~ "FIXME Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Serveur principal : 8 pour 115 Mio téléchargés."
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr ""
+#~ "Serveur principal et serveur de clients légers : 618 pour 1082 Mio "
+#~ "téléchargés."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr ""
+#~ "Serveur principal et station de travail : 618 pour 1081 Mio téléchargés."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Serveur de clients légers : 618 pour 1052 Mio téléchargés."
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Station de travail : 618 pour 1051 Mio téléchargés."
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Ordinateur autonome : 618 pour 1020 Mio téléchargés."
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Minimal : 12 pour 83 Mio téléchargés."
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
+#~ msgid "[attachment:pxe-tjener.png]"
+#~ msgstr "[attachment:pxe-tjener.png]"
+
+#~ msgid ""
#~ "No mass import of user account data in GOsa (ldif or csv) available yet."
#~ msgstr ""
#~ "Pas de possibilité pour le moment d'importer en masse des données de "
@@ -12264,9 +12279,6 @@ msgstr ""
#~ "le bogue Debian nº <ulink url=\"http://bugs.debian.org/516280\">516280</"
#~ "ulink>."
-#~ msgid "pxe-tjener.png"
-#~ msgstr "pxe-tjener.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for the "
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 80dd47b..41c5b76 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-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\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"
@@ -2152,44 +2152,13 @@ msgstr "Una nota sull'installazione da CD"
#. type: Content of: <article><section><section><section><section><para>
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-"L'installazione netinst (che è l'installazione prevista da CD) prenderà "
-"alcuni pacchetti dal CD e il resto dalla rete. Il totale dei pacchetti da "
-"prendere dalla rete cambia in base al profilo scelto:"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Main server: 8 di 115 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr "Main server e Thin client server: 618 di 1082 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr "Main server e Workstation: 618 of 1081 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Thin client server: 618 di 1052 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Workstation: 618 di 1051 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Standalone: 618 di 1020 MiB da scaricare."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Minimal: 12 of 83 MiB da scaricare."
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
@@ -2305,16 +2274,15 @@ msgstr ""
"Così appare il menu PXE solo con il profilo <emphasis role=\"strong\">Main-"
"Server</emphasis>:"
-#. type: Content of: <article><section><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid ""
-#| "FIXME: these screenshots need to be redone once we have wheezy artwork"
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
-msgstr "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#| msgid "pxe-tjener.png"
+msgid "./images/pxe-tjener.png"
+msgstr "pxe-tjener.png"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
-msgstr "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2331,12 +2299,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
-
#. type: Content of: <article><section><section><section><para>
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
@@ -2740,6 +2702,12 @@ msgstr "./images/27-Tjener-KDE_Desktop.png"
msgid "KDE Desktop"
msgstr "Desktop Remoto"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr "[attachment:28-Diskless-WS-GRUB_Boot_menu-PXE.png]"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/29-Diskless-WS-LDM_Login.png"
msgstr "./images/29-Diskless-WS-KDM_Login.png"
@@ -11417,6 +11385,52 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "L'installazione netinst (che è l'installazione prevista da CD) prenderà "
+#~ "alcuni pacchetti dal CD e il resto dalla rete. Il totale dei pacchetti da "
+#~ "prendere dalla rete cambia in base al profilo scelto:"
+
+#~ msgid ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+#~ msgstr ""
+#~ "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Main server: 8 di 115 MiB da scaricare."
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr "Main server e Thin client server: 618 di 1082 MiB da scaricare."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr "Main server e Workstation: 618 of 1081 MiB da scaricare."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Thin client server: 618 di 1052 MiB da scaricare."
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Workstation: 618 di 1051 MiB da scaricare."
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Standalone: 618 di 1020 MiB da scaricare."
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Minimal: 12 of 83 MiB da scaricare."
+
+#, fuzzy
+#~| msgid ""
+#~| "FIXME: these screenshots need to be redone once we have wheezy artwork"
+#~ msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#~ msgstr ""
+#~ "FIXME: these screenshots need to be redone once we have wheezy artwork"
+
+#~ msgid "[attachment:pxe-tjener.png]"
+#~ msgstr "[attachment:pxe-tjener.png]"
+
+#~ msgid ""
#~ "No mass import of user account data in GOsa (ldif or csv) available yet."
#~ msgstr ""
#~ "Nessuna importazione di massa di dati di account utente in GOsa (ldif o "
@@ -11722,9 +11736,6 @@ msgstr ""
#~ "skolelinux.org/show_bug.cgi?id=1395\">Debian-Edu bug #1395</ulink> e "
#~ "Debian bug <ulink url=\"http://bugs.debian.org/516280#\">516280</ulink>."
-#~ msgid "pxe-tjener.png"
-#~ msgstr "pxe-tjener.png"
-
#~ msgid ""
#~ "<emphasis role=\"strong\">Please note:</emphasis> If Wheezy/r0 was used "
#~ "to install the main server, all user passwords exept that one for the "
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 213bc04..c39eced 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-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\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"
@@ -2168,49 +2168,16 @@ msgid "A note on CD installs"
msgstr "En kommenar om CD-installasjon"
#. type: Content of: <article><section><section><section><section><para>
-#, fuzzy
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
-msgstr ""
-"CDen innholder en nettinstallasjon som vil hente noen pakker fra CDen og "
-"resten fra nettet. Hvor mange pakker som hentes fra nettet varierer fra "
-"profil til profil:"
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-#, fuzzy
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr "Hovedtjener: 8 av 115 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr "Hovedtjener og tynnklienttjener: 618 av 1082 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr "Hovedtjener og arbeidstasjon: 618 av 1081 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr "Tynnklienttjener: 618 av 1052 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr "Arbeidstasjon: 618 av 1051 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr "Frittstående: 618 av 1020 MiB lastet ned."
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
-msgstr "Barebone: 12 av 83 MiB lastet ned."
-
#. type: Content of: <article><section><section><section><section><title>
msgid "A note on thin-client-server installations"
msgstr "En kommentar om installasjon av tynnklienttjenere"
@@ -2319,12 +2286,15 @@ msgstr ""
"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
"\">hovedtjeber</emphasis> tilgjengelig: "
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/pxe-tjener.png"
msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2345,13 +2315,6 @@ msgstr ""
"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
"png]\"/></imageobject>"
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-#, fuzzy
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
-"png]\"/></imageobject>"
-
#. type: Content of: <article><section><section><section><para>
#, fuzzy
msgid ""
@@ -2872,6 +2835,13 @@ msgstr ""
msgid "KDE Desktop"
msgstr "Katalogtjeneste (OpenLDAP) [ldap]"
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-tjener."
+"png]\"/></imageobject>"
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/29-Diskless-WS-LDM_Login.png"
@@ -11014,6 +10984,39 @@ msgstr ""
"skolelinux.no/info/cdbygging/news.html</ulink>."
#, fuzzy
+#~ msgid ""
+#~ "A netinst installation (which is the type of installation our CD "
+#~ "provides) will fetch some packages from the CD and the rest from the "
+#~ "net. The amount of packages fetched from the net varies from profile to "
+#~ "profile:"
+#~ msgstr ""
+#~ "CDen innholder en nettinstallasjon som vil hente noen pakker fra CDen og "
+#~ "resten fra nettet. Hvor mange pakker som hentes fra nettet varierer fra "
+#~ "profil til profil:"
+
+#, fuzzy
+#~ msgid "Main server: 8 out of 115 MiB downloaded."
+#~ msgstr "Hovedtjener: 8 av 115 MiB lastet ned."
+
+#~ msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
+#~ msgstr "Hovedtjener og tynnklienttjener: 618 av 1082 MiB lastet ned."
+
+#~ msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
+#~ msgstr "Hovedtjener og arbeidstasjon: 618 av 1081 MiB lastet ned."
+
+#~ msgid "Thin client server: 618 of 1052 MiB downloaded."
+#~ msgstr "Tynnklienttjener: 618 av 1052 MiB lastet ned."
+
+#~ msgid "Workstation: 618 of 1051 MiB downloaded."
+#~ msgstr "Arbeidstasjon: 618 av 1051 MiB lastet ned."
+
+#~ msgid "Standalone: 618 of 1020 MiB downloaded."
+#~ msgstr "Frittstående: 618 av 1020 MiB lastet ned."
+
+#~ msgid "Minimal: 12 of 83 MiB downloaded."
+#~ msgstr "Barebone: 12 av 83 MiB lastet ned."
+
+#, fuzzy
#~ msgid "31-ThinClient-KDE_Desktop.png"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:pxe-"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index f30081a..cc0bab3 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:36+0300\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"
@@ -1609,40 +1609,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><section><para>
msgid ""
"A netinst installation (which is the type of installation our CD provides) "
-"will fetch some packages from the CD and the rest from the net. The amount "
-"of packages fetched from the net varies from profile to profile:"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><para>
-msgid "FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server: 8 out of 115 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Thin client server: 618 of 1082 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Main server and Workstation: 618 of 1081 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Thin client server: 618 of 1052 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Workstation: 618 of 1051 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Standalone: 618 of 1020 MiB downloaded."
-msgstr ""
-
-#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
-msgid "Minimal: 12 of 83 MiB downloaded."
+"will fetch some packages from the CD and the rest from the net. The amount "
+"of packages fetched from the net varies from profile to profile 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 "
+"downloading the same package several times from the net."
msgstr ""
#. type: Content of: <article><section><section><section><section><title>
@@ -1726,12 +1698,12 @@ msgid ""
"Server</emphasis> profile only:"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: One PXE screenshot (with wheezy artwork) is missing here"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/pxe-tjener.png"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:pxe-tjener.png]"
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "width=400"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -1745,10 +1717,6 @@ msgstr ""
msgid "./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"
msgstr ""
-#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
-msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
-msgstr ""
-
#. type: Content of: <article><section><section><section><para>
msgid ""
"This setup also allows diskless workstations and thin clients to be booted "
@@ -2095,6 +2063,10 @@ msgstr ""
msgid "KDE Desktop"
msgstr ""
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "28-Diskless-WS-GRUB_Boot_menu-PXE.png"
+msgstr ""
+
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/29-Diskless-WS-LDM_Login.png"
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 86193a7..ad9bd8c 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -683,33 +683,8 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
<section id="Installation--A_note_on_CD_installs">
<title>A note on CD installs
</title>
-<para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net. The amount of packages fetched from the net varies from profile to profile:
+<para>A netinst installation (which is the type of installation our CD provides) will fetch some packages from the CD and the rest from the net. The amount 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 downloading the same package several times from the net.
</para>
-<para>
-FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
-</para>
-<itemizedlist>
-<listitem>
-<para>Main server: 8 out of 115 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Main server and Thin client server: 618 of 1082 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Main server and Workstation: 618 of 1081 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Thin client server: 618 of 1052 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Workstation: 618 of 1051 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Standalone: 618 of 1020 MiB downloaded.
-</para></listitem>
-<listitem>
-<para>Minimal: 12 of 83 MiB downloaded.
-</para></listitem></itemizedlist>
</section>
<section id="Installation--A_note_on_thin-client-server_installations">
@@ -744,14 +719,11 @@ FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
</para>
<para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> profile only:
</para>
-<para>
-FIXME: One PXE screenshot (with wheezy artwork) is missing here
-</para>
-<para>[attachment:pxe-tjener.png]
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/pxe-tjener.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject>
</para>
<para>This is how the PXE menu looks with the <emphasis role="strong">Main-Server</emphasis> and <emphasis role="strong">Thin-Client-Server</emphasis> profiles:
</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>28-Diskless-WS-GRUB_Boot_menu-PXE.png</phrase></textobject></inlinemediaobject>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/28-Diskless-WS-GRUB_Boot_menu-PXE.png"/></imageobject><textobject><phrase>width=400</phrase></textobject></inlinemediaobject>
</para>
<para>This setup also allows diskless workstations and thin clients to be booted on the main network. Unlike workstations, diskless workstations don't have to be added to LDAP with GOsa², but can be, for example if you want to force the hostname.
</para>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index e711ea5..8898521 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -1,8 +1,6 @@
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
FIXME: only the CD download links work currently - the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work.
-FIXME: Check these numbers for Wheezy. They are 2012-01-22 for Lenny.
-FIXME: One PXE screenshot (with wheezy artwork) is missing here
FIXME: one screenshot still missing (28-Diskless-WS-GRUB_Boot_menu-PXE.png).
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//HowTo/NetworkClients
@@ -10,5 +8,5 @@ FIXME: would it be better to explain user groups in Windows first with GOsa², a
FIXME: explain how to use profiles from global policies for Windows machines in the skolelinux network
FIXME: describe roaming profile key for the global policy editor here
====================
-7 FIXMEs left to fix
+5 FIXMEs left to fix
====================
diff --git a/documentation/debian-edu-wheezy/images/pxe-tjener.png b/documentation/debian-edu-wheezy/images/pxe-tjener.png
new file mode 100644
index 0000000..47cc417
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/pxe-tjener.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index a1f58b7..fd44375 100644
--- a/documentation/rosegarden/rosegarden-manual.pot
+++ b/documentation/rosegarden/rosegarden-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-07 15:51+0300\n"
+"POT-Creation-Date: 2013-07-07 16:37+0300\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"
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