[debian-edu-commits] debian-edu/debian-edu-doc.git (#1479) - master (branch) updated: 1.5_20130531_7.0-1-gb884a4c
Holger Levsen
holger at alioth.debian.org
Sat Jun 15 17:05:18 UTC 2013
The branch, master has been updated
via b884a4c7261e8253854415f3d76ce21a8a0c543d (commit)
from a60924ae93b4a5283ea9f81719f1bacdf194f59c (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 b884a4c7261e8253854415f3d76ce21a8a0c543d
Author: Holger Levsen <holger at layer-acht.org>
Date: Sat Jun 15 19:05:06 2013 +0200
Update manuals and images from the wiki.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +
documentation/audacity/audacity-manual.pot | 2 +-
.../debian-edu-squeeze-manual.da.po | 17 +-
.../debian-edu-squeeze-manual.de.po | 10 +-
.../debian-edu-squeeze-manual.es.po | 10 +-
.../debian-edu-squeeze-manual.fr.po | 10 +-
.../debian-edu-squeeze-manual.it.po | 10 +-
.../debian-edu-squeeze-manual.nb.po | 10 +-
.../debian-edu-squeeze-manual.pot | 10 +-
.../debian-edu-squeeze-manual.xml | 2 +
.../debian-edu-squeeze-manual.zh.po | 10 +-
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386842 -> 386828 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386940 -> 386928 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386883 -> 386871 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386879 -> 386867 bytes
.../debian-edu-wheezy-manual.da.po | 252 +++++++++++-----
.../debian-edu-wheezy-manual.de.po | 290 +++++++++++++-----
.../debian-edu-wheezy-manual.es.po | 168 ++++++-----
.../debian-edu-wheezy-manual.fr.po | 288 +++++++++++++-----
.../debian-edu-wheezy-manual.it.po | 307 ++++++++++++++------
.../debian-edu-wheezy-manual.nb.po | 269 +++++++++--------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 136 +++++----
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 78 ++---
documentation/debian-edu-wheezy/fixme-status.txt | 7 +-
.../images/22-Tjener_GRUB_boot_menu.png | Bin 0 -> 106227 bytes
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386842 -> 386828 bytes
.../debian-edu-wheezy/images/edit_user.png | Bin 0 -> 35438 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386940 -> 386928 bytes
.../debian-edu-wheezy/images/filterbox.png | Bin 0 -> 6423 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386883 -> 386871 bytes
.../debian-edu-wheezy/images/gosa2_overview.png | Bin 0 -> 100667 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386879 -> 386867 bytes
documentation/rosegarden/rosegarden-manual.pot | 2 +-
33 files changed, 1287 insertions(+), 607 deletions(-)
create mode 100644 documentation/debian-edu-wheezy/images/22-Tjener_GRUB_boot_menu.png
create mode 100644 documentation/debian-edu-wheezy/images/edit_user.png
create mode 100644 documentation/debian-edu-wheezy/images/filterbox.png
create mode 100644 documentation/debian-edu-wheezy/images/gosa2_overview.png
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 44ec1bd..e280db0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian-edu-doc (1.5~20130631~7.1) UNRELEASED; urgency=low
+
+ * Update manuals and images from the wiki.
+
+ -- Holger Levsen <holger at debian.org> Sat, 15 Jun 2013 19:04:22 +0200
+
debian-edu-doc (1.5~20130531~7.0) unstable; urgency=low
* Update manuals and images from the wiki
diff --git a/documentation/audacity/audacity-manual.pot b/documentation/audacity/audacity-manual.pot
index 3d8356d..47fa2e0 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: 2012-12-11 13:25+0100\n"
+"POT-Creation-Date: 2013-06-15 19:03+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.da.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
index a4460a5..c56dd81 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+0300\n"
"PO-Revision-Date: 2013-02-28 11:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -6267,6 +6267,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -8631,8 +8639,8 @@ msgid ""
"well as the following changes:"
msgstr ""
"Debian Edu 6.0.7+r1 kodenavn »Squeeze« er en trinsvis opdatering til Debian "
-"Edu 6.0.4+r0, indeholdende alle ændringerne mellem Debian 6.0.4 og 6.0.7 samt "
-"de følgende ændringer:"
+"Edu 6.0.4+r0, indeholdende alle ændringerne mellem Debian 6.0.4 og 6.0.7 "
+"samt de følgende ændringer:"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid "sitesummary was updated from 0.1.3 to 0.1.8"
@@ -8664,7 +8672,8 @@ msgstr "debian-edu-config fra 1.453 til 1.455"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Fix /etc/hosts for LTSP diskless workstations. Closes: #699880"
-msgstr "Rettelse /etc/hosts for LTSP-diskløse arbejdsstationer. Lukker: #699880"
+msgstr ""
+"Rettelse /etc/hosts for LTSP-diskløse arbejdsstationer. Lukker: #699880"
#. type: Content of: <article><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Make ltsp_local_mount script work for multiple devices."
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
index f6061b1..ba8d6ee 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-28 14:35-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+0300\n"
"PO-Revision-Date: 2013-02-24 23:18+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -6412,6 +6412,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
index 6986c3f..b7c34f2 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+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"
@@ -6567,6 +6567,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
index 1b9d749..e8d2299 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-02-28 14:35-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+0300\n"
"PO-Revision-Date: 2013-02-25 16:36+0100\n"
"Last-Translator: Cédric Boutillier <cedric.boutillier at gmail.com>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -6437,6 +6437,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
index 37cff9f..a67fffc 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-lenny-manual\n"
-"POT-Creation-Date: 2013-02-28 14:35-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+0300\n"
"PO-Revision-Date: 2013-02-28 18:47+0100\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -6288,6 +6288,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
index f2e337b..8e2296c 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+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"
@@ -6905,6 +6905,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
index b72f688..955dd45 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-02-28 18:17-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+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"
@@ -4687,6 +4687,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
index 5943adc..edb714e 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
@@ -2026,6 +2026,8 @@ append ro initrd=initrd.img boot=nfs quiet 3]]></screen>
</title>
<para>The debian-edu-config package comes with a tool which helps in changing the network from 10.0.0.0/8 to something else. Have a look at <computeroutput>/usr/share/debian-edu-config/tools/subnet-change</computeroutput>. It is intended for use just after installation on the main server, to update LDAP and other files that need to be edited to change the subnet.
</para>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note that changing to one of the subnets already used elsewhere in Debian Edu will not work. 192.168.1.0/24 is already set up as the thin client network. Changing to this subnet will require manual editing of configuration files to remove duplicate entries.
+</para>
<para>There is no easy way to change the DNS domain name. Changing it would require changes to both the LDAP structure and several files in the main server file system. There is also no easy way to change the host and DNS name of the main server (tjener.intern). To do so would also require changes to LDAP and files in the main-server and client file system. In both cases the Kerberos setup would have to be changed, too.
</para>
</section>
diff --git a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
index 736a1d8..7de66ba 100644
--- a/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
+++ b/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.zh.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.zh\n"
-"POT-Creation-Date: 2013-02-24 13:55-0400\n"
+"POT-Creation-Date: 2013-06-15 19:01+0300\n"
"PO-Revision-Date: 2011-03-28 20:21+0800\n"
"Last-Translator: Andrew Lee <ajqlee at debian.org>\n"
"Language-Team: zh-l10n <zh-l10n at lists.linux.org.tw>\n"
@@ -5230,6 +5230,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 84d2811..d040f02 100644
Binary files a/documentation/debian-edu-squeeze/images/de/worldmap.png and b/documentation/debian-edu-squeeze/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/es/worldmap.png b/documentation/debian-edu-squeeze/images/es/worldmap.png
index 6f66451..963344b 100644
Binary files a/documentation/debian-edu-squeeze/images/es/worldmap.png and b/documentation/debian-edu-squeeze/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/fr/worldmap.png b/documentation/debian-edu-squeeze/images/fr/worldmap.png
index 3dcbdf2..d0fbe6e 100644
Binary files a/documentation/debian-edu-squeeze/images/fr/worldmap.png and b/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-squeeze/images/worldmap.png b/documentation/debian-edu-squeeze/images/worldmap.png
index c026f2c..4080da8 100644
Binary files a/documentation/debian-edu-squeeze/images/worldmap.png and b/documentation/debian-edu-squeeze/images/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 0842176..79966ac 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -23,11 +23,15 @@ msgid "en"
msgstr "da"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.0.0+r0"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manual for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
#. type: Content of: <article><section><para>
@@ -39,7 +43,9 @@ msgstr ""
"once we have new artwork"
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Dette er manualen for Debian Edu Wheezy 7.0.0+r0-udgivelsen."
#. type: Content of: <article><section><para>
@@ -1395,8 +1401,12 @@ msgstr ""
"ulink>."
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
+#| "\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Hent installationsmediet for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
#. type: Content of: <article><section><section><section><title>
@@ -1419,33 +1429,45 @@ msgstr ""
#| "FIXME: these download URLs need to be adapted for wheezy still... They "
#| "currently don't work"
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
"FIXME: these download URLs need to be adapted for wheezy still... They "
"currently don't work"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
@@ -1469,7 +1491,7 @@ msgstr ""
#| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
@@ -1480,8 +1502,8 @@ msgstr ""
#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
#| "CD.iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-CD."
"iso\">debian-edu-7.0.0+r0-CD.iso</ulink>"
@@ -1493,7 +1515,7 @@ msgstr ""
#| "edu-7.0.0+r0-CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"CD.iso debian-edu-7.0.0+r0-CD.iso</computeroutput>"
@@ -1507,25 +1529,38 @@ msgid "The sources are available via"
msgstr "Kilderne er tilgængelige via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
+#| "computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
@@ -2568,9 +2603,15 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
-msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
#. type: Content of: <article><section><section><para>
msgid "[attachment:23-Tjener-KDM_Login.png]"
@@ -2762,9 +2803,15 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr "GOsa²-logind samt overblik"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
-msgstr "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "GOsa²-overbliksside efter logind som den første bruger"
#. type: Content of: <article><section><section><section><para>
msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -2987,9 +3034,15 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Søg, ændr og slet brugere"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
-msgstr "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Filterbox"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3030,9 +3083,15 @@ msgstr ""
"ændre adgangskoden for brugeren og ændre listen over grupper som brugeren er "
"medlem af."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
-msgstr "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Redigering af brugerdata"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -4794,13 +4853,16 @@ msgstr ""
#| "Be careful and don't mess up the LDAP database."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
"Advarsel: <computeroutput>ldapvi</computeroutput> er et meget funktionsrigt "
"værktøj. Vær forsigtig og ødelæg ikke LDAP-databasen."
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+#, fuzzy
+#| msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr "jxplorer, en grafisk brugerflade for LDAP"
#. type: Content of: <article><section><section><para>
@@ -4963,10 +5025,15 @@ msgid "Upgrading with a CD or DVD ROM"
msgstr "Opgradering med en cd eller dvd-rom"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to upgrade from one version to another (for example from "
+#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
+#| "physical media, follow these steps:"
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
"Hvis du ønsker at opgradere fra en version til den næste (for eksempel fra "
"Wheezy 7.0.0 til 7.0.1) men ikke har internetadgang, kun et fysisk medie, så "
@@ -6187,6 +6254,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -8539,17 +8614,13 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr "Nye funktioner i Debian Edu Wheezy"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
+#| "2013-??-??"
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Nye funktioner for Debian Edu 7.0.0+r0 kodenavn »Wheezy« udgivet ??-??-2013"
@@ -8565,12 +8636,6 @@ msgstr ""
"Opdateret grafik og nyt logo for Debian Edu / Skolelinux, synlig under "
"installationen, i logindskærmen og som baggrundsbillede."
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
-
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr "Installationsændringer"
@@ -8592,7 +8657,7 @@ msgstr "Programopdateringer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
#| msgid "Everything which is new in Debian Wheezy:"
-msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr "Alt som også er nyt i Debian Wheezy:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8601,12 +8666,15 @@ msgstr "Linuxkerne version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+#, fuzzy
+#| msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr "Internetbrowseren Iceweasel 10 ESR"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8660,8 +8728,14 @@ msgstr ""
"installation, inklusiv browseren Chromium"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
+#| "installmanual\">installation manual</ulink>."
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -8676,9 +8750,13 @@ msgid "Documentation and translation updates"
msgstr "Opdateringer af dokumentation og oversættelser"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Translation updates for the templates used in the installer. These "
+#| "templates are now available in 28 languages."
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
"Disse skabeloner er nu tilgængelige på 28 sprog."
@@ -8710,7 +8788,7 @@ msgid "Other changes"
msgstr "Andre ændringer"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8736,6 +8814,12 @@ msgid ""
"No mass import of user account data in GOsa (ldif or csv) available yet."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Ophavsret og forfattere"
@@ -10266,6 +10350,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Oversættelsesopdateringer for skabelonerne brugt i installationsprogrammet. "
+"Disse skabeloner er nu tilgængelige på 28 sprog."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -11107,6 +11199,30 @@ msgstr ""
"Yderligere information om endnu ældre versioner kan findes på <ulink url="
"\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#~ msgid "[attachment:gosa2_overview.png]"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#~ msgid "[attachment:filterbox.png]"
+#~ msgstr "[attachment:filterbox.png]"
+
+#~ msgid "[attachment:edit_user.png]"
+#~ msgstr "[attachment:edit_user.png]"
+
+#~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#, fuzzy
+#~| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#~ msgid "FIXME: hopefully. h01ger is asking around."
+#~ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
+
#~ msgid ""
#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
#~ msgstr ""
@@ -11320,9 +11436,6 @@ msgstr ""
#~ msgid "21-Finish_the_Installation-Installation_complete.png"
#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
#~ msgid "23-Tjener-KDM_Login.png"
#~ msgstr "23-Tjener-KDM_Login.png"
@@ -11347,9 +11460,6 @@ msgstr ""
#~ msgid "Debian Edu desktop"
#~ msgstr "Debian Edu-skrivebord"
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "GOsa²-overbliksside efter logind som den første bruger"
-
#~ 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 "
@@ -11397,12 +11507,6 @@ msgstr ""
#~ " done\n"
#~ " kadmin.local -q \"modpol -maxlife 0secs users\""
-#~ msgid "Filterbox"
-#~ msgstr "Filterbox"
-
-#~ msgid "Editing user data"
-#~ msgstr "Redigering af brugerdata"
-
#~ msgid "Set user password"
#~ msgstr "Angiv brugeradgangskode"
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 1869788..9a1a867 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+0300\n"
"PO-Revision-Date: 2013-05-12 11:52+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -33,11 +33,15 @@ msgid "en"
msgstr "de"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Handbuch für Debian Edu / Skolelinux Wheezy 7.0.0+r0"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Handbuch für Debian Edu 7.0.0+r0, Codename »Wheezy«"
#. type: Content of: <article><section><para>
@@ -49,7 +53,9 @@ msgstr ""
"once we have new artwork"
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Dies ist das Handbuch für das Release Debian Edu Wheezy 7.0.0+r0."
#. type: Content of: <article><section><para>
@@ -773,8 +779,8 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als "
-"(X-)Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
+"Durch Einrichtung als Thin Client kann ein gewöhnlicher Rechner als (X-)"
+"Terminal eingesetzt werden. Das heißt, dass diese Maschine von einer "
"Diskette, unter Benutzung des Netzwerkkarten-PROMs oder via PXE direkt vom "
"Server startet, ohne die lokale Festplatte zu benutzen. Die Einrichtung der "
"Thin Clients erfolgt gemäß dem Linux-Terminal-Server-Projekt (LTSP)."
@@ -1400,8 +1406,12 @@ msgstr ""
"ulink> zu finden."
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
+#| "\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
"Herunterladen des Installationsmediums für Debian Edu 7.0.0+r0, Codename "
"»Wheezy«"
@@ -1421,35 +1431,52 @@ msgstr ""
"heruntergeladen werden:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
+#| "still... They currently don't work. CD download URL (debian-"
+#| "edu~7.0+edu0~a0-CD.iso) should work."
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
"CD.iso) should work."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
@@ -1467,25 +1494,37 @@ msgstr ""
"Prozessorarchitektur ist erhältlich mittels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1499,25 +1538,38 @@ msgid "The sources are available via"
msgstr "Die Quelltexte sind erhältlich mittels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
+#| "computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
@@ -2103,8 +2155,8 @@ msgstr ""
"Wenn Sie von einer DVD installieren, enthält die Datei <computeroutput>/etc/"
"apt/sources.list</computeroutput> nur Quellen von der DVD. Wenn Sie eine "
"Internetverbindung haben, wird dringend empfohlen, die folgenden Zeilen zu "
-"der Datei hinzuzufügen. Damit stellen Sie sicher, dass "
-"(Sicherheits-)Aktualisierungen installiert werden können."
+"der Datei hinzuzufügen. Damit stellen Sie sicher, dass (Sicherheits-)"
+"Aktualisierungen installiert werden können."
#. type: CDATA
#, no-wrap
@@ -2573,8 +2625,16 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
#. type: Content of: <article><section><section><para>
@@ -2770,9 +2830,15 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr "GOsa²-Anmeldung und Übersicht"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
-msgstr "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -2931,14 +2997,14 @@ msgstr ""
"nicht. (Die Generierung der Kennungen kann in der Datei <computeroutput>/etc/"
"gosa/gosa.conf</computeroutput> angepasst werden; es könnte z.B. die "
"Voreinstellung <computeroutput>idGenerator=\"{%givenName[1-6]}{%sn[1-6]}\"</"
-"computeroutput> geändert werden in <computeroutput>idGenerator="
-"\"{%givenName[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den "
-"Benutzer »Peter Muster« die Kennung <computeroutput>pmuster</computeroutput> "
-"und für einen weiteren Benutzer mit gleichem Namen "
-"<computeroutput>pmuster01</computeroutput> generiert; in diesem Fall wären "
-"Kennungen maximal 25 Zeichen lang. Weitere Details erhalten Sie mittels "
-"<computeroutput>man 5 gosa.conf</computeroutput>. Legen Sie eine "
-"Sicherheitskopie von gosa.conf an, bevor Sie diese verändern!)"
+"computeroutput> geändert werden in <computeroutput>idGenerator=\"{%givenName"
+"[1]}{%sn[22]}{id!2}\"</computeroutput>. Damit würde für den Benutzer »Peter "
+"Muster« die Kennung <computeroutput>pmuster</computeroutput> und für einen "
+"weiteren Benutzer mit gleichem Namen <computeroutput>pmuster01</"
+"computeroutput> generiert; in diesem Fall wären Kennungen maximal 25 Zeichen "
+"lang. Weitere Details erhalten Sie mittels <computeroutput>man 5 gosa.conf</"
+"computeroutput>. Legen Sie eine Sicherheitskopie von gosa.conf an, bevor Sie "
+"diese verändern!)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -2986,9 +3052,15 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Benutzer suchen, modifizieren und löschen"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
-msgstr "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3031,9 +3103,17 @@ msgstr ""
"einem Benutzer gehören, modifizieren können; dort kann auch das Passwort und "
"die Zugehörigkeit zu Gruppen geändert werden."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
-msgstr "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Adding users"
+msgid "Editing user data"
+msgstr "Benutzer hinzufügen"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -4825,16 +4905,23 @@ msgstr ""
"LDAP-Objekt."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database, same applies for jxplorer."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
"Achtung: <computeroutput>ldapvi</computeroutput> ist ein mächtiges Werkzeug. "
"Verwenden Sie es vorsichtig und richten Sie kein Durcheinander in der LDAP-"
"Datenbank an; dies gilt auch für jxplorer."
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+#, fuzzy
+#| msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr "jxplorer, ein LDAP-Editor mit graphischer Benutzeroberfläche"
#. type: Content of: <article><section><section><para>
@@ -4990,10 +5077,15 @@ msgid "Upgrading with a CD or DVD ROM"
msgstr "Upgrade mit einer CD- oder einer DVD-ROM"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to upgrade from one version to another (for example from "
+#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
+#| "physical media, follow these steps:"
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
"Falls Sie ein Upgrade von einer Version zu einer nächsten (wie z.B. von "
"Wheezy 7.0.0 auf 7.0.1) durchführen wollen, aber keine Internetverbindung, "
@@ -6251,6 +6343,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -8669,17 +8769,13 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr "Neuerungen in Debian Edu Wheezy"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
+#| "2013-??-??"
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Neuerungen in Debian Edu 7.0.0+r0, Codename »Wheezy«, freigegeben am ?.?.2012"
@@ -8696,12 +8792,6 @@ msgstr ""
"Skolelinux, zu sehen während der Installation, bei der Anmeldung und als "
"Hintergrund der Arbeitsfläche."
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
-
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr "Änderungen der Installation"
@@ -8721,7 +8811,9 @@ msgid "Software updates"
msgstr "Aktualisierung von Software"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr "Alles, was in Debian Wheezy neu ist, z. B.:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8729,16 +8821,23 @@ msgid "Linux kernel 3.2.x"
msgstr "Linux-Kernel in der Version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
+#| "installed by default; to choose GNOME or LXDE: see manual.)"
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
"Desktop-Umgebungen KDE \"Plasma\" 4.8.4, GNOME 3.4, und LXDE 0.55 (KDE wird "
"als Standard installiert; sehen Sie im Handbuch nach, um GNOME oder LXDE zu "
"installieren.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+#, fuzzy
+#| msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr "Webbrowser Iceweasel 10 ESR"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8786,8 +8885,14 @@ msgid "Debian Wheezy includes about 37000 packages available for installation."
msgstr "Debian Wheezy enthält mehr als 37.000 installierbare Pakete."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
+#| "installmanual\">installation manual</ulink>."
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -8802,9 +8907,13 @@ msgid "Documentation and translation updates"
msgstr "Aktualisierung von Dokumentation und Übersetzungen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Translation updates for the templates used in the installer. These "
+#| "templates are now available in 28 languages."
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
"liegen nun für 28 Sprachen vor."
@@ -8839,7 +8948,7 @@ msgid "Other changes"
msgstr "Sonstige Änderungen"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8874,6 +8983,12 @@ msgstr ""
"Bisher ist ein massenhafter Import von Benutzerdaten in GOsa (LDIF oder CSV) "
"nicht verfügbar."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright und Autoren"
@@ -10405,6 +10520,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Aktualisierte Übersetzungen für die Einträge im Installationsprogramm. Diese "
+"liegen nun für 28 Sprachen vor."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -11267,3 +11390,24 @@ msgstr ""
"Mehr Informationen zu noch älteren Veröffentlichungen können unter <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/> gefunden "
"werden."
+
+#~ msgid "[attachment:gosa2_overview.png]"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#~ msgid "[attachment:filterbox.png]"
+#~ msgstr "[attachment:filterbox.png]"
+
+#~ msgid "[attachment:edit_user.png]"
+#~ msgstr "[attachment:edit_user.png]"
+
+#~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#, fuzzy
+#~| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#~ msgid "FIXME: hopefully. h01ger is asking around."
+#~ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
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 4b31d0f..1cf8698 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -27,11 +27,15 @@ msgid "en"
msgstr "es"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Debian Edu / Skolelinux 7.0.0+r0 Wheezy"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manual para Debian-Edu 7.0.0+r0 rc2 nombre código \"Wheezy\""
#. type: Content of: <article><section><para>
@@ -41,7 +45,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Este es el manual de Debian-Edu Wheezy 7.0.0+r0"
#. type: Content of: <article><section><para>
@@ -1692,7 +1698,7 @@ msgstr ""
#| "Download the installation media for Debian Edu 6.0.3 beta1 Codename "
#| "\"Wheezy\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
"Descargar un formato de instalación para Debian Edu 6.0.3 beta1 \"Wheezy\""
@@ -1719,9 +1725,9 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -1730,8 +1736,8 @@ msgstr ""
#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -1742,8 +1748,8 @@ msgstr ""
#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-DVD.iso\">debian-edu-6.0.3+edub1-DVD.iso</ulink>"
@@ -1754,8 +1760,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1781,7 +1787,7 @@ msgstr ""
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1792,8 +1798,8 @@ msgstr ""
#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
#| "edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-CD.iso\">debian-edu-6.0.3+edub1-CD.iso</ulink>"
@@ -1805,7 +1811,7 @@ msgstr ""
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -1828,8 +1834,8 @@ msgstr "Los archivos fuente estan disponibles vía: "
#| "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
#| "ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
@@ -1842,8 +1848,8 @@ msgstr ""
#| "edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
#| "ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso\">debian-edu-6.0.3+edub1-source-DVD.iso</"
@@ -1855,8 +1861,8 @@ msgstr ""
#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/"
#| "debian-edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/wheezy-beta/debian-"
"edu-6.0.3+edub1-source-DVD.iso</computeroutput>"
@@ -3141,10 +3147,14 @@ msgstr "20-Finish_the_Installation.png"
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr "21-Finish_the_Installation-Installation_complete.png"
-#. type: Content of: <article><section><section><para>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
#| msgid "22-Tjener_GRUB_boot_menu.png"
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
#. type: Content of: <article><section><section><para>
@@ -3402,8 +3412,14 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/gosa2_overview.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3563,8 +3579,14 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Buscar, modificar y borrar usuarios"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/filterbox.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3600,9 +3622,15 @@ msgstr ""
"al usuario directamente, cambiar su contraseña y modificar la lista de "
"grupos a los que pertenece."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
-msgstr ""
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "01-Installer_boot_menu.png"
+msgid "./images/edit_user.png"
+msgstr "01-Installer_boot_menu.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Editar datos de usuarios"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -5251,11 +5279,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+#, fuzzy
+#| msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr "jxplorer, una GUI para LDAP"
#. type: Content of: <article><section><section><para>
@@ -5370,8 +5401,8 @@ msgstr "Actualizar con un CD o DVD ROM"
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -6382,6 +6413,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -8321,19 +8360,13 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr "Nuevas características en Debin Edu Wheezy"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-
#. type: Content of: <article><section><section><title>
#, fuzzy
#| msgid ""
#| "New features for Debian Edu 6.0.4+r0 Codename \"Squeeze\" released "
#| "2012-03-11"
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Nuevas características en Debian Edu 6.0.4+r0 nombre código \"Squeeze\" "
"publicado el 11-03-2012"
@@ -8348,10 +8381,6 @@ msgid ""
"installation, in the login screen and as desktop wallpaper."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
#, fuzzy
#| msgid "Installation"
@@ -8377,7 +8406,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8388,12 +8417,13 @@ msgstr "Versión del kernel linux 2.6.18"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8448,7 +8478,7 @@ msgstr ""
#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
#| "installmanual\">installation manual</ulink>."
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -8465,7 +8495,7 @@ msgstr "Actualizaciones en documentación y traducciones"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8495,7 +8525,7 @@ msgid "Other changes"
msgstr "paquete en"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8521,6 +8551,12 @@ msgid ""
"No mass import of user account data in GOsa (ldif or csv) available yet."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright y authores"
@@ -9771,6 +9807,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -10676,6 +10718,11 @@ msgstr ""
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
#, fuzzy
+#~| msgid "22-Tjener_GRUB_boot_menu.png"
+#~ msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#, fuzzy
#~ msgid "Machine type selection based on the network"
#~ msgstr ""
#~ "<emphasis role=\"strong\">POR CORREGIR</emphasis>, por ahora unas "
@@ -10840,9 +10887,6 @@ msgstr ""
#~ msgid "21-Finish_the_Installation-Installation_complete.png"
#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
#~ msgid "23-Tjener-KDM_Login.png"
#~ msgstr "23-Tjener-KDM_Login.png"
@@ -10867,9 +10911,6 @@ msgstr ""
#~ msgid "Debian Edu desktop"
#~ msgstr "Escritorio Debian Edu"
-#~ msgid "Editing user data"
-#~ msgstr "Editar datos de usuarios"
-
#, fuzzy
#~| msgid "Set passwords"
#~ msgid "Set user password"
@@ -11047,11 +11088,6 @@ msgstr ""
#~ msgstr "paquete en"
#, fuzzy
-#~| msgid "01-Installer_boot_menu.png"
-#~ msgid "./images/smile4.png"
-#~ msgstr "01-Installer_boot_menu.png"
-
-#, fuzzy
#~| msgid ":-)"
#~ msgid ";-)"
#~ msgstr ":-)"
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 11b0416..483646a 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -25,11 +25,15 @@ msgid "en"
msgstr "fr"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Manuel de Debian Edu / Skolelinux Wheezy 7.0.0+r0"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manuel de Debian Edu 7.0.0+r0 nom de code « Wheezy »"
#. type: Content of: <article><section><para>
@@ -39,7 +43,9 @@ msgid ""
msgstr "FIXME: we need a wheezy login shot here once we have new artwork"
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Voici le manuel de la version de Debian Edu Wheezy 7.0.0+r0."
#. type: Content of: <article><section><para>
@@ -1401,8 +1407,12 @@ msgstr ""
"d'installation</ulink>."
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
+#| "\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
"Téléchargement d'un support d'installation pour Debian Edu 7.0.0+r0 "
"« Wheezy »"
@@ -1422,35 +1432,52 @@ msgstr ""
"utilisant FTP, HTTP ou rsync :"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
+#| "still... They currently don't work. CD download URL (debian-"
+#| "edu~7.0+edu0~a0-CD.iso) should work."
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
"CD.iso) should work."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
@@ -1468,25 +1495,37 @@ msgstr ""
"machines i386 et amd64 est disponible :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1500,25 +1539,38 @@ msgid "The sources are available via"
msgstr "Les sources sont disponibles :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
+#| "computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
@@ -2583,9 +2635,15 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
-msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
#. type: Content of: <article><section><section><para>
msgid "[attachment:23-Tjener-KDM_Login.png]"
@@ -2780,9 +2838,15 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr "Connexion à GOsa² et aperçu"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
-msgstr "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
#. type: Content of: <article><section><section><section><para>
msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -2998,9 +3062,15 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Rechercher, modifier et supprimer des utilisateurs"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
-msgstr "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Boîte de filtre"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -3042,9 +3112,15 @@ msgstr ""
"informations relatives à un utilisateur, changer son mot de passe et "
"modifier la liste des groupes auxquels il appartient."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
-msgstr "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Modifier les données d'utilisateur"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -4837,16 +4913,23 @@ msgstr ""
"<computeroutput>add</computeroutput>."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database, same applies for jxplorer."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
"Attention :<computeroutput>ldapvi</computeroutput> est un outil très "
"puissant. Utilisez-le avec précaution pour ne pas endommager la base de "
"données LDAP. Le même avertissement s'applique à jxplorer."
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+#, fuzzy
+#| msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr "jxplorer, une interface graphique à LDAP"
#. type: Content of: <article><section><section><para>
@@ -5006,10 +5089,15 @@ msgid "Upgrading with a CD or DVD ROM"
msgstr "Mettre à jour avec un CD ou DVD"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to upgrade from one version to another (for example from "
+#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
+#| "physical media, follow these steps:"
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
"Si vous voulez mettre à jour d'une version à une autre (par exemple de "
"Wheezy 7.0.0 à 7.0.1) mais que vous ne possédez pas de connexion Internet, "
@@ -6272,6 +6360,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -6355,10 +6451,10 @@ msgid ""
"address or IP address like this: <computeroutput>[192.168.0.10]</"
"computeroutput>."
msgstr ""
-"Les valeurs par défaut sont définies dans la section "
-"<computeroutput>[default]</computeroutput>. Pour configurer un client, "
-"indiquez son adresse MAC ou son adresse IP de cette manière : "
-"<computeroutput>[192.168.0.10]</computeroutput>."
+"Les valeurs par défaut sont définies dans la section <computeroutput>"
+"[default]</computeroutput>. Pour configurer un client, indiquez son adresse "
+"MAC ou son adresse IP de cette manière : <computeroutput>[192.168.0.10]</"
+"computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -8708,17 +8804,13 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr "Nouvelles fonctionnalités dans Debian Edu Wheezy"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
+#| "2013-??-??"
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Nouvelles fonctionnalités de Debian Edu 7.0.0+r0 « Wheezy », publiée "
"le ?? ?? 2013"
@@ -8735,12 +8827,6 @@ msgstr ""
"Décor mis à jour et nouveau logo Debian Edu/Skolelinux visible pendant "
"l'installation, sur l'écran de connexion et sur le fond d'écran du bureau."
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
-
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr "Changements dans l'installation"
@@ -8760,7 +8846,9 @@ msgid "Software updates"
msgstr "Mises à jour des logiciels"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr "Toutes les nouveautés de Debian « Wheezy », comme par exemple :"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8768,15 +8856,22 @@ msgid "Linux kernel 3.2.x"
msgstr "Noyau Linux version 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
+#| "installed by default; to choose GNOME or LXDE: see manual.)"
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
"Environnements de bureau KDE « Plasma » 4.8.4, GNOME 3.4 et LXDE (KDE est "
"installé par défaut ; pour choisir GNOME ou LXDE, consultez le manuel)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+#, fuzzy
+#| msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr "Navigateur web Iceweasel 10 ESR"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8824,8 +8919,14 @@ msgid "Debian Wheezy includes about 37000 packages available for installation."
msgstr "Debian Wheezy contient environ 37 000 paquets prêts à être installés."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
+#| "installmanual\">installation manual</ulink>."
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -8840,9 +8941,13 @@ msgid "Documentation and translation updates"
msgstr "Mises à jour des documentations et des traductions"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Translation updates for the templates used in the installer. These "
+#| "templates are now available in 28 languages."
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
"Ces chaînes sont maintenant disponibles en 28 langues."
@@ -8877,7 +8982,7 @@ msgid "Other changes"
msgstr "Autres changements"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8912,6 +9017,12 @@ msgstr ""
"Pas de possibilité pour le moment d'importer en masse des données de comptes "
"utilisateur (ldif ou CSV)."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Droits d'auteur et auteurs"
@@ -10456,6 +10567,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Mise à jour des traduction pour les chaînes utilisées dans l'installateur. "
+"Ces chaînes sont maintenant disponibles en 28 langues."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -11332,6 +11451,30 @@ msgstr ""
"ici <ulink url='http://developer.skolelinux.no/info/cdbygging/news."
"html'>http://developer.skolelinux.no/info/cdbygging/news.html</ulink>"
+#~ msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#~ msgid "[attachment:gosa2_overview.png]"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#~ msgid "[attachment:filterbox.png]"
+#~ msgstr "[attachment:filterbox.png]"
+
+#~ msgid "[attachment:edit_user.png]"
+#~ msgstr "[attachment:edit_user.png]"
+
+#~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#, fuzzy
+#~| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#~ msgid "FIXME: hopefully. h01ger is asking around."
+#~ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
+
#~ msgid ""
#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
#~ msgstr ""
@@ -11551,9 +11694,6 @@ msgstr ""
#~ msgid "21-Finish_the_Installation-Installation_complete.png"
#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
#~ msgid "23-Tjener-KDM_Login.png"
#~ msgstr "23-Tjener-KDM_Login.png"
@@ -11578,10 +11718,6 @@ msgstr ""
#~ msgid "Debian Edu desktop"
#~ msgstr "bureau Debian Edu"
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr ""
-#~ "Page d'aperçu de GOsa² après connexion en tant que premier utilisateur"
-
#~ 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 "
@@ -11631,12 +11767,6 @@ msgstr ""
#~ " done\n"
#~ " kadmin.local -q \"modpol -maxlife 0secs users\""
-#~ msgid "Filterbox"
-#~ msgstr "Boîte de filtre"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modifier les données d'utilisateur"
-
#~ msgid "Set user password"
#~ msgstr "Définir le mot de passe utilisateur"
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 26acff7..d5ca9ff 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -23,11 +23,15 @@ msgid "en"
msgstr "it"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.0.0+r0"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manuale per Debian Edu 7.0.0+r0 Codename Wheezy"
#. type: Content of: <article><section><para>
@@ -39,7 +43,9 @@ msgstr ""
"once we have new artwork"
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Questa è la guida per Debian Edu Wheezy 7.0.0+r0 release."
#. type: Content of: <article><section><para>
@@ -1363,8 +1369,12 @@ msgstr ""
"ulink>."
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
+#| "\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
"Download del supporto di installazione per Debian Edu 7.0.0+r0 Codename "
"Wheezy"
@@ -1384,35 +1394,52 @@ msgstr ""
"FTP, HTTP o rsync:"
#. type: Content of: <article><section><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
+#| "still... They currently don't work. CD download URL (debian-"
+#| "edu~7.0+edu0~a0-CD.iso) should work."
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
"CD.iso) should work."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "DVD.iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
@@ -1430,25 +1457,37 @@ msgstr ""
"disponibile a "
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
@@ -1462,25 +1501,38 @@ msgid "The sources are available via"
msgstr "I sorgenti sono disponibili via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
+#| "source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
+#| "edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</"
+#| "computeroutput>"
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
@@ -2520,9 +2572,15 @@ msgstr "[attachment:20-Finish_the_Installation.png]"
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr "[attachment:21-Finish_the_Installation-Installation_complete.png]"
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
-msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "22-Tjener_GRUB_boot_menu.png"
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
+msgstr "22-Tjener_GRUB_boot_menu.png"
#. type: Content of: <article><section><section><para>
msgid "[attachment:23-Tjener-KDM_Login.png]"
@@ -2716,9 +2774,15 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr "Accesso a GOsa² e Pagina iniziale"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
-msgstr "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/gosa2_overview.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
+msgstr "Pagina di GOsa² dopo il login come primo utente"
#. type: Content of: <article><section><section><section><para>
msgid "After logging in to GOsa² you will see the overview page of GOsa²."
@@ -2933,9 +2997,15 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Cercare, modificare e cancellare utenti"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
-msgstr "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/filterbox.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
+msgstr "Il box Filter"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2976,9 +3046,15 @@ msgstr ""
"cambiare la password dell'utente o modificare la lista dei gruppi ai quali è "
"collegato."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
-msgstr "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+#| msgid "./images/smile.png"
+msgid "./images/edit_user.png"
+msgstr "./images/smile.png"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
+msgstr "Modificare i dati utente"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -4728,16 +4804,23 @@ msgstr ""
"LDAP."
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. "
+#| "Be careful and don't mess up the LDAP database, same applies for jxplorer."
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
"Attenzione: <computeroutput>ldapvi</computeroutput> è uno strumento molto "
"potente. Fare attenzione a non rovinare tutto il database LDAP, lo stesso "
"vale per jxplorer."
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+#, fuzzy
+#| msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr "jxplorer, una GUI LDAP"
#. type: Content of: <article><section><section><para>
@@ -4894,10 +4977,15 @@ msgid "Upgrading with a CD or DVD ROM"
msgstr "Aggiornamento da CD o DVD"
#. type: Content of: <article><section><section><para>
+#, fuzzy
+#| msgid ""
+#| "If you want to upgrade from one version to another (for example from "
+#| "Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only "
+#| "physical media, follow these steps:"
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
"Se si vuole aggiornare da una versione a un'altra (per esempio da Wheezy "
"7.0.0 a 7.0.1) ma non si ha collegamento internet, ma solo un media fisico, "
@@ -6130,6 +6218,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -6213,8 +6309,8 @@ msgid ""
msgstr ""
"Il valore di default è definito in <computeroutput>[default]</"
"computeroutput>, per configurare un client, occorre indicarlo usando "
-"l'indirizzo MAC o l'IP del client come questo: "
-"<computeroutput>[192.168.0.10] </computeroutput>."
+"l'indirizzo MAC o l'IP del client come questo: <computeroutput>"
+"[192.168.0.10] </computeroutput>."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -8508,17 +8604,13 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr "Nuove caratteristiche in Debian Edu Wheezy"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released "
+#| "2013-??-??"
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Nuove caratteristiche in Debian Edu 7.0.0+r0 Codename \"Wheezy\" "
"released ??-??-2012"
@@ -8535,12 +8627,6 @@ msgstr ""
"Aggiornati artwork e il nuovo logo di Debian Edu / Skolelinux logo, visibile "
"durante la installazione, nella schermata di login e come sfondo del desktop."
-#. type: Content of: <article><section><section><section><para>
-#, fuzzy
-#| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
-
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr "Cambiamenti nell'installazione"
@@ -8560,7 +8646,9 @@ msgid "Software updates"
msgstr "Aggiornamenti software"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+#, fuzzy
+#| msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr "Tutto ciò che è nuovo in Debian Wheezy, ad esempio:"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8568,15 +8656,22 @@ msgid "Linux kernel 3.2.x"
msgstr "Linux kernel 3.2.x"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
+#| "installed by default; to choose GNOME or LXDE: see manual.)"
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
"Ambienti desktop KDE \"Plasma\" 4.8.4, GNOME 3.4, e LXDE 4 (KDE è installati "
"di default; per scegliere GNOME o LXDE: vedere il manuale.)"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+#, fuzzy
+#| msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr "Browser web Iceweasel 10 ESR"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -8626,8 +8721,14 @@ msgstr ""
"l'installazione."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "More information about Debian Wheezy 7.0 is provided in the <ulink url="
+#| "\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</"
+#| "ulink> and the <ulink url=\"http://www.debian.org/releases/wheezy/"
+#| "installmanual\">installation manual</ulink>."
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -8642,9 +8743,13 @@ msgid "Documentation and translation updates"
msgstr "Aggiornamenti della documentazione e delle traduzioni"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#, fuzzy
+#| msgid ""
+#| "Translation updates for the templates used in the installer. These "
+#| "templates are now available in 28 languages."
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
"Aggionate le traduzioni per i template usati dall'installer. Questi template "
"sono disponibili in 28 lingue."
@@ -8678,7 +8783,7 @@ msgid "Other changes"
msgstr "Altre modifiche"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -8713,6 +8818,12 @@ msgstr ""
"Nessuna importazione di massa di dati di account utente in GOsa (ldif o csv) "
"è ancora disponibile."
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Copyright e autori"
@@ -10223,6 +10334,14 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+"Aggionate le traduzioni per i template usati dall'installer. Questi template "
+"sono disponibili in 28 lingue."
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -11073,6 +11192,30 @@ msgstr ""
"Maggiori informazioni sulle vecchie versioni possono essere trovate a <ulink "
"url=\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
+#~ msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#~ msgstr "[attachment:22-Tjener_GRUB_boot_menu.png]"
+
+#~ msgid "[attachment:gosa2_overview.png]"
+#~ msgstr "[attachment:gosa2_overview.png]"
+
+#~ msgid "[attachment:filterbox.png]"
+#~ msgstr "[attachment:filterbox.png]"
+
+#~ msgid "[attachment:edit_user.png]"
+#~ msgstr "[attachment:edit_user.png]"
+
+#~ msgid ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+#~ msgstr ""
+#~ "FIXME: this paragraph is work in progress and not yet to be translated. "
+#~ "Please help writing it instead."
+
+#, fuzzy
+#~| msgid "FIXME: hopefully. h01ger is one it to ask gismo."
+#~ msgid "FIXME: hopefully. h01ger is asking around."
+#~ msgstr "FIXME: hopefully. h01ger is one it to ask gismo."
+
#~ msgid ""
#~ "FIXME: this needs to be updated for squeeze2wheezy. afaik not much changed"
#~ msgstr ""
@@ -11284,9 +11427,6 @@ msgstr ""
#~ msgid "21-Finish_the_Installation-Installation_complete.png"
#~ msgstr "21-Finish_the_Installation-Installation_complete.png"
-#~ msgid "22-Tjener_GRUB_boot_menu.png"
-#~ msgstr "22-Tjener_GRUB_boot_menu.png"
-
#~ msgid "23-Tjener-KDM_Login.png"
#~ msgstr "23-Tjener-KDM_Login.png"
@@ -11311,9 +11451,6 @@ msgstr ""
#~ msgid "Debian Edu desktop"
#~ msgstr "Debian Edu desktop"
-#~ msgid "GOsa² overview page after login as the first user"
-#~ msgstr "Pagina di GOsa² dopo il login come primo utente"
-
#~ 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 "
@@ -11359,12 +11496,6 @@ msgstr ""
#~ " done\n"
#~ " kadmin.local -q \"modpol -maxlife 0secs users\""
-#~ msgid "Filterbox"
-#~ msgstr "Il box Filter"
-
-#~ msgid "Editing user data"
-#~ msgstr "Modificare i dati utente"
-
#~ msgid "Set user password"
#~ msgstr "Configurare la password dell'utente"
@@ -15194,13 +15325,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -15212,8 +15343,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15221,8 +15352,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15239,8 +15370,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15248,8 +15379,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index a46963c..960efcd 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -24,11 +24,15 @@ msgid "en"
msgstr "nb"
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+#, fuzzy
+#| msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr "Debian Edu / Skolelinux Wheezy 7.0.0+r0 utgivelsesmanual"
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+#, fuzzy
+#| msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Utgivelsesmanual for Debian Edu 7.0.0+r0 kodenavn Wheezy"
#. type: Content of: <article><section><para>
@@ -38,7 +42,9 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+#, fuzzy
+#| msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr "Dette er utgivelsesmanualen for Debian Edu Wheezy versjon 7.0.0+r0."
#. type: Content of: <article><section><para>
@@ -870,10 +876,10 @@ msgid ""
"using network-PROM (or PXE) without using the local client hard drive. The "
"thin client setup used is that of the Linux Terminal Server Project (LTSP)."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. Tynnklientoppsettet som er brukt er det til Linux "
"Terminal Server Project (LTSP)."
#. type: Content of: <article><section><section><section><para>
@@ -1647,8 +1653,12 @@ msgstr ""
"squeeze/installmanual\"> manualen til Debian Installer</ulink>."
#. type: Content of: <article><section><section><title>
+#, fuzzy
+#| msgid ""
+#| "Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy"
+#| "\""
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
"Last ned et installasjonsmedium for Debian Edu 7.0.0+r0 Kodenavn Wheezy"
@@ -1674,16 +1684,16 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1691,8 +1701,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1700,8 +1710,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1724,7 +1734,7 @@ msgstr ""
#, fuzzy
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1732,8 +1742,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1742,7 +1752,7 @@ msgstr ""
#, fuzzy
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1762,8 +1772,8 @@ msgstr "Kildekoden er tilgjengelig via"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<computeroutput>ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-5.0.4+edu0-"
"source-DVD.iso</computeroutput>"
@@ -1771,8 +1781,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
"<computeroutput>http://ftp.skolelinux.org/skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -1780,8 +1790,8 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
"edu-5.0.4+edu0-source-DVD.iso</computeroutput>"
@@ -2052,8 +2062,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "[attachment:Installer_help.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid ""
@@ -2931,29 +2941,29 @@ msgstr ""
#, fuzzy
msgid "[attachment:08-Choose_Debian_Edu_profile.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:09-Really_use_the_automatic_partitioning_tool.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:10-Really_use_the_automatic_partitioning_tool-Yes.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"lwat-]edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+"edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
@@ -2983,22 +2993,22 @@ msgstr "Sett passord"
#, fuzzy
msgid "[attachment:13-Install the base system.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:14-Select_and_install_software.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:17-Select_and_install_software.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
msgid "[attachment:18-Build LTSP chroot.png]"
@@ -3015,18 +3025,22 @@ msgstr ""
#, fuzzy
msgid "[attachment:20-Finish_the_Installation.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
#, fuzzy
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-"getting-]started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+"started.png\"/></imageobject>"
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3234,8 +3248,12 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa2_overview.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3397,8 +3415,15 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr "Søk etter og slett brukere"
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/filterbox.png"
+msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -3434,9 +3459,18 @@ msgstr ""
"bruker, endre passordet til brukeren og endre listen over grupper som "
"brukeren tilhører."
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+#, fuzzy
+msgid "./images/edit_user.png"
msgstr ""
+"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
+"lenny-10-basesystem.png\"/></imageobject>"
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+#, fuzzy
+#| msgid "Adding users"
+msgid "Editing user data"
+msgstr "Legge til brukere"
#. type: Content of: <article><section><section><section><title>
msgid "Set passwords"
@@ -3759,8 +3793,8 @@ msgstr ""
#, fuzzy
msgid "[attachment:gosa_systems_list.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
msgid "[attachment:gosa_systems_host_details.png]"
@@ -3774,8 +3808,8 @@ msgstr ""
#, fuzzy
msgid "[attachment:gosa_systems_add_netgroup.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -4373,8 +4407,8 @@ msgstr ""
#, fuzzy
msgid "[attachment:slbackup-php_maintenance.png]"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
-"edu-]squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
+"squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><title>
msgid "Server Monitoring"
@@ -5279,13 +5313,14 @@ msgstr ""
#, fuzzy
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
"</inlinemediaobject> NB: lokale enheter med <computeroutput>ltspfs</"
"computeroutput> vil ikke fungere lenger uten LDM."
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -5418,8 +5453,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -6273,10 +6308,10 @@ msgid ""
"boots from a diskette or directly from the server using network-PROM (or "
"PXE) without using a local client hard drive."
msgstr ""
-"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en "
-"(X-)terminal. Dette betyr at maskinen starter opp fra en diskett eller "
-"direkte fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av "
-"lokal harddisk i klienten. "
+"Et tynnklientoppsett gjør det mulig for vanlige PCer å fungere som en (X-)"
+"terminal. Dette betyr at maskinen starter opp fra en diskett eller direkte "
+"fra tjeneren ved hjelp av nettverks-PROM (eller PXE) uten bruk av lokal "
+"harddisk i klienten. "
#. type: Content of: <article><section><section><para>
msgid "<emphasis role=\"strong\">Diskless workstation</emphasis>"
@@ -6697,6 +6732,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -9263,16 +9306,10 @@ msgstr ""
"Dette er den (<emphasis>fortsatt ufullstendige</emphasis>) "
"utgivelsesmanualen for Debian Edu Squeeze 5.0.4+edu1 utgivelsen"
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-
#. type: Content of: <article><section><section><title>
#, fuzzy
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
"Nye egenskaper i Debian Edu 5.0.4+edu0 Kodenavn Squeeze - utgitt 08.02.2010"
@@ -9286,10 +9323,6 @@ msgid ""
"installation, in the login screen and as desktop wallpaper."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
#, fuzzy
#| msgid "Installation"
@@ -9311,7 +9344,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9322,12 +9355,13 @@ msgstr "Linux kjerneversjon 2.6.18"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -9377,7 +9411,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -9394,7 +9428,7 @@ msgstr "Dokumentasjonskrivere og oversettere"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9420,7 +9454,7 @@ msgid "Other changes"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -9446,6 +9480,12 @@ msgid ""
"No mass import of user account data in GOsa (ldif or csv) available yet."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr "Opphavsrett og forfattere"
@@ -10925,6 +10965,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
@@ -11824,8 +11870,8 @@ msgstr ""
#, fuzzy
#~ msgid "11-Participate_in_the_package_usage_survey.png"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
+#~ "edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -11856,8 +11902,8 @@ msgstr ""
#, fuzzy
#~ msgid "21-Finish_the_Installation-Installation_complete.png"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
-#~ "getting-]started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
+#~ "started.png\"/></imageobject>"
#, fuzzy
#~| msgid "Requirements for a network setup"
@@ -11865,11 +11911,6 @@ msgstr ""
#~ msgstr "Krav for nettverksoppsett"
#, fuzzy
-#~| msgid "Adding users"
-#~ msgid "Editing user data"
-#~ msgstr "Legge til brukere"
-
-#, fuzzy
#~| msgid "Set passwords"
#~ msgid "Set user password"
#~ msgstr "Sett passord"
@@ -12264,12 +12305,6 @@ msgstr ""
#~ "ulink>."
#, fuzzy
-#~ msgid "./images/collect_system_info.png"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-#~ "lenny-10-basesystem.png\"/></imageobject>"
-
-#, fuzzy
#~| msgid ""
#~| "The <computeroutput>debian-edu-expert</computeroutput> boot-option adds "
#~| "the <emphasis role=\"strong\">minimal</emphasis> profile to the profile "
@@ -13080,8 +13115,8 @@ msgstr ""
#~ "workstation server(s):"
#~ msgstr ""
#~ "Forutsatt at de diskløse arbeidsstasjonene kjører <computeroutput>i386</"
-#~ "computeroutput>, må følgende kommandoer utføres på "
-#~ "arbeidsstasjonstjener(ne):"
+#~ "computeroutput>, må følgende kommandoer utføres på arbeidsstasjonstjener"
+#~ "(ne):"
#~ msgid ""
#~ "export LTSPCHROOT=/opt/ltsp/i386/\n"
@@ -15408,13 +15443,13 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(|(!(sambaPwdLastSet=*))"
#~ "(sambaPwdLastSet=0)))' uid | less"
#~ msgid ""
@@ -15426,8 +15461,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15435,8 +15470,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(!(sambaPwdLastSet=*)))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nadd:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' > /"
#~ "etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15452,8 +15487,8 @@ msgstr ""
#~ msgid ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
@@ -15461,8 +15496,8 @@ msgstr ""
#~ " -f /etc/ldap/fixamba.ldif"
#~ msgstr ""
#~ "ldapsearch -xZLLLWD 'cn=admin,ou=People,dc=skole,dc=skolelinux,dc=no' -b "
-#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one "
-#~ "'(&(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
+#~ "'ou=People,dc=skole,dc=skolelinux,dc=no' -s one '(&"
+#~ "(objectClass=sambaSamAccount)(sambaPwdLastSet=0))' dn | sed '/.\\+/a"
#~ "\\changetype: modify\\nreplace:sambaPwdLastSet\\nsambaPwdLastSet: 2\\n-' "
#~ "> /etc/ldap/fixamba.ldif\n"
#~ "\n"
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index 793b526..b5d241f 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-05-31 09:58-0400\n"
+"POT-Creation-Date: 2013-06-15 19:02+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"
@@ -21,11 +21,11 @@ msgid "en"
msgstr ""
#. type: Content of: <article><articleinfo><title>
-msgid "Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual"
+msgid "Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual"
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "Manual for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
#. type: Content of: <article><section><para>
@@ -35,7 +35,7 @@ msgid ""
msgstr ""
#. type: Content of: <article><section><para>
-msgid "This is the manual for the Debian Edu Wheezy 7.0.0+r0 release."
+msgid "This is the manual for the Debian Edu Wheezy 7.1+edu0 release."
msgstr ""
#. type: Content of: <article><section><para>
@@ -1021,7 +1021,7 @@ msgstr ""
#. type: Content of: <article><section><section><title>
msgid ""
-"Download the installation media for Debian Edu 7.0.0+r0 Codename \"Wheezy\""
+"Download the installation media for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1037,27 +1037,27 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
msgid ""
-"FIXME: the DVD and source DVD download URLs need to be adapted for wheezy "
-"still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-"
-"CD.iso) should work."
+"FIXME: 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."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD."
-"iso\">debian-edu-7.0.0+r0-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD."
+"iso\">debian-edu-7.1+edu0-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1073,19 +1073,19 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-"
-"edu~7.0+edu0~a0-CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"edu-7.1+edu0~a2-CD.iso\">debian-edu-7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-"
-"CD.iso\">debian-edu~7.0+edu0~a0-CD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-"
+"CD.iso\">debian-edu~7.1+edu0~a2-CD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-"
-"edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>"
+"edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -1098,20 +1098,20 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso\">debian-edu-7.0.0+r0-source-DVD.iso</ulink>"
+"<ulink url=\"http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso\">debian-edu-7.1+edu0-source-DVD.iso</ulink>"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
-"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-"
-"source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>"
+"<computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-"
+"source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>"
msgstr ""
#. type: Content of: <article><section><section><title>
@@ -1895,8 +1895,12 @@ msgstr ""
msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
msgstr ""
-#. type: Content of: <article><section><section><para>
-msgid "[attachment:22-Tjener_GRUB_boot_menu.png]"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/22-Tjener_GRUB_boot_menu.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "22-Tjener_GRUB_boot_menu.png"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -2054,8 +2058,12 @@ msgstr ""
msgid "GOsa² Login plus Overview"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:gosa2_overview.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/gosa2_overview.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "GOsa² overview page after login as the first user"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2198,8 +2206,12 @@ msgstr ""
msgid "Search, modify and delete users"
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:filterbox.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/filterbox.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Filterbox"
msgstr ""
#. type: Content of: <article><section><section><section><para>
@@ -2227,8 +2239,12 @@ msgid ""
"belongs to."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "[attachment:edit_user.png]"
+#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/edit_user.png"
+msgstr ""
+
+#. type: Content of: <article><section><section><section><para><inlinemediaobject><textobject><phrase>
+msgid "Editing user data"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -3509,11 +3525,12 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be "
-"careful and don't mess up the LDAP database, same applies for jxplorer."
+"careful and don't mess up the LDAP database, same warning applies for "
+"JXplorer."
msgstr ""
#. type: Content of: <article><section><section><title>
-msgid "jxplorer, an LDAP GUI"
+msgid "JXplorer, an LDAP GUI"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -3628,8 +3645,8 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
"If you want to upgrade from one version to another (for example from Wheezy "
-"7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical "
-"media, follow these steps:"
+"7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only "
+"physical media, follow these steps:"
msgstr ""
#. type: Content of: <article><section><section><para>
@@ -4519,6 +4536,14 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
+"Note that changing to one of the subnets already used elsewhere in Debian "
+"Edu will not work. 192.168.1.0/24 is already set up as the thin client "
+"network. Changing to this subnet will require manual editing of "
+"configuration files to remove duplicate entries."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
+msgid ""
"There is no easy way to change the DNS domain name. Changing it would "
"require changes to both the LDAP structure and several files in the main "
"server file system. There is also no easy way to change the host and DNS "
@@ -6260,15 +6285,9 @@ msgstr ""
msgid "New features in Debian Edu Wheezy"
msgstr ""
-#. type: Content of: <article><section><para>
-msgid ""
-"FIXME: this paragraph is work in progress and not yet to be translated. "
-"Please help writing it instead."
-msgstr ""
-
#. type: Content of: <article><section><section><title>
msgid ""
-"New features for Debian Edu 7.0.0+r0 Codename \"Wheezy\" released 2013-??-??"
+"New features for Debian Edu 7.1+edu0 Codename \"Wheezy\" released 2013-??-??"
msgstr ""
#. type: Content of: <article><section><section><section><title>
@@ -6281,10 +6300,6 @@ msgid ""
"installation, in the login screen and as desktop wallpaper."
msgstr ""
-#. type: Content of: <article><section><section><section><para>
-msgid "FIXME: hopefully. h01ger is asking around."
-msgstr ""
-
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
msgstr ""
@@ -6301,7 +6316,7 @@ msgid "Software updates"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "Everything which is new in Debian Wheezy, eg:"
+msgid "Everything which is new in Debian Wheezy 7.x, eg:"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6310,12 +6325,13 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is "
-"installed by default; to choose GNOME or LXDE: see manual.)"
+"Desktop environments KDE \"Plasma\" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE "
+"0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see "
+"manual.)"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-msgid "Web browser Iceweasel 10 ESR"
+msgid "Web browser Iceweasel 17 ESR"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
@@ -6364,7 +6380,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
-"More information about Debian Wheezy 7.0 is provided in the <ulink url="
+"More information about Debian Wheezy 7.x is provided in the <ulink url="
"\"http://www.debian.org/releases/wheezy/releasenotes\">release notes</ulink> "
"and the <ulink url=\"http://www.debian.org/releases/wheezy/installmanual"
"\">installation manual</ulink>."
@@ -6377,7 +6393,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
"Translation updates for the templates used in the installer. These templates "
-"are now available in 28 languages."
+"are now available in 29 languages."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6403,7 +6419,7 @@ msgid "Other changes"
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
-msgid "New XFCE desktop task."
+msgid "New Xfce desktop task."
msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
@@ -6429,6 +6445,12 @@ msgid ""
"No mass import of user account data in GOsa (ldif or csv) available yet."
msgstr ""
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
+"FIXME: mass import will soon be fixed, remove this paragraph once this has "
+"happene d."
+msgstr ""
+
#. type: Content of: <article><section><title>
msgid "Copyright and authors"
msgstr ""
@@ -7542,6 +7564,12 @@ msgstr ""
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
+"Translation updates for the templates used in the installer. These templates "
+"are now available in 28 languages."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+msgid ""
"The Debian Edu Squeeze Manual has generally been cleaned up and improved. A "
"proof-read with corrections was done by a native English linguist."
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index 87b6f68..7962a3c 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Wheezy 7.0.0+r0 Manual <?dbtimestamp?></title></articleinfo>
+<article lang="en"><articleinfo><title>Debian Edu / Skolelinux Wheezy 7.1+edu0 Manual <?dbtimestamp?></title></articleinfo>
<section id="AboutDebianEdu">
-<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
+<title>Manual for Debian Edu 7.1+edu0 Codename "Wheezy"
</title>
<para>[attachment:welcome_to_tjener.png]
FIXME: we need a wheezy login shot here once we have new artwork
</para>
-<para>This is the manual for the Debian Edu Wheezy 7.0.0+r0 release.
+<para>This is the manual for the Debian Edu Wheezy 7.1+edu0 release.
</para>
<para>The version at <ulink url="http://wiki.debian.org/DebianEdu/Documentation/Wheezy"/> is a wiki and updated frequently.
</para>
@@ -421,8 +421,8 @@ FIXME: we need a wheezy login shot here once we have new artwork
</para>
</section>
-<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
-<title>Download the installation media for Debian Edu 7.0.0+r0 Codename "Wheezy"
+<section id="Installation--Download_the_installation_media_for_Debian_Edu_7.1.2B-edu0_Codename_.22Wheezy.22">
+<title>Download the installation media for Debian Edu 7.1+edu0 Codename "Wheezy"
</title>
<section id="Installation--DVD_for_i386.2C_amd64">
@@ -431,14 +431,14 @@ FIXME: we need a wheezy login shot here once we have new artwork
<para>The multi-architecture DVD ISO image is 4.4 GiB large and can be used for installation of amd64 and i386 machines. It can be downloaded over FTP, HTTP or rsync via:
</para>
<para>
-FIXME: the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-CD.iso) should work.
+FIXME: 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.
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD.iso">debian-edu-7.1+edu0-DVD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso">debian-edu-7.0.0+r0-DVD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-DVD.iso">debian-edu-7.1+edu0-DVD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-DVD.iso debian-edu-7.0.0+r0-DVD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-DVD.iso debian-edu-7.1+edu0-DVD.iso</computeroutput>
</para></listitem></itemizedlist>
</section>
@@ -448,11 +448,11 @@ FIXME: the DVD and source DVD download URLs need to be adapted for wheezy still.
<para>The netinstall CD, which can be used for installation of i386 and amd64 as well, is available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu~7.0+edu0~a0-CD.iso">debian-edu~7.0+edu0~a0-CD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/wheezy/debian-edu-7.1+edu0~a2-CD.iso">debian-edu-7.1+edu0~a2-CD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu~7.0+edu0~a0-CD.iso">debian-edu~7.0+edu0~a0-CD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0~a2-CD.iso">debian-edu~7.1+edu0~a2-CD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu~7.0+edu0~a0-CD.isodebian-edu~7.0+edu0~a0-CD.iso </computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu~7.1+edu0~a2-CD.isodebian-edu~7.1+edu0~a2-CD.iso </computeroutput>
</para></listitem></itemizedlist>
</section>
@@ -462,11 +462,11 @@ FIXME: the DVD and source DVD download URLs need to be adapted for wheezy still.
<para>The sources are available via
</para>
<itemizedlist><listitem override="none">
-<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink>
+<para><ulink url="ftp://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
</para>
-<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso">debian-edu-7.0.0+r0-source-DVD.iso</ulink>
+<para><ulink url="http://ftp.skolelinux.org/skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso">debian-edu-7.1+edu0-source-DVD.iso</ulink>
</para>
-<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.0.0+r0-source-DVD.iso debian-edu-7.0.0+r0-source-DVD.iso</computeroutput>
+<para><computeroutput>rsync ftp.skolelinux.org::skolelinux-cd/debian-edu-7.1+edu0-source-DVD.iso debian-edu-7.1+edu0-source-DVD.iso</computeroutput>
</para></listitem></itemizedlist>
</section>
</section>
@@ -822,7 +822,7 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
</para>
<para>[attachment:21-Finish_the_Installation-Installation_complete.png]
</para>
-<para>[attachment:22-Tjener_GRUB_boot_menu.png]
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/22-Tjener_GRUB_boot_menu.png"/></imageobject><textobject><phrase>22-Tjener_GRUB_boot_menu.png</phrase></textobject></inlinemediaobject>
</para>
<para>[attachment:23-Tjener-KDM_Login.png]
</para>
@@ -919,7 +919,7 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
<section id="GettingStarted--GOsa.2BALI-_Login_plus_Overview">
<title>GOsa² Login plus Overview
</title>
-<para>[attachment:gosa2_overview.png]
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/gosa2_overview.png"/></imageobject><textobject><phrase>GOsa² overview page after login as the first user</phrase></textobject></inlinemediaobject>
</para>
<para>After logging in to GOsa² you will see the overview page of GOsa².
</para>
@@ -971,7 +971,7 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
<section id="GettingStarted--Search.2C_modify_and_delete_users">
<title>Search, modify and delete users
</title>
-<para>[attachment:filterbox.png]
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/filterbox.png"/></imageobject><textobject><phrase>Filterbox</phrase></textobject></inlinemediaobject>
</para>
<para>To modify or delete a user, use GOsa² to browse the list of users on your system. On the very right of the screen you will find the "Filter" box, a search tool provided by GOsa². If you don't know the exact location of your user account in your tree, change to the base level of the GOsa²/LDAP tree and search there with the option marked "[x] Search in subtrees".
</para>
@@ -979,7 +979,7 @@ FIXME: these screenshots need to be redone once we have wheezy artwork
</para>
<para>A new page will show up where you can directly modify information about the user, change the password of the user and modify the list of groups the user belongs to.
</para>
-<para>[attachment:edit_user.png]
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/edit_user.png"/></imageobject><textobject><phrase>Editing user data</phrase></textobject></inlinemediaobject>
</para>
</section>
@@ -1558,12 +1558,12 @@ resize2fs /dev/vg_system/skole+tjener+home0]]></screen>
</para>
<para>To add an LDAP object using ldapvi, use object sequence number with the string <computeroutput>add</computeroutput> in front of the new LDAP object.
</para>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be careful and don't mess up the LDAP database, same applies for jxplorer.
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Warning: <computeroutput>ldapvi</computeroutput> is a very powerful tool. Be careful and don't mess up the LDAP database, same warning applies for JXplorer.
</para>
</section>
-<section id="Administration--jxplorer.2C_an_LDAP_GUI">
-<title>jxplorer, an LDAP GUI
+<section id="Administration--JXplorer.2C_an_LDAP_GUI">
+<title>JXplorer, an LDAP GUI
</title>
<para>If you prefer a GUI to work with the LDAP database, check out the <computeroutput>jxplorer</computeroutput> package, wich is installed by default. To get write access connect like this:
</para><screen><![CDATA[host: ldap.intern
@@ -1612,7 +1612,7 @@ apt-get update]]></screen>
<section id="Administration--Upgrading_with_a_CD_or_DVD_ROM">
<title>Upgrading with a CD or DVD ROM
</title>
-<para>If you want to upgrade from one version to another (for example from Wheezy 7.0.0 to 7.0.1) but you do not have Internet connectivity, only physical media, follow these steps:
+<para>If you want to upgrade from one version to another (for example from Wheezy 7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps:
</para>
<para>Insert the CD/DVD-ROM in the drive, mount it and use the apt-cdrom command:
</para><screen><![CDATA[mount /media/cdrom
@@ -2028,6 +2028,8 @@ d-i apt-setup/local1/key string http://example.org/key.asc]]></s
</title>
<para>The debian-edu-config package comes with a tool which helps in changing the network from 10.0.0.0/8 to something else. Have a look at <computeroutput>/usr/share/debian-edu-config/tools/subnet-change</computeroutput>. It is intended for use just after installation on the main server, to update LDAP and other files that need to be edited to change the subnet.
</para>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/alert.png"/></imageobject><textobject><phrase>/!\</phrase></textobject></inlinemediaobject> Note that changing to one of the subnets already used elsewhere in Debian Edu will not work. 192.168.1.0/24 is already set up as the thin client network. Changing to this subnet will require manual editing of configuration files to remove duplicate entries.
+</para>
<para>There is no easy way to change the DNS domain name. Changing it would require changes to both the LDAP structure and several files in the main server file system. There is also no easy way to change the host and DNS name of the main server (tjener.intern). To do so would also require changes to LDAP and files in the main-server and client file system. In both cases the Kerberos setup would have to be changed, too.
</para>
</section>
@@ -2906,12 +2908,9 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
<section id="Features">
<title>New features in Debian Edu Wheezy
</title>
-<para>
-FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead.
-</para>
-<section id="Features--New_features_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22_released_2013-.3F.3F-.3F.3F">
-<title>New features for Debian Edu 7.0.0+r0 Codename "Wheezy" released 2013-??-??
+<section id="Features--New_features_for_Debian_Edu_7.1.2B-edu0_Codename_.22Wheezy.22_released_2013-.3F.3F-.3F.3F">
+<title>New features for Debian Edu 7.1+edu0 Codename "Wheezy" released 2013-??-??
</title>
<section id="Features--User_visible_changes">
@@ -2921,9 +2920,6 @@ FIXME: this paragraph is work in progress and not yet to be translated. Please h
<listitem>
<para>Updated artwork and new Debian Edu / Skolelinux logo, visible during installation, in the login screen and as desktop wallpaper.
</para></listitem></itemizedlist>
-<para>
-FIXME: hopefully. h01ger is asking around.
-</para>
</section>
<section id="Features--Installation_changes">
@@ -2940,17 +2936,17 @@ FIXME: hopefully. h01ger is asking around.
</title>
<itemizedlist>
<listitem>
-<para>Everything which is new in Debian Wheezy, eg:
+<para>Everything which is new in Debian Wheezy 7.x, eg:
</para>
<itemizedlist>
<listitem>
<para>Linux kernel 3.2.x
</para></listitem>
<listitem>
-<para>Desktop environments KDE "Plasma" 4.8.4, GNOME 3.4, and LXDE 4 (KDE is installed by default; to choose GNOME or LXDE: see manual.)
+<para>Desktop environments KDE "Plasma" 4.8.4, GNOME 3.4, Xfce 4.8.6, and LXDE 0.5.5 (KDE is installed by default; to choose GNOME, Xfce or LXDE: see manual.)
</para></listitem>
<listitem>
-<para>Web browser Iceweasel 10 ESR
+<para>Web browser Iceweasel 17 ESR
</para></listitem>
<listitem>
<para>LibreOffice 3.5.4
@@ -2990,7 +2986,7 @@ FIXME: hopefully. h01ger is asking around.
</para></listitem></itemizedlist>
<itemizedlist>
<listitem>
-<para>More information about Debian Wheezy 7.0 is provided in the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>.
+<para>More information about Debian Wheezy 7.x is provided in the <ulink url="http://www.debian.org/releases/wheezy/releasenotes">release notes</ulink> and the <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink>.
</para></listitem></itemizedlist></listitem></itemizedlist>
</section>
@@ -2999,7 +2995,7 @@ FIXME: hopefully. h01ger is asking around.
</title>
<itemizedlist>
<listitem>
-<para>Translation updates for the templates used in the installer. These templates are now available in 28 languages.
+<para>Translation updates for the templates used in the installer. These templates are now available in 29 languages.
</para></listitem>
<listitem>
<para>The Debian Edu Wheezy Manual is fully translated to German, French, Italian and Danish. Partly translated versions exist for Norwegian Bokmal and Spanish.
@@ -3020,7 +3016,7 @@ FIXME: hopefully. h01ger is asking around.
</title>
<itemizedlist>
<listitem>
-<para>New XFCE desktop task.
+<para>New Xfce desktop task.
</para></listitem>
<listitem>
<para>LTSP clients start as diskless workstation / thin client can be configured via command line argument -- or individually adding an entry in lts.conf or LDAP.
@@ -3036,6 +3032,10 @@ FIXME: hopefully. h01ger is asking around.
<itemizedlist>
<listitem>
<para>No mass import of user account data in GOsa (ldif or csv) available yet.
+</para></listitem>
+<listitem>
+<para>
+FIXME: mass import will soon be fixed, remove this paragraph once this has happene d.
</para></listitem></itemizedlist>
</section>
</section>
@@ -3114,8 +3114,8 @@ FIXME". <!-- <remark>status ignore</remark> -->
<title>Appendix A - The GNU General Public License
</title><screen><![CDATA[Note to translators: there is no need to translate the GPL license text. ]]></screen>
-<section id="AppendixA--Manual_for_Debian_Edu_7.0.0.2B-r0_Codename_.22Wheezy.22">
-<title>Manual for Debian Edu 7.0.0+r0 Codename "Wheezy"
+<section id="AppendixA--Manual_for_Debian_Edu_7.1.2B-edu0_Codename_.22Wheezy.22">
+<title>Manual for Debian Edu 7.1+edu0 Codename "Wheezy"
</title>
<para>Copyright (C) 2007-2013 Holger Levsen < <ulink url="mailto:holger at layer-acht.org">holger at layer-acht.org</ulink> > and others, see the <link linkend="CopyRight">Copyright chapter</link> for the full list of copyright owners.
</para>
diff --git a/documentation/debian-edu-wheezy/fixme-status.txt b/documentation/debian-edu-wheezy/fixme-status.txt
index e0484af..4da7690 100644
--- a/documentation/debian-edu-wheezy/fixme-status.txt
+++ b/documentation/debian-edu-wheezy/fixme-status.txt
@@ -3,7 +3,7 @@ http://wiki.debian.org/DebianEdu/Documentation/Wheezy//AboutDebianEdu
FIXME: we need a wheezy login shot here once we have new artwork
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Installation
-FIXME: the DVD and source DVD download URLs need to be adapted for wheezy still... They currently don't work. CD download URL (debian-edu~7.0+edu0~a0-CD.iso) should work.
+FIXME: 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: these screenshots need to be redone once we have wheezy artwork
----------------------------------
@@ -16,8 +16,7 @@ FIXME explain how to use profiles from global policies for Windows machines in t
FIXME: describe roaming profile key for the global policy editor here
----------------------------------
http://wiki.debian.org/DebianEdu/Documentation/Wheezy//Features
-FIXME: this paragraph is work in progress and not yet to be translated. Please help writing it instead.
-FIXME: hopefully. h01ger is asking around.
+FIXME: mass import will soon be fixed, remove this paragraph once this has happene d.
====================
-11 FIXMEs left to fix
+10 FIXMEs left to fix
====================
diff --git a/documentation/debian-edu-wheezy/images/22-Tjener_GRUB_boot_menu.png b/documentation/debian-edu-wheezy/images/22-Tjener_GRUB_boot_menu.png
new file mode 100644
index 0000000..5a292ef
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/22-Tjener_GRUB_boot_menu.png differ
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 84d2811..d040f02 100644
Binary files a/documentation/debian-edu-wheezy/images/de/worldmap.png and b/documentation/debian-edu-wheezy/images/de/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/edit_user.png b/documentation/debian-edu-wheezy/images/edit_user.png
new file mode 100644
index 0000000..1011181
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/edit_user.png differ
diff --git a/documentation/debian-edu-wheezy/images/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 6f66451..963344b 100644
Binary files a/documentation/debian-edu-wheezy/images/es/worldmap.png and b/documentation/debian-edu-wheezy/images/es/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/filterbox.png b/documentation/debian-edu-wheezy/images/filterbox.png
new file mode 100644
index 0000000..b4d1984
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/filterbox.png differ
diff --git a/documentation/debian-edu-wheezy/images/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 3dcbdf2..d0fbe6e 100644
Binary files a/documentation/debian-edu-wheezy/images/fr/worldmap.png and b/documentation/debian-edu-wheezy/images/fr/worldmap.png differ
diff --git a/documentation/debian-edu-wheezy/images/gosa2_overview.png b/documentation/debian-edu-wheezy/images/gosa2_overview.png
new file mode 100644
index 0000000..740de2a
Binary files /dev/null and b/documentation/debian-edu-wheezy/images/gosa2_overview.png differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index c026f2c..4080da8 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
diff --git a/documentation/rosegarden/rosegarden-manual.pot b/documentation/rosegarden/rosegarden-manual.pot
index 6818df5..33476c2 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: 2012-12-11 13:25+0100\n"
+"POT-Creation-Date: 2013-06-15 19:02+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