[debian-edu-commits] debian-edu/debian-edu-doc.git (#1516) - master (branch) updated: 1.5_20130617_7.1-28-g69d66da
David Prévot
taffit at alioth.debian.org
Fri Jul 5 22:12:12 UTC 2013
The branch, master has been updated
via 69d66da75a0f46d6486e8741416a6d663ab29696 (commit)
from f569f62cdfa1cca78c28a4fcebcfa3bb2e15bb1b (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 69d66da75a0f46d6486e8741416a6d663ab29696
Author: David Prévot <taffit at debian.org>
Date: Fri Jul 5 18:05:28 2013 -0400
Update manual and images from the wiki
Drop duplicate, thanks to Wolfgang Schweer.
Git-Dch: Ignore
-----------------------------------------------------------------------
Summary of changes:
.../debian-edu-squeeze/images/de/worldmap.png | Bin 386817 -> 386825 bytes
.../debian-edu-squeeze/images/es/worldmap.png | Bin 386915 -> 386924 bytes
.../debian-edu-squeeze/images/fr/worldmap.png | Bin 386858 -> 386867 bytes
.../debian-edu-squeeze/images/worldmap.png | Bin 386854 -> 386863 bytes
.../debian-edu-wheezy-manual.da.po | 22 +--
.../debian-edu-wheezy-manual.de.po | 12 +-
.../debian-edu-wheezy-manual.es.po | 28 +---
.../debian-edu-wheezy-manual.fr.po | 26 ++-
.../debian-edu-wheezy-manual.it.po | 63 +++----
.../debian-edu-wheezy-manual.nb.po | 173 +++++++++-----------
.../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 10 +-
.../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 2 +-
.../debian-edu-wheezy/images/de/worldmap.png | Bin 386817 -> 386825 bytes
.../debian-edu-wheezy/images/es/worldmap.png | Bin 386915 -> 386924 bytes
.../debian-edu-wheezy/images/fr/worldmap.png | Bin 386858 -> 386867 bytes
.../debian-edu-wheezy/images/welcome_to_tjener.png | Bin 234552 -> 0 bytes
.../debian-edu-wheezy/images/worldmap.png | Bin 386854 -> 386863 bytes
17 files changed, 137 insertions(+), 199 deletions(-)
delete mode 100644 documentation/debian-edu-wheezy/images/welcome_to_tjener.png
The diff of changes is:
diff --git a/documentation/debian-edu-squeeze/images/de/worldmap.png b/documentation/debian-edu-squeeze/images/de/worldmap.png
index 936f716..8548669 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 53c694b..8569c1c 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 7d33e77..562561b 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 d0ee2ee..21cbcf0 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 0917a92..40f15a6 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\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"
@@ -34,11 +34,11 @@ msgstr "Manual for Debian Edu / Skolelinux Wheezy 7.0.0+r0"
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manual for Debian Edu 7.0.0+r0 kodenavn »Wheezy«"
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "[attachment:welcome_to_tjener.png]"
-msgid "./images/welcome_to_tjener.png"
-msgstr "[attachment:welcome_to_tjener.png]"
+#| msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -1441,7 +1441,7 @@ msgstr ""
#. type: Content of: <article><section><section><section><para>
#, fuzzy
#| msgid ""
-#| "FIXME: these download URLs need to be adapted for wheezy still... They "
+#| "FIXM-: these download URLs need to be adapted for wheezy still... They "
#| "currently don't work"
msgid ""
"FIXME: only the CD download links work currently - the DVD and source DVD "
@@ -2859,12 +2859,6 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
#| msgid "23-Tjener-KDM_Login.png"
@@ -11727,10 +11721,10 @@ msgstr ""
#~ msgstr "[attachment:23-Tjener-KDM_Login.png]"
#~ msgid ""
-#~ "[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot "
+#~ "[attachment:23-Tjener-KDM_Login.png] FIXME: we need a wheezy login shot "
#~ "here once we have new artwork"
#~ msgstr ""
-#~ "[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot "
+#~ "[attachment:23-Tjener-KDM_Login.png] FIXME: we need a wheezy login shot "
#~ "here once we have new artwork"
#~ msgid "[attachment:02-select_a_language.png]"
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 f57ab98..d09f904 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-05 17:23-0400\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\n"
"PO-Revision-Date: 2013-07-05 22:12+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -40,9 +40,9 @@ msgstr "Handbuch für Debian Edu / Skolelinux Wheezy 7.1+edu0"
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Handbuch für Debian Edu 7.1+edu0, Codename »Wheezy«"
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
-msgstr "./images/welcome_to_tjener.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "./images/23-Tjener-KDM_Login.png"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -2752,10 +2752,6 @@ msgstr "./images/22-Tjener_GRUB_boot_menu.png"
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "./images/23-Tjener-KDM_Login.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "tjener KDM Login"
msgstr "KDM-Login von tjener"
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 cf4bedb..334a639 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: release-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\n"
"PO-Revision-Date: 2012-06-16 18:34-0600\n"
"Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -38,11 +38,11 @@ msgstr "Debian Edu / Skolelinux 7.0.0+r0 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: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "[attachment:welcome_to_tjener.png]"
-msgid "./images/welcome_to_tjener.png"
-msgstr "[attachment:welcome_to_tjener.png]"
+#| msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -3349,12 +3349,6 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
#| msgid "23-Tjener-KDM_Login.png"
@@ -11754,7 +11748,7 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/welcome_to_tjener.png\"/></"
+#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
#~ "imageobject>"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-"
@@ -11958,14 +11952,6 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/network-"
-#~ "arch.png\"/></imageobject>"
-
-#, fuzzy
-#~ msgid ""
#~ "<imageobject><imagedata fileref=\"./images/24-Tjener-KDE_Start.png\"/></"
#~ "imageobject>"
#~ msgstr ""
@@ -12578,7 +12564,7 @@ msgstr ""
#~ msgid ""
#~ "<imageobject><imagedata width=\"600\" fileref=\"http://wiki.debian.org//"
#~ "DebianEdu/Documentation/Squeeze/AboutDebianEdu?action=AttachFile&"
-#~ "do=get&target=welcome_to_tjener.png\"/></imageobject>"
+#~ "do=get&target=23-Tjener-KDM_Login.png\"/></imageobject>"
#~ msgstr ""
#~ "<imageobject><imagedata fileref=\"./images/http://wiki.debian.org//"
#~ "DebianEdu/Documentation/Squeeze/Installation?action=AttachFile&"
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 d7a72e5..ee6a445 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 0.9.20071124\n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\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"
@@ -36,11 +36,11 @@ msgstr "Manuel de Debian Edu / Skolelinux Wheezy 7.0.0+r0"
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manuel de Debian Edu 7.0.0+r0 nom de code « Wheezy »"
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "[attachment:welcome_to_tjener.png]"
-msgid "./images/welcome_to_tjener.png"
-msgstr "[attachment:welcome_to_tjener.png]"
+#| msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -2893,12 +2893,6 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
#| msgid "23-Tjener-KDM_Login.png"
@@ -6924,10 +6918,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 ""
@@ -12010,7 +12004,7 @@ msgstr ""
#~ msgstr "[attachment:23-Tjener-KDM_Login.png]"
#~ msgid ""
-#~ "[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot "
+#~ "[attachment:23-Tjener-KDM_Login.png] FIXME: we need a wheezy login shot "
#~ "here once we have new artwork"
#~ msgstr "FIXME: we need a wheezy login shot here once we have new artwork"
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 833be04..bb8f18a 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\n"
"PO-Revision-Date: 2013-05-12 17:17+0200\n"
"Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <>\n"
@@ -34,11 +34,11 @@ msgstr "Manuale di Debian Edu / Skolelinux Wheezy 7.0.0+r0"
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Manuale per Debian Edu 7.0.0+r0 Codename Wheezy"
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "[attachment:welcome_to_tjener.png]"
-msgid "./images/welcome_to_tjener.png"
-msgstr "[attachment:welcome_to_tjener.png]"
+#| msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -2828,12 +2828,6 @@ msgstr "22-Tjener_GRUB_boot_menu.png"
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr "22-Tjener_GRUB_boot_menu.png"
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-#| msgid "23-Tjener-KDM_Login.png"
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr "23-Tjener-KDM_Login.png"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
#| msgid "23-Tjener-KDM_Login.png"
@@ -6779,8 +6773,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 ""
@@ -11765,10 +11759,10 @@ msgstr ""
#~ msgstr "[attachment:23-Tjener-KDM_Login.png]"
#~ msgid ""
-#~ "[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot "
+#~ "[attachment:23-Tjener-KDM_Login.png] FIXME: we need a wheezy login shot "
#~ "here once we have new artwork"
#~ msgstr ""
-#~ "[attachment:welcome_to_tjener.png] FIXME: we need a wheezy login shot "
+#~ "[attachment:23-Tjener-KDM_Login.png] FIXME: we need a wheezy login shot "
#~ "here once we have new artwork"
#~ msgid "[attachment:02-select_a_language.png]"
@@ -12853,10 +12847,10 @@ msgstr ""
#~ "dinamicamente."
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/welcome_to_tjener.png\"/></"
+#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
#~ "imageobject>"
#~ msgstr ""
-#~ "<imageobject><imagedata fileref=\"./images/welcome_to_tjener.png\"/></"
+#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
#~ "imageobject>"
#~ msgid "<placeholder type=\"inlinemediaobject\" id=\"0\"/>"
@@ -13027,13 +13021,6 @@ msgstr ""
#~ "></imageobject>"
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
-#~ "imageobject>"
-
-#~ msgid ""
#~ "<imageobject><imagedata fileref=\"./images/24-Tjener-KDE_Start.png\"/></"
#~ "imageobject>"
#~ msgstr ""
@@ -13698,11 +13685,11 @@ msgstr ""
#~ msgid ""
#~ "<imageobject><imagedata width=\"600\" fileref=\"http://wiki.debian.org//"
#~ "DebianEdu/Documentation/Squeeze/AboutDebianEdu?action=AttachFile&"
-#~ "do=get&target=welcome_to_tjener.png\"/></imageobject>"
+#~ "do=get&target=23-Tjener-KDM_Login.png\"/></imageobject>"
#~ msgstr ""
#~ "<imageobject><imagedata width=\"600\" fileref=\"http://wiki.debian.org//"
#~ "DebianEdu/Documentation/Squeeze/AboutDebianEdu?action=AttachFile&"
-#~ "do=get&target=welcome_to_tjener.png\"/></imageobject>"
+#~ "do=get&target=23-Tjener-KDM_Login.png\"/></imageobject>"
#~ msgid ""
#~ "<imageobject><imagedata width=\"1024\" fileref=\"http://wiki.debian.org//"
@@ -15817,13 +15804,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 ""
@@ -15835,8 +15822,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"
@@ -15844,8 +15831,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"
@@ -15862,8 +15849,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"
@@ -15871,8 +15858,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 623e704..b2677ea 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: release-manual.nb\n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\n"
"PO-Revision-Date: 2012-03-10 18:32+0100\n"
"Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -35,11 +35,11 @@ msgstr "Debian Edu / Skolelinux Wheezy 7.0.0+r0 utgivelsesmanual"
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr "Utgivelsesmanual for Debian Edu 7.0.0+r0 kodenavn Wheezy"
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
-#| msgid "[attachment:welcome_to_tjener.png]"
-msgid "./images/welcome_to_tjener.png"
-msgstr "[attachment:welcome_to_tjener.png]"
+#| msgid "[attachment:23-Tjener-KDM_Login.png]"
+msgid "./images/23-Tjener-KDM_Login.png"
+msgstr "[attachment:23-Tjener-KDM_Login.png]"
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
msgid "Debian Edu login"
@@ -885,10 +885,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>
@@ -2094,8 +2094,8 @@ msgstr "<emphasis role='strong'>Tynnklient</emphasis>"
#, fuzzy
msgid "./images/Installer_help.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -3064,57 +3064,57 @@ msgstr ""
#, fuzzy
msgid "./images/08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "08-Choose_Debian_Edu_profile.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-06-profile.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-06-profile.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "09-Really_use_the_automatic_partitioning_tool.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "10-Really_use_the_automatic_partitioning_tool-Yes.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-07-partitioning.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-07-partitioning.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "11-Participate_in_the_package_usage_survey.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-"edituser_squeeze.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"lwat-]edituser_squeeze.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -3187,43 +3187,43 @@ msgstr ""
#, fuzzy
msgid "./images/13-Install+the+base+system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "13-Install the base system.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "14-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "17-Select_and_install_software.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
@@ -3254,29 +3254,29 @@ msgstr ""
#, fuzzy
msgid "./images/20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "20-Finish_the_Installation.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
#, fuzzy
msgid "./images/21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
msgid "21-Finish_the_Installation-Installation_complete.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-"started.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+"getting-]started.png\"/></imageobject>"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/22-Tjener_GRUB_boot_menu.png"
@@ -3286,13 +3286,6 @@ msgstr ""
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr ""
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#, fuzzy
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"./images/debian-edu-"
-"lenny-10-basesystem.png\"/></imageobject>"
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "tjener KDM Login"
msgstr ""
@@ -4121,8 +4114,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_list.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "GOsa² systems listing"
@@ -4132,8 +4125,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_host_details.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Host details"
@@ -4154,8 +4147,8 @@ msgstr ""
#, fuzzy
msgid "./images/gosa_systems_add_netgroup.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "Add netgroup"
@@ -4759,8 +4752,8 @@ msgstr ""
#, fuzzy
msgid "./images/slbackup-php_maintenance.png"
msgstr ""
-"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-edu-]"
-"squeeze-10-basesystem.png\"/></imageobject>"
+"<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:debian-"
+"edu-]squeeze-10-basesystem.png\"/></imageobject>"
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
#, fuzzy
@@ -6664,10 +6657,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>"
@@ -12178,8 +12171,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:21-Finish_the_Installation-Installation_complete.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:getting-]"
-#~ "started.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "getting-]started.png\"/></imageobject>"
#, fuzzy
#~ msgid "FIXME: add wheezy kde desktop screenshot here"
@@ -12202,8 +12195,8 @@ msgstr ""
#, fuzzy
#~ msgid "[attachment:11-Participate_in_the_package_usage_survey.png]"
#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:lwat-]"
-#~ "edituser_squeeze.png\"/></imageobject>"
+#~ "<inlinemediaobject><imageobject><imagedata fileref=\"[attachment:"
+#~ "lwat-]edituser_squeeze.png\"/></imageobject>"
#, fuzzy
#~| msgid "Set passwords"
@@ -12885,7 +12878,7 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/welcome_to_tjener.png\"/></"
+#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
#~ "imageobject>"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener."
@@ -13017,14 +13010,6 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<imageobject><imagedata fileref=\"./images/23-Tjener-KDM_Login.png\"/></"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<inlinemediaobject><imageobject><imagedata fileref=\"./images/pxe-tjener."
-#~ "png\"/></imageobject>"
-
-#, fuzzy
-#~ msgid ""
#~ "<imageobject><imagedata fileref=\"./images/24-Tjener-KDE_Start.png\"/></"
#~ "imageobject>"
#~ msgstr ""
@@ -13474,8 +13459,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"
@@ -13698,7 +13683,7 @@ msgstr ""
#~ msgid ""
#~ "<imageobject><imagedata width=\"600\" fileref=\"http://wiki.debian.org//"
#~ "DebianEdu/Documentation/Squeeze/AboutDebianEdu?action=AttachFile&"
-#~ "do=get&target=welcome_to_tjener.png\"/></imageobject>"
+#~ "do=get&target=23-Tjener-KDM_Login.png\"/></imageobject>"
#~ msgstr ""
#~ "<inlinemediaobject><imageobject><imagedata width=\"600\" fileref=\"http://"
#~ "wiki.debian.org/DebianEdu/Documentation/Lenny/GettingStarted?"
@@ -15802,13 +15787,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 ""
@@ -15820,8 +15805,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"
@@ -15829,8 +15814,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"
@@ -15846,8 +15831,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"
@@ -15855,8 +15840,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 de8c89d..a42db6e 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-07-05 18:59+0300\n"
+"POT-Creation-Date: 2013-07-05 17:52-0400\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"
@@ -28,8 +28,8 @@ msgstr ""
msgid "Manual for Debian Edu 7.1+edu0 Codename \"Wheezy\""
msgstr ""
-#. type: Attribute 'fileref' of: <article><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/welcome_to_tjener.png"
+#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
+msgid "./images/23-Tjener-KDM_Login.png"
msgstr ""
#. type: Content of: <article><section><para><inlinemediaobject><textobject><phrase>
@@ -2063,10 +2063,6 @@ msgstr ""
msgid "22-Tjener_GRUB_boot_menu.png"
msgstr ""
-#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-msgid "./images/23-Tjener-KDM_Login.png"
-msgstr ""
-
#. type: Content of: <article><section><section><para><inlinemediaobject><textobject><phrase>
msgid "tjener KDM Login"
msgstr ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index bb19286..900f99b 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -4,7 +4,7 @@
<section id="AboutDebianEdu">
<title>Manual for Debian Edu 7.1+edu0 Codename "Wheezy"
</title>
-<para><inlinemediaobject><imageobject><imagedata fileref="./images/welcome_to_tjener.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject>
+<para><inlinemediaobject><imageobject><imagedata fileref="./images/23-Tjener-KDM_Login.png"/></imageobject><textobject><phrase>Debian Edu login</phrase></textobject></inlinemediaobject>
</para>
<para>This is the manual for the Debian Edu Wheezy 7.1+edu0 release.
</para>
diff --git a/documentation/debian-edu-wheezy/images/de/worldmap.png b/documentation/debian-edu-wheezy/images/de/worldmap.png
index 936f716..8548669 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/es/worldmap.png b/documentation/debian-edu-wheezy/images/es/worldmap.png
index 53c694b..8569c1c 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/fr/worldmap.png b/documentation/debian-edu-wheezy/images/fr/worldmap.png
index 7d33e77..562561b 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/welcome_to_tjener.png b/documentation/debian-edu-wheezy/images/welcome_to_tjener.png
deleted file mode 100644
index e8e92e9..0000000
Binary files a/documentation/debian-edu-wheezy/images/welcome_to_tjener.png and /dev/null differ
diff --git a/documentation/debian-edu-wheezy/images/worldmap.png b/documentation/debian-edu-wheezy/images/worldmap.png
index d0ee2ee..21cbcf0 100644
Binary files a/documentation/debian-edu-wheezy/images/worldmap.png and b/documentation/debian-edu-wheezy/images/worldmap.png differ
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