[debian-edu-commits] debian-edu/ 03/03: updated after building in sid
Holger Levsen
holger at layer-acht.org
Mon Nov 21 12:26:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository debian-edu-doc.
commit 9a2a6e8adfe9d9ab64cd0cca6b29e6aa14f0d323
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Nov 21 13:25:05 2016 +0100
updated after building in sid
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
documentation/audacity/audacity-manual.nb.po | 6 +-
.../debian-edu-itil/debian-edu-itil-manual.nb.po | 40 ++--
.../debian-edu-jessie-manual.it.po | 259 +++++----------------
.../debian-edu-jessie-manual.nb.po | 82 +++----
.../debian-edu-jessie-manual.nl.po | 15 +-
.../debian-edu-jessie-manual.pl.po | 60 ++---
.../debian-edu-stretch-manual.de.po | 6 +-
.../debian-edu-stretch-manual.nb.po | 21 +-
.../debian-edu-stretch-manual.pl.po | 28 +--
.../debian-edu-wheezy-manual.nb.po | 65 +++---
.../debian-edu-wheezy-manual.nl.po | 28 +--
documentation/rosegarden/rosegarden-manual.nb.po | 10 +-
12 files changed, 224 insertions(+), 396 deletions(-)
diff --git a/documentation/audacity/audacity-manual.nb.po b/documentation/audacity/audacity-manual.nb.po
index 4d4c316..de1639e 100644
--- a/documentation/audacity/audacity-manual.nb.po
+++ b/documentation/audacity/audacity-manual.nb.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-11-14 11:16+0000\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-20 05:55+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -686,8 +686,8 @@ msgid ""
"Git\"/>."
msgstr ""
"Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\""
-"http://wiki.debian.org/Alioth/Git\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po b/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
index 570aac6..77c8b6b 100644
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:20+0200\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-18 05:40+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -182,8 +182,8 @@ msgid ""
"See the <ulink url=\"https://wiki.debian.org/CopyRight#\">copyright page</"
"ulink> for the copyright status of this document."
msgstr ""
-"Se <ulink url=\"https://wiki.debian.org/CopyRight#\""
-">opphavsrettighetssiden</ulink> dette dokumentets opphavsrettsstatus."
+"Se <ulink url=\"https://wiki.debian.org/CopyRight#\">opphavsrettighetssiden</"
+"ulink> dette dokumentets opphavsrettsstatus."
#. type: Content of: <article><section><section><para>
msgid "<ulink url=\"http://www.gnu.org/copyleft/gpl.html\"/>"
@@ -255,10 +255,10 @@ msgid ""
"version is available from <ulink url=\"http://developer.skolelinux.no/itil/"
"oldindex.html\"/>"
msgstr ""
-"Dokumentet vedlikeholdes i en wiki og kan oppdateres på <ulink url=\""
-"https://wiki.debian.org/!DebianEdu/Documentation/nb/ITIL\"/> . Utgaven før "
-"wikisiden er tilgjengelig fra <ulink url=\""
-"http://developer.skolelinux.no/itil/oldindex.html\"/>"
+"Dokumentet vedlikeholdes i en wiki og kan oppdateres på <ulink url=\"https://"
+"wiki.debian.org/!DebianEdu/Documentation/nb/ITIL\"/> . Utgaven før "
+"wikisiden er tilgjengelig fra <ulink url=\"http://developer.skolelinux.no/"
+"itil/oldindex.html\"/>"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -497,13 +497,13 @@ msgid ""
msgstr ""
"Altså er logg over henvendelser et grunnleggene nødvendig verktøy for "
"brukerne og servicekontoret. Det er flere fritt tilgjengelige systemer for "
-"logging av henvendelser med god dokumentasjon< < <ulink url=\""
-"https://wiki.debian.org/FootNote#\"> FootNote</ulink>(RT Essentials: <ulink "
-"url=\"http://www.oreilly.com/catalog/rtessentials/chapter/index.html\""
-"/>)>>. Driftsorganisasjonen Skolelinux Drift bruker RT < < <"
-"ulink url=\"https://wiki.debian.org/FootNote#\">FootNote</ulink>(RT: Request "
-"Tracker: <ulink url=\"http://www.bestpractical.com/\"/> )>> for "
-"håndtering av henvendelser."
+"logging av henvendelser med god dokumentasjon< < <ulink url=\"https://"
+"wiki.debian.org/FootNote#\"> FootNote</ulink>(RT Essentials: <ulink url="
+"\"http://www.oreilly.com/catalog/rtessentials/chapter/index.html\"/>)>"
+">. Driftsorganisasjonen Skolelinux Drift bruker RT < < <ulink url="
+"\"https://wiki.debian.org/FootNote#\">FootNote</ulink>(RT: Request Tracker: "
+"<ulink url=\"http://www.bestpractical.com/\"/> )>> for håndtering av "
+"henvendelser."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -7096,9 +7096,9 @@ msgid ""
"emphasis><emphasis role=\"strong\">Lockdown of thick clients</"
"emphasis><emphasis role=\"strong\">Local server machines</emphasis>"
msgstr ""
-"<emphasis role=\"strong\">Tynne- eller diskløse klienter mot lokale "
-"tjenere</emphasis><emphasis role=\"strong\">Nedlåsning av tykke "
-"klienter</emphasis><emphasis role=\"strong\">Lokale tjenermaskiner</emphasis>"
+"<emphasis role=\"strong\">Tynne- eller diskløse klienter mot lokale tjenere</"
+"emphasis><emphasis role=\"strong\">Nedlåsning av tykke klienter</"
+"emphasis><emphasis role=\"strong\">Lokale tjenermaskiner</emphasis>"
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid ""
@@ -10452,9 +10452,9 @@ msgid ""
"<emphasis role=\"strong\">The different profiles on different servers.</"
"emphasis></p></li></ul>"
msgstr ""
-"<ul> <li><p>{{attachment:bilder50.png}}</p> "
-"<p><emphasis role=\"strong\">De ulike profilene på ulike "
-"tjenere.</emphasis></p></li></ul>"
+"<ul> <li><p>{{attachment:bilder50.png}}</p> <p>"
+"<emphasis role=\"strong\">De ulike profilene på ulike tjenere.</"
+"emphasis></p></li></ul>"
#. type: Content of: <article><section><section><section><title>
msgid "Combi-server as a combined resolution"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index 8f50ef9..a210714 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-10-01 14:33+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-10-09 18:24+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -22,12 +22,10 @@ msgid "en"
msgstr "it"
#. type: Content of: <article><articleinfo><title>
-#| msgid "Debian Edu / Skolelinux Jessie 8+edu0 Manual"
msgid "Debian Edu / Skolelinux Jessie 8+edu1 Manual"
msgstr "Manuale di Debian Edu / Skolelinux Jessie 8+edu1"
#. type: Content of: <article><section><title>
-#| msgid "Manual for Debian Edu 8+edu0 Codename Jessie"
msgid "Manual for Debian Edu 8+edu1 Codename Jessie"
msgstr "Manuale per Debian Edu 8+edu1 Nome in codice Jessie"
@@ -40,7 +38,6 @@ msgid "Debian Edu login"
msgstr "Login di Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid "This is the manual for the Debian Edu Jessie 8+edu0 release."
msgid "This is the manual for the Debian Edu Jessie 8+edu1 release."
msgstr "Questa è la guida per la versione Jessie 8+edu1 di Debian Edu."
@@ -1449,11 +1446,6 @@ msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "The multi-architecture ISO image is 5.2 GiB large and can be used for "
-#| "installation of amd64 and i386 machines. Please note that internet access "
-#| "during installation is needed. Like the others it can be downloaded over "
-#| "FTP, HTTP or rsync via:"
msgid ""
"The multi-architecture ISO image is roughly 5 GiB large and can be used for "
"installation of amd64 and i386 machines. Please note that internet access "
@@ -1494,18 +1486,13 @@ msgid "Sources"
msgstr "Sorgenti:"
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Sources are available from the Debian archive, see <ulink url=\"http://"
-#| "cdimage.debian.org/debian-cd/8.4.0/source/iso-dvd/\"/> for some download "
-#| "options."
msgid ""
"Sources are available from the Debian archive, see <ulink url=\"http://"
"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> for some download "
"options."
msgstr ""
-"I sorgenti sono disponibili negli archivi Debian, consultare <ulink"
-" url=\"http://"
-"cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> per altre "
+"I sorgenti sono disponibili negli archivi Debian, consultare <ulink url="
+"\"http://cdimage.debian.org/debian-cd/8.5.0/source/iso-dvd/\"/> per altre "
"opzioni di download."
#. type: Content of: <article><section><section><title>
@@ -3463,8 +3450,7 @@ msgstr ""
"net groupmap list\n"
"\n"
"# Aggiungere i propri gruppi nuovi o mancanti:\n"
-"net groupmap add unixgroup=NUOVO_GRUPPO type=domain"
-" ntgroup=\"NUOVO_GRUPPO\"\\\n"
+"net groupmap add unixgroup=NUOVO_GRUPPO type=domain ntgroup=\"NUOVO_GRUPPO\"\\\n"
" comment=\"DESCRIZIONE DEL NUOVO GRUPPO\""
#. type: Content of: <article><section><section><section><para>
@@ -3580,20 +3566,16 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t"
-" workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21]"
-" id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
"Connecting to LDAP as cn=admin,ou=ldap-access,dc=skole,dc=skolelinux,dc=no\n"
"enter password:"
msgstr ""
-"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t"
-" workstations\n"
-"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21]"
-" id ether-00:04:76:d3:28:b7.\n"
+"root at tjener:~# sitesummary2ldapdhcp -a -i ether-00:04:76:d3:28:b7 -t workstations\n"
+"info: Create GOsa machine for auto-mac-00-04-76-d3-28-b7.intern [10.0.16.21] id ether-00:04:76:d3:28:b7.\n"
"\n"
"Enter password if you want to activate these changes, and ^c to abort.\n"
"\n"
@@ -5420,12 +5402,10 @@ msgstr "Usare i backport è semplice:"
#. type: CDATA
#, no-wrap
msgid ""
-"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt"
-" sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
msgstr ""
-"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt"
-" sources.list\n"
+"echo \"deb http://ftp.debian.org/debian/ jessie-backports main\" >> /etc/apt sources.list\n"
"apt-get update"
#. type: Content of: <article><section><section><para>
@@ -6013,8 +5993,7 @@ msgid ""
" chown $user:$group $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already"
-" exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders have been created\""
@@ -6035,8 +6014,7 @@ msgstr ""
" chown $user:$group $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already"
-" exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders have been created\""
@@ -6109,8 +6087,7 @@ msgid ""
" ln -s /media/$home $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already"
-" exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders has been created\""
@@ -6125,8 +6102,7 @@ msgstr ""
" ln -s /media/$home $home_path/$home/$shared_folder\n"
" ((created_dir+=1))\n"
" else\n"
-" echo -e \"the folder $home_path/$home/$shared_folder already"
-" exists.\\n\"\n"
+" echo -e \"the folder $home_path/$home/$shared_folder already exists.\\n\"\n"
" fi\n"
" done\n"
" echo \"$created_dir folders has been created\""
@@ -6260,8 +6236,7 @@ msgid ""
"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: nas-server\n"
-" automountInformation: -fstype=autofs --timeout=60"
-" ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
"\n"
" add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: top\n"
@@ -6271,14 +6246,12 @@ msgid ""
" add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: /\n"
-" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard"
-",nodev,nosuid,noatime nas-server.intern:/&"
+" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
msgstr ""
"add cn=nas-server,ou=auto.skole,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: nas-server\n"
-" automountInformation: -fstype=autofs --timeout=60"
-" ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
+" automountInformation: -fstype=autofs --timeout=60 ldap:ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
"\n"
" add ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: top\n"
@@ -6288,8 +6261,7 @@ msgstr ""
" add cn=/,ou=auto.nas-server,ou=automount,dc=skole,dc=skolelinux,dc=no\n"
" objectClass: automount\n"
" cn: /\n"
-" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard"
-",nodev,nosuid,noatime nas-server.intern:/&"
+" automountInformation: -fstype=nfs,tcp,rsize=32768,wsize=32768,rw,intr,hard,nodev,nosuid,noatime nas-server.intern:/&"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -6633,26 +6605,13 @@ msgstr "Se si usa www.deb-multimedia.org occorre eseguire i seguenti comandi:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "# install the debian-keyring securely:\n"
-#| "apt-get install debian-keyring\n"
-#| "# fetch the deb-multimedia key insecurely:\n"
-#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
-#| "# add repository to sources.list - please check the homepages for mirrors!\n"
-#| "echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
-#| "# update the list of available packages:\n"
-#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
"# fetch the deb-multimedia key insecurely:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# check securely if the key is correct and add it to the keyring used by APT"
-" if it is:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs"
-" 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
"# add repository to sources.list - please check the homepages for mirrors!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# update the list of available packages:\n"
@@ -6662,12 +6621,9 @@ msgstr ""
"apt-get install debian-keyring\n"
"# recuperare in modo non sicuro la chiave di deb-multimedia:\n"
"gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 07DC563D1F41B907\n"
-"# controllare in modo sicuro che la chiave sia corretta e, se lo è,"
-" aggiungerla al portachiavi di APT:\n"
-"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs"
-" 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
-"# aggiungere il repository a sources.list e guardare nelle homepage l'elenco"
-" dei mirror!\n"
+"# controllare in modo sicuro che la chiave sia corretta e, se lo è, aggiungerla al portachiavi di APT:\n"
+"gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 07DC563D1F41B907 && gpg --export 07DC563D1F41B907 | apt-key add -\n"
+"# aggiungere il repository a sources.list e guardare nelle homepage l'elenco dei mirror!\n"
"echo \"deb http://deb-multimedia.org jessie main\" >> /etc/apt/sources.list\n"
"# aggiornare l'elenco dei pacchetti disponibili:\n"
"apt-get update"
@@ -7045,15 +7001,13 @@ msgstr ""
#, no-wrap
msgid ""
"#add the skole projects local repository\n"
-"d-i apt-setup/local1/repository string http://example.org/debian"
-" stable main contrib non-free\n"
+"d-i apt-setup/local1/repository string http://example.org/debian stable main contrib non-free\n"
"d-i apt-setup/local1/comment string Example Software Repository\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
msgstr ""
"#add the skole projects local repository\n"
-"d-i apt-setup/local1/repository string http://example.org/debian"
-" stable main contrib non-free\n"
+"d-i apt-setup/local1/repository string http://example.org/debian stable main contrib non-free\n"
"d-i apt-setup/local1/comment string Example Software Repository\n"
"d-i apt-setup/local1/source boolean true\n"
"d-i apt-setup/local1/key string http://example.org/key.asc"
@@ -7097,12 +7051,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg"
-" /var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg"
-" /var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-diskless.cfg /var/lib/tftpboot/pxelinux.cfg/default"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -7114,12 +7064,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg"
-" /var/lib/tftpboot/pxelinux.cfg/default"
-msgstr ""
-"ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg"
-" /var/lib/tftpboot/pxelinux.cfg/default"
+msgid "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
+msgstr "ln -s /var/lib/tftpboot/debian-edu/default-thin.cfg /var/lib/tftpboot/pxelinux.cfg/default"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -7181,14 +7127,8 @@ msgstr ""
#. type: CDATA
#, no-wrap
-msgid ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img"
-" nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet"
-" ipappend 2"
-msgstr ""
-"DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img"
-" nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet"
-" ipappend 2"
+msgid "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
+msgstr "DEFAULT ltsp/i386/vmlinuz initrd=ltsp/i386/initrd.img nfsroot=10.0.2.10:/opt/ltsp/i386 init=/sbin/init-ltsp boot=nfs ro quiet ipappend 2"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -7733,15 +7673,13 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"ltsp-chroot -a i386 # this does \"chroot /opt/ltsp/i386\" and more, ie it"
-" also prevents daemons from being started\n"
+"ltsp-chroot -a i386 # this does \"chroot /opt/ltsp/i386\" and more, ie it also prevents daemons from being started\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
"exit"
msgstr ""
-"ltsp-chroot -a i386 # questo fa \"chroot /opt/ltsp/i386\" e altro, ossia"
-" evita anche che i demoni siano avviati\n"
+"ltsp-chroot -a i386 # questo fa \"chroot /opt/ltsp/i386\" e altro, ossia evita anche che i demoni siano avviati\n"
"aptitude update\n"
"aptitude upgrade\n"
"aptitude dist-upgrade\n"
@@ -7819,12 +7757,6 @@ msgstr ""
"informazione."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Note: Since such ten-year-old thin clients may also have trouble running "
-#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
-#| "issues, you may consider running thin clients with at least 128 MB RAM, "
-#| "or upgrade the hardware, which will also give you the benefit of being "
-#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
@@ -8135,15 +8067,6 @@ msgstr ""
"in wheezy anche kerberos è stato configurato per samba!"
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "You should hopefully find an example smb.conf in your preferred language "
-#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
-#| "debian-edu-config/examples/</computeroutput>. The source file is in "
-#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
-#| "computeroutput>; look for a file with the appropriate code in the "
-#| "filename (the German translation, for example, will be named "
-#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
-#| "the config file are a lot of explanations which you should have a look at."
msgid ""
"You might find an example smb.conf in your preferred language delivered by "
"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
@@ -8154,15 +8077,15 @@ msgid ""
"de.conf</computeroutput>). Inside the config file are a lot of explanations "
"which you should have a look at."
msgstr ""
-"Si dovrebbe trovare un smb.conf di esempio nella lingua locale "
-"inserito dall'installazione su tjener sotto <computeroutput>/usr/share/doc/"
-"debian-edu-config/examples/</computeroutput>. Il file sorgente è in inglese "
-"ed è chiamato <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; "
-"se il file è tradotto nella propria lingua, occorre cercare il codice di "
-"lingua nel nome del file (la traduzione in tedesco, per esempio, si chiama "
+"Si dovrebbe trovare un smb.conf di esempio nella lingua locale inserito "
+"dall'installazione su tjener sotto <computeroutput>/usr/share/doc/debian-edu-"
+"config/examples/</computeroutput>. Il file sorgente è in inglese ed è "
+"chiamato <computeroutput>smb-roaming-profiles-en.conf</computeroutput>; se "
+"il file è tradotto nella propria lingua, occorre cercare il codice di lingua "
+"nel nome del file (la traduzione in tedesco, per esempio, si chiama "
"<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). All'interno "
-"del file di configurazione ci sono molte spiegazioni ed è utile darci "
-"uno sguardo."
+"del file di configurazione ci sono molte spiegazioni ed è utile darci uno "
+"sguardo."
#. type: Content of: <article><section><section><section><section><title>
msgid "Machine policies for roaming profiles"
@@ -9189,8 +9112,7 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"# move the tar.gz file to a repository directory on the school network's"
-" webroot (by default located on tjener):\n"
+"# move the tar.gz file to a repository directory on the school network's webroot (by default located on tjener):\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9199,8 +9121,7 @@ msgid ""
"# extract the file\n"
"root at tjener:~# tar xzvf smartnotebook10_2sp1debianrepository.tar.gz"
msgstr ""
-"# spostare il file tar.gz in una directory repository nella webroot della"
-" rete della scuola (in modo predefinito posizionata su tjener):\n"
+"# spostare il file tar.gz in una directory repository nella webroot della rete della scuola (in modo predefinito posizionata su tjener):\n"
"root at tjener:~# \n"
"mkdir /etc/debian-edu/www/debian\n"
"mv smartnotebook10_2sp1debianrepository.tar.gz /etc/debian-edu/www/debian\n"
@@ -9227,14 +9148,12 @@ msgid ""
"d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
"d-i apt-setup/local1/comment string SMART Repo\n"
"d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
msgstr ""
"d-i apt-setup/local1/repository string http://www/debian/ stable non-free\n"
"d-i apt-setup/local1/comment string SMART Repo\n"
"d-i apt-setup/local1/key string http://www/debian/swbuild.asc\n"
-"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,sma"
-"rt-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
+"d-i pkgsel/include string smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
#. type: Content of: <article><section><section><section><para>
msgid "Update the preseed file:"
@@ -9301,18 +9220,14 @@ msgid ""
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# update the dpkg database and install the wanted packages\n"
"ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
msgstr ""
"ltsp-chroot -a i386 wget http://www/debian/swbuild.asc\n"
"ltsp-chroot -a i386 apt-key add swbuild.asc\n"
"ltsp-chroot -a i386 rm swbuild.asc\n"
"# update the dpkg database and install the wanted packages\n"
"ltsp-chroot -a i386 aptitude update\n"
-"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-galle"
-"rysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-prod"
-"uct-drivers"
+"ltsp-chroot -a i386 aptitude install smart-activation,smart-common,smart-gallerysetup,smart-hwr,smart-languagesetup,smart-notebook,smart-notifier,smart-product-drivers"
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9935,15 +9850,10 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nuove caratteristiche in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid "New features for Debian Edu 8+edu0 Codename Jessie"
msgid "New features for Debian Edu 8+edu1 Codename Jessie"
msgstr "Nuove caratteristiche di Debian Edu 8+edu1 nome in codice Jessie"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is the first release of Debian Edu 8+edu0. Please report feedback to "
-#| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
-#| "org</ulink>!"
msgid ""
"This is the second release of Debian Edu Jessie. Please report feedback to "
"<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
@@ -9959,10 +9869,9 @@ msgid ""
"several bugfixes from Debian jessie point releases, resulting in new "
"installation media."
msgstr ""
-"Debian Edu 8+edu1 Codename Jessie è una versione che risolve alcuni bug"
-" riprendendo "
-"diversi bugfix dalla versione di Debian jessie, con un nuovo supporto "
-"d'installazione."
+"Debian Edu 8+edu1 Codename Jessie è una versione che risolve alcuni bug "
+"riprendendo diversi bugfix dalla versione di Debian jessie, con un nuovo "
+"supporto d'installazione."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -9977,17 +9886,13 @@ msgid "New features for Debian Edu 8+edu0 Codename Jessie"
msgstr "Manuale per Debian Edu 8+edu0 Nome in codice Jessie"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is the first release of Debian Edu 8+edu0. Please report feedback to "
-#| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
-#| "org</ulink>!"
msgid ""
"This is the first release of Debian Edu Jessie. It was released on <ulink "
"url=\"https://www.debian.org/News/2016/20160702\">July 2nd 2016</ulink>."
msgstr ""
-"Questa è la prima versione di Debian Edu Jessieche è stata rilasciata il <"
-"ulink "
-"url=\"https://www.debian.org/News/2016/20160702\">2 luglio 2016</ulink>."
+"Questa è la prima versione di Debian Edu Jessieche è stata rilasciata il "
+"<ulink url=\"https://www.debian.org/News/2016/20160702\">2 luglio 2016</"
+"ulink>."
#. type: Content of: <article><section><section><section><title>
msgid "Installation changes"
@@ -10238,14 +10143,6 @@ msgstr ""
"2012, 2013) rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
-#| "Andreassen (2010), Jan Roar Rød (2010), Ole-Erik Yrvin (2014), Ingrid "
-#| "Yrvin (2014, 2015), Hans Arthur Kielland Aanesen (2014), Knut Yrvin "
-#| "(2014), FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014) and "
-#| "Ragnar Wisløff (2014) and is released under the GPL v2 or any later "
-#| "version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015), Håvard Korsvoll (2007-2009), Tore Skogly (2008), Ole-Anders "
@@ -10263,14 +10160,6 @@ msgstr ""
"successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The German translation is copyrighted by Holger Levsen (2007), Patrick "
-#| "Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert "
-#| "(2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
-#| "Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
-#| "Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) and "
-#| "Wolfgang Schweer (2012, 2013, 2014, 2015) and is released under the GPL "
-#| "v2 or any later version."
msgid ""
"The German translation is copyrighted by Holger Levsen (2007), Patrick "
"Winnertz (2007), Ralf Gesellensetter (2007, 2009), Roland F. Teichert (2007, "
@@ -10285,32 +10174,20 @@ msgstr ""
"Teichert (2007, 2008, 2009), Jürgen Leibner (2007, 2009, 2011, 2014), Ludger "
"Sicking (2008, 2010), Kai Hatje (2008), Kurt Gramlich (2009), Franziska "
"Teichert (2009), Philipp Hübner (2009), Andreas Mundt (2009, 2010) e "
-"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016), rilasciata sotto licenza GPL"
-" v2 o "
-"successiva."
+"Wolfgang Schweer (2012, 2013, 2014, 2015, 2016), rilasciata sotto licenza "
+"GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
-#| "2009, 2010, 2011, 2012, 2013, 2014, 2015) and Beatrice Torracca (2013, "
-#| "2014) and is released under the GPL v2 or any later version."
msgid ""
"The Italian translation is copyrighted by Claudio Carboncini (2007, 2008, "
"2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) and Beatrice Torracca (2013, "
"2014) and is released under the GPL v2 or any later version."
msgstr ""
"La traduzione italiana è protetta da copyright di Claudio Carboncini (2007, "
-"2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) e Beatrice Torracca"
-" (2013, "
-"2014) rilasciata sotto licenza GPL v2 o successiva."
+"2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016) e Beatrice Torracca "
+"(2013, 2014) rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The French translation is copyrighted by Christophe Masson (2008), "
-#| "Olivier Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015), Jean-"
-#| "Paul Guilloneau (2012), David Prévot (2012), Thomas Vincent (2012) and "
-#| "the French l10n team (2009, 2010, 2012) and is released under the GPL v2 "
-#| "or any later version."
msgid ""
"The French translation is copyrighted by Christophe Masson (2008), Olivier "
"Vitrat (2010), Cédric Boutillier (2012, 2013, 2014, 2015, 2016), Jean-Paul "
@@ -10320,15 +10197,11 @@ msgid ""
msgstr ""
"La traduzione francese è protetta da copyright di Christophe Masson "
"Christophe Masson (2008), Olivier Vitrat (2010), Cédric Boutillier (2012, "
-"2013, 2014, 2015,2016), Jean-Paul Guilloneau (2012), David Prévot (2012),"
-" Thomas "
-"Vincent (2012) and the French l10n team (2009, 2010, 2012), rilasciata sotto "
-"licenza GPL v2 o successiva."
+"2013, 2014, 2015,2016), Jean-Paul Guilloneau (2012), David Prévot (2012), "
+"Thomas Vincent (2012) and the French l10n team (2009, 2010, 2012), "
+"rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, "
-#| "2015) and is released under the GPL v2 or any later version."
msgid ""
"The Danish translation is copyrighted by Joe Hansen (2012, 2013, 2014, 2015, "
"2016) and is released under the GPL v2 or any later version."
@@ -10337,9 +10210,6 @@ msgstr ""
"2014, 2015, 2016) e rilasciata sotto licenza GPL v2 o successiva."
#. type: Content of: <article><section><para>
-#| msgid ""
-#| "The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015) "
-#| "and is released under the GPL v2 or any later version."
msgid ""
"The Dutch translation is copyrighted by Frans Spiesschaert (2014, 2015, "
"2016) and is released under the GPL v2 or any later version."
@@ -10494,7 +10364,7 @@ msgstr ""
"lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
#. <remark>
-#. status ignore</remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
@@ -10538,13 +10408,10 @@ msgstr "Appendix A - La GNU Public Licence"
#. type: CDATA
#, no-wrap
-msgid ""
-"Note to translators: there is no need to translate the GPL license text."
-msgstr ""
-"Note to translators: there is no need to translate the GPL license text."
+msgid "Note to translators: there is no need to translate the GPL license text."
+msgstr "Note to translators: there is no need to translate the GPL license text."
#. type: Content of: <article><section><section><title>
-#| msgid "Manual for Debian Edu 8+edu0 Codename \"Jessie\""
msgid "Manual for Debian Edu 8+edu1 Codename \"Jessie\""
msgstr "Manuale per Debian Edu 8+edu1 nome in codice Jessie"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index 944ad42..5af2494 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-10-03 14:25+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-11-20 05:55+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1054,8 +1054,8 @@ msgid ""
"The purpose of the different profiles is explained in the <link linkend="
"\"Architecture\">network architecture</link> chapter."
msgstr ""
-"Egenskapene til de ulike profilene forklares i kapittelet <link url=\""
-"Architecture\">nettverksarkitektur</link>."
+"Egenskapene til de ulike profilene forklares i kapittelet <link url="
+"\"Architecture\">nettverksarkitektur</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1183,9 +1183,8 @@ msgid ""
"A list of tested hardware is provided at <ulink url=\"http://wiki.debian.org/"
"DebianEdu/Hardware/\"/> . This list is not nearly complete"
msgstr ""
-"En liste over testet maskinvare kan finnes på <ulink url=\""
-"http://wiki.debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen "
-"måte komplett."
+"En liste over testet maskinvare kan finnes på <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen måte komplett."
#. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/smile.png"
@@ -1346,11 +1345,11 @@ msgid ""
"Debian Jessie</ulink> before you start installing a system for production "
"use. Please give Debian Edu/Skolelinux a try, it should just work."
msgstr ""
-"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\""
-"http://www.debian.org/releases/jessie/releasenotes\">utgivelsesnotatene for "
-"Debian Jessie</ulink> før du starter å installere et system for bruk i "
-"produksjon. Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke "
-"det. Det skal bare fungere."
+"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://"
+"www.debian.org/releases/jessie/releasenotes\">utgivelsesnotatene for Debian "
+"Jessie</ulink> før du starter å installere et system for bruk i produksjon. "
+"Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det "
+"skal bare fungere."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":-)"
@@ -1800,10 +1799,10 @@ msgid ""
"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
msgstr ""
-"For å installere skrivebordsmiljøet <emphasis role=\"strong\""
-">GNOME</emphasis> i stedet for <emphasis role=\"strong\">KDE "
-"«Plasma»</emphasis>, legg til <computeroutput>desktop=gnome</computeroutput> "
-"i kjernens oppstartsparametere."
+"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
+"emphasis> i stedet for <emphasis role=\"strong\">KDE «Plasma»</emphasis>, "
+"legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
+"oppstartsparametere."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1985,16 +1984,17 @@ msgid ""
"server or as a thin client server to become usefull after the installation."
msgstr ""
"Profilene til <emphasis role=\"strong\">hovedtjener </emphasis>, <emphasis "
-"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong\""
-">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være installert "
-"sammen på en maskin hvis du ønsker å installere en såkalt <emphasis> "
-"kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både en tjener "
-"for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
-"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette <"
-"link linkend=\"Installation--Installation_over_the_network_.28PXE."
-"29_and_booting_diskless_clients\">via PXE</link>. Vær oppmerksom på at du må "
-"ha to nettverkskort installert i en maskin som skal gjøres til en kombinert "
-"hovedtjener om den skal komme til nytte etter installasjon."
+"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong"
+"\">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være "
+"installert sammen på en maskin hvis du ønsker å installere en såkalt "
+"<emphasis> kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både "
+"en tjener for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
+"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette "
+"<link linkend=\"Installation--"
+"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"PXE</link>. Vær oppmerksom på at du må ha to nettverkskort installert i en "
+"maskin som skal gjøres til en kombinert hovedtjener om den skal komme til "
+"nytte etter installasjon."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2030,10 +2030,10 @@ msgid ""
"should be kept for future releases. Although you don't have to, it is a "
"simple way for you to help."
msgstr ""
-"Velg gjerne ja for å sende informasjon til <ulink url=\""
-"http://popcon.skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon "
-"om hvilke pakker som er populære, og som bør beholdes i fremtidige "
-"utgivelser - dette er selvfølgelig frivillig."
+"Velg gjerne ja for å sende informasjon til <ulink url=\"http://popcon."
+"skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon om hvilke "
+"pakker som er populære, og som bør beholdes i fremtidige utgivelser - dette "
+"er selvfølgelig frivillig."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -2258,8 +2258,8 @@ msgid ""
"This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
"Server</emphasis> profile only:"
msgstr ""
-"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong\""
-">hovedtjener</emphasis> tilgjengelig:"
+"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
+"\">hovedtjener</emphasis> tilgjengelig:"
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
@@ -4655,8 +4655,8 @@ msgid ""
"computeroutput>"
msgstr ""
"Bytt ut versjonsstrengen i oppsettet med en ny en slik som dette: "
-"<computeroutput><conf configVersion=\"Managed-by-Debian-Edu\""
-"></computeroutput>"
+"<computeroutput><conf configVersion=\"Managed-by-Debian-Edu\"></"
+"computeroutput>"
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
msgid ""
@@ -6882,8 +6882,8 @@ msgid ""
"etc/debian-edu/www/debian-edu-install.dat.local</computeroutput>:"
msgstr ""
"For å legge til et tilpasset arkiv legg inn noe slikt som dette i "
-"<computeroutput>/etc/debian-edu/www/debian-edu-"
-"install.dat.local</computeroutput>:"
+"<computeroutput>/etc/debian-edu/www/debian-edu-install.dat.local</"
+"computeroutput>:"
#. type: CDATA
#, no-wrap
@@ -9742,8 +9742,8 @@ msgid ""
"If you are already running Debian Edu 8+edu0 Jessie, <emphasis role=\"strong"
"\">apt upgrade</emphasis> is sufficient to upgrade to Debian Edu 8+edu1."
msgstr ""
-"Hvis du allerede kjører Debian Edu 8+edu0 Jessie, så holder det å bruke <"
-"emphasis role=\"strong\">apt upgrade</emphasis> for å oppgradere til Debian "
+"Hvis du allerede kjører Debian Edu 8+edu0 Jessie, så holder det å bruke "
+"<emphasis role=\"strong\">apt upgrade</emphasis> for å oppgradere til Debian "
"Edu 8+edu1."
#. type: Content of: <article><section><section><title>
@@ -10174,8 +10174,8 @@ msgid ""
"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
-"anonymt med denne kommandoen (du må ha pakken "
-"<computeroutput>git</computeroutput> installert for at dette skal fungere):"
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
+"computeroutput> installert for at dette skal fungere):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -10244,8 +10244,8 @@ msgid ""
"Git\"/>."
msgstr ""
"Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\""
-"http://wiki.debian.org/Alioth/Git\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index bff50d1..92684a4 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-10-01 14:33+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-10-03 16:15+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -21,12 +21,10 @@ msgid "en"
msgstr "nl"
#. type: Content of: <article><articleinfo><title>
-#| msgid "Debian Edu / Skolelinux Jessie 8+edu0 Manual"
msgid "Debian Edu / Skolelinux Jessie 8+edu1 Manual"
msgstr "Handleiding Debian Edu/Skolelinux Jessie 8+edu1"
#. type: Content of: <article><section><title>
-#| msgid "Manual for Debian Edu 8+edu0 Codename Jessie"
msgid "Manual for Debian Edu 8+edu1 Codename Jessie"
msgstr "Handleiding voor Debian Edu 8+edu1 codenaam Jessie"
@@ -39,7 +37,6 @@ msgid "Debian Edu login"
msgstr "Aanmelden bij Debian Edu"
#. type: Content of: <article><section><para>
-#| msgid "This is the manual for the Debian Edu Jessie 8+edu0 release."
msgid "This is the manual for the Debian Edu Jessie 8+edu1 release."
msgstr "Dit is de handleiding voor de uitgave van Debian Edu Jessie 8+edu1."
@@ -10199,15 +10196,10 @@ msgid "New features in Debian Edu Jessie"
msgstr "Nieuwe functionaliteit in Debian Edu Jessie"
#. type: Content of: <article><section><section><title>
-#| msgid "New features for Debian Edu 8+edu0 Codename Jessie"
msgid "New features for Debian Edu 8+edu1 Codename Jessie"
msgstr "Nieuwe functionaliteit voor Debian Edu 8+edu1 codenaam Jessie"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is the first release of Debian Edu 8+edu0. Please report feedback to "
-#| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
-#| "org</ulink>!"
msgid ""
"This is the second release of Debian Edu Jessie. Please report feedback to "
"<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
@@ -10240,10 +10232,6 @@ msgid "New features for Debian Edu 8+edu0 Codename Jessie"
msgstr "Handleiding voor Debian Edu 8+edu0 codenaam Jessie"
#. type: Content of: <article><section><section><para>
-#| msgid ""
-#| "This is the first release of Debian Edu 8+edu0. Please report feedback to "
-#| "<ulink url=\"mailto:debian-edu at lists.debian.org\">debian-edu at lists.debian."
-#| "org</ulink>!"
msgid ""
"This is the first release of Debian Edu Jessie. It was released on <ulink "
"url=\"https://www.debian.org/News/2016/20160702\">July 2nd 2016</ulink>."
@@ -10785,7 +10773,6 @@ msgid "Note to translators: there is no need to translate the GPL license text."
msgstr "Noot voor vertalers: het is niet nodig om de tekst van de GPL-licentie te vertalen."
#. type: Content of: <article><section><section><title>
-#| msgid "Manual for Debian Edu 8+edu0 Codename \"Jessie\""
msgid "Manual for Debian Edu 8+edu1 Codename \"Jessie\""
msgstr "Handleiding voor Debian Edu 8+edu1, codenaam Jessie"
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pl.po
index d29569d..f7af1d1 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-10-01 14:33+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-11-19 17:51+0000\n"
"Last-Translator: Stanisław Krukowski <dfk0077 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -48,8 +48,8 @@ msgid ""
"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
"Jessie\"/> is a wiki and updated frequently."
msgstr ""
-"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Jessie\"/> jest wersją wiki i jest często aktualizowana."
+"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Jessie"
+"\"/> jest wersją wiki i jest często aktualizowana."
#. type: Content of: <article><section><para>
msgid ""
@@ -60,8 +60,8 @@ msgid ""
msgstr ""
"<link linkend=\"Translations\">Tłumaczenia</link> są częścią pakietu "
"<computeroutput>debian-edu-doc</computeroutput>. Pakiet można zainstalować "
-"na serwerze WWW. Jest on również dostępny <ulink url=\""
-"http://maintainer.skolelinux.org/debian-edu-doc/\">online</ulink>."
+"na serwerze WWW. Jest on również dostępny <ulink url=\"http://maintainer."
+"skolelinux.org/debian-edu-doc/\">online</ulink>."
#. type: Content of: <article><section><title>
msgid "About Debian Edu and Skolelinux"
@@ -90,9 +90,9 @@ msgid ""
"PXE booting for diskless machines like traditional thin-clients."
msgstr ""
"Bezpośrednio po instalacji serwera szkolnego wszystkie usługi, potrzebne do "
-"szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział <"
-"link linkend=\"Architecture\">szczegóły architektury tej konfiguracji</link>"
-", a system jest gotowy do użycia. Muszą być tylko dodane maszyny i "
+"szkolnej sieci komputerowej, są skonfigurowane (zobacz następny rozdział "
+"<link linkend=\"Architecture\">szczegóły architektury tej konfiguracji</"
+"link>, a system jest gotowy do użycia. Muszą być tylko dodane maszyny i "
"użytkownicy poprzez GOsa², wygodny interfejs użytkownika, oparty na stronach "
"WWW lub dowolny inny edytor LDAP. Przygotowane jest też środowisko rozruchu "
"sieciowego, używające PXE tak, aby po wstępnej instalacji z głównego serwera "
@@ -127,10 +127,10 @@ msgid ""
"subproject."
msgstr ""
"<ulink url=\"http://www.skolelinux.org\">Skolelinux</ulink> jest dystrybucją "
-"Linuksa stworzoną przez projekt Debian Edu. Jako dystrybucja Debiana typu <"
-"ulink url=\"http://wiki.debian.org/DebianPureBlends\">Pure Blends</ulink> "
-"jest oficjalnym podprojektem <ulink url=\"http://www.debian.org\""
-">Debiana</ulink>."
+"Linuksa stworzoną przez projekt Debian Edu. Jako dystrybucja Debiana typu "
+"<ulink url=\"http://wiki.debian.org/DebianPureBlends\">Pure Blends</ulink> "
+"jest oficjalnym podprojektem <ulink url=\"http://www.debian.org\">Debiana</"
+"ulink>."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -150,9 +150,9 @@ msgid ""
msgstr ""
"W Norwegii, projekt Skolelinux został założony 2 lipca 2001 — mniej więcej w "
"tym samym czasie, gdy Raphaël Hertzog rozpoczął Debian-Edu we Francji. Od "
-"2003 roku oba projekty są ze sobą złączone, lecz obie nazwy pozostały. \""
-"Skole\" i (Debian-) \"Education\" to po prostu dwa dobrze zrozumiałe terminy "
-"w tych regionach."
+"2003 roku oba projekty są ze sobą złączone, lecz obie nazwy pozostały. "
+"\"Skole\" i (Debian-) \"Education\" to po prostu dwa dobrze zrozumiałe "
+"terminy w tych regionach."
#. type: Content of: <article><section><section><para>
msgid ""
@@ -320,9 +320,9 @@ msgid ""
"machine first, of course)."
msgstr ""
"Za wyjątkiem sterowania terminalami komputerowymi, wszystkie usługi są "
-"początkowo zainstalowane na jednym komputerze centralnym (komputerze głównym)"
-". Z powodów wydajnościowych serwer terminala komputerowego powinien być "
-"oddzielną maszyną (chociaż możliwe jest zainstalowanie zarówno profilu "
+"początkowo zainstalowane na jednym komputerze centralnym (komputerze "
+"głównym). Z powodów wydajnościowych serwer terminala komputerowego powinien "
+"być oddzielną maszyną (chociaż możliwe jest zainstalowanie zarówno profilu "
"głównego serwera, jak i profilu terminala komputerowego na tej samej "
"maszynie). Wszystkie usługi są przydzielonymi, dedykowanymi nazwami DNS i są "
"wyłącznie oferowane poprzez IPv4. Przydzielona nazwa DNS ułatwia "
@@ -351,9 +351,9 @@ msgid ""
msgstr ""
"Poniżej znajduje się tabela usług, które są domyślnie ustawione w sieci "
"komputerowej Skolelinux i nazwy DNS dla każdej usługi. Możliwe jest, aby "
-"wszystkie pliki konfiguracyjne odnosiły się do usługi za pomocą jej nazwy ("
-"bez nazwy domeny). W ten sposób ułatwia się szkołom albo zmianę domeny ("
-"jeśli mają własną domenę DNS) lub zmianę używanych adresów IP."
+"wszystkie pliki konfiguracyjne odnosiły się do usługi za pomocą jej nazwy "
+"(bez nazwy domeny). W ten sposób ułatwia się szkołom albo zmianę domeny "
+"(jeśli mają własną domenę DNS) lub zmianę używanych adresów IP."
#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
msgid "<emphasis role=\"strong\">Table of services</emphasis>"
@@ -576,9 +576,9 @@ msgstr ""
"Pliki osobiste dla każdego użytkownika są przechowywane w katalogach home. "
"Są one dostępne za pomocą serwera. Katalogi home są dostępne ze wszystkich "
"maszyn. Dzięki temu, użytkownicy mają dostęp do tych samych plików "
-"niezależnie od tego, której maszyny używają. Serwer ma charakter \""
-"agnostyczny\": oferuje dostęp via NFS dla klientów Uniksa, SMB dla klientów "
-"Windowsa i Mackintosha."
+"niezależnie od tego, której maszyny używają. Serwer ma charakter "
+"\"agnostyczny\": oferuje dostęp via NFS dla klientów Uniksa, SMB dla "
+"klientów Windowsa i Mackintosha."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -633,8 +633,8 @@ msgstr ""
"Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
"za pomocą DHCP. Zwykłe klienty mają adresy IP przydzielane w prywatnej "
"podsieci 10.0.0.0/8, natomiast klienty terminalowe są podłączane od "
-"odpowiadającego im serwera terminali via oddzielną podsieć 192.168.0.0/24 ("
-"to ma zapewnić sytuację, w której ruch sieciowy klientów terminalowych nie "
+"odpowiadającego im serwera terminali via oddzielną podsieć 192.168.0.0/24 "
+"(to ma zapewnić sytuację, w której ruch sieciowy klientów terminalowych nie "
"koliduje z resztą usług sieci komputerowej)."
#. type: Content of: <article><section><section><section><para>
@@ -655,10 +655,10 @@ msgid ""
"can use it as the main DNS Server."
msgstr ""
"Domyślnie, serwer DNS jest zainstalowany z domeną tylko do użytku lokalnego "
-"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\""
-"zewnętrzna\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z "
-"pamięcią podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako "
-"głównego serwera DNS."
+"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\"zewnętrzna"
+"\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z pamięcią "
+"podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako głównego "
+"serwera DNS."
#. type: Content of: <article><section><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 04fd223..7c6eee2 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-15 19:21+0100\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-15 19:27+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -10097,8 +10097,8 @@ msgstr ""
"translations, wenn Sie eine neue PO-Datei für Ihre Sprache anlegen oder "
"Übersetzungen aktualisieren wollen."
-#. <remark>
-#. status ignore</remark>
+#. <remark>
+#. status ignore</remark>
#. type: Content of: <article><section><section><para>
msgid ""
"Please keep in mind that this manual is still under development, so don't "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index 4678baa..83bf913 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-11-15 19:21+0100\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-20 05:55+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -46,7 +46,6 @@ msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
msgstr "Utgivelseshåndbok for Debian Edu 9+edu0 kodenavn Stretch"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/22-Tjener_GRUB_boot_menu.png"
msgid "./images/23-Tjener-Login.png"
msgstr "./images/23-Tjener-Login.png"
@@ -1066,8 +1065,8 @@ msgid ""
"or 64 bit (Debian architecture 'amd64') x86 processors."
msgstr ""
"Datamaskinene som bruker Skolelinux må enten ha x86-prosessorer som er 32-"
-"bit (Debian-arkitektur «i386», eldste støttede prosessorer er de i "
-"686-klassen), eller 64-bit (Debian-arkitektur «AMD64»)."
+"bit (Debian-arkitektur «i386», eldste støttede prosessorer er de i 686-"
+"klassen), eller 64-bit (Debian-arkitektur «AMD64»)."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1347,11 +1346,11 @@ msgid ""
"Debian Stretch</ulink> before you start installing a system for production "
"use. Please give Debian Edu/Skolelinux a try, it should just work."
msgstr ""
-"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\""
-"http://www.debian.org/releases/stretch/releasenotes\">utgivelsesnotatene for "
-"Debian Stretch</ulink> før du starter å installere et system for bruk i "
-"produksjon. Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke "
-"det. Det skal bare fungere."
+"Vi anbefaler å lese, eller i det minste, ta en kikk på <ulink url=\"http://"
+"www.debian.org/releases/stretch/releasenotes\">utgivelsesnotatene for Debian "
+"Stretch</ulink> før du starter å installere et system for bruk i produksjon. "
+"Hvis du bare vil prøve Debian Edu/Skolelinux, så trenger du ikke det. Det "
+"skal bare fungere."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para><inlinemediaobject><textobject><phrase>
msgid ":-)"
@@ -10273,8 +10272,8 @@ msgid ""
"Git\"/>."
msgstr ""
"Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\""
-"http://wiki.debian.org/Alioth/Git\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
index da56496..faa96be 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-11-15 19:21+0100\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-19 17:51+0000\n"
"Last-Translator: Stanisław Krukowski <dfk0077 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -32,7 +32,6 @@ msgid "Manual for Debian Edu 9+edu0 Codename Stretch"
msgstr "Podręcznik dla Debiana Edu 9+edu1 Nazwa kodowa Stretch"
#. type: Attribute 'fileref' of: <article><section><section><para><inlinemediaobject><imageobject><imagedata>
-#| msgid "./images/23-Tjener-KDM_Login.png"
msgid "./images/23-Tjener-Login.png"
msgstr "./images/23-Tjener-Login.png"
@@ -49,8 +48,8 @@ msgid ""
"The version at <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
"Stretch\"/> is a wiki and updated frequently."
msgstr ""
-"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/"
-"Stretch\"/> jest wersją wiki i jest często aktualizowana."
+"Wersja na <ulink url=\"http://wiki.debian.org/DebianEdu/Documentation/Stretch"
+"\"/> jest wersją wiki i jest często aktualizowana."
#. type: Content of: <article><section><para>
msgid ""
@@ -577,9 +576,9 @@ msgstr ""
"Pliki osobiste dla każdego użytkownika są przechowywane w katalogach home. "
"Są one dostępne za pomocą serwera. Katalogi home są dostępne ze wszystkich "
"maszyn. Dzięki temu, użytkownicy mają dostęp do tych samych plików "
-"niezależnie od tego, której maszyny używają. Serwer ma charakter \""
-"agnostyczny\": oferuje dostęp via NFS dla klientów Uniksa, SMB dla klientów "
-"Windowsa i Mackintosha."
+"niezależnie od tego, której maszyny używają. Serwer ma charakter "
+"\"agnostyczny\": oferuje dostęp via NFS dla klientów Uniksa, SMB dla "
+"klientów Windowsa i Mackintosha."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -634,8 +633,8 @@ msgstr ""
"Konfiguracja sieci komputerowej dla klientów jest wykonywana automatycznie "
"za pomocą DHCP. Zwykłe klienty mają adresy IP przydzielane w prywatnej "
"podsieci 10.0.0.0/8, natomiast klienty terminalowe są podłączane od "
-"odpowiadającego im serwera terminali via oddzielną podsieć 192.168.0.0/24 ("
-"to ma zapewnić sytuację, w której ruch sieciowy klientów terminalowych nie "
+"odpowiadającego im serwera terminali via oddzielną podsieć 192.168.0.0/24 "
+"(to ma zapewnić sytuację, w której ruch sieciowy klientów terminalowych nie "
"koliduje z resztą usług sieci komputerowej)."
#. type: Content of: <article><section><section><section><para>
@@ -656,10 +655,10 @@ msgid ""
"can use it as the main DNS Server."
msgstr ""
"Domyślnie, serwer DNS jest zainstalowany z domeną tylko do użytku lokalnego "
-"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\""
-"zewnętrzna\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z "
-"pamięcią podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako "
-"głównego serwera DNS."
+"(*.intern), aż do czasu, gdy zainstalowana zostanie rzeczywista (\"zewnętrzna"
+"\") domena DNS. Serwer DNS jest zainstalowany jako serwer DNS z pamięcią "
+"podręczną tak, aby wszystkie maszyny w sieci mogły go używać jako głównego "
+"serwera DNS."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -8082,7 +8081,8 @@ msgstr ""
#. type: Content of: <article><section><section><title>
msgid "New features for Debian Edu 8+edu0 Codename Jessie released 2016-07-02"
-msgstr "Nowe cechy dla Debiana Edu 8+edu0 Nazwa kodowa Jessie wydany 2016-07-02"
+msgstr ""
+"Nowe cechy dla Debiana Edu 8+edu0 Nazwa kodowa Jessie wydany 2016-07-02"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
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 353e325..3e03772 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -22,7 +22,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-08-10 12:46+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-11-20 05:55+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1059,8 +1059,8 @@ msgid ""
"The purpose of the different profiles is explained in the <link linkend="
"\"Architecture\">network architecture</link> chapter."
msgstr ""
-"Egenskapene til de ulike profilene forklares i kapittelet <link url=\""
-"Architecture\">nettverksarkitektur</link>."
+"Egenskapene til de ulike profilene forklares i kapittelet <link url="
+"\"Architecture\">nettverksarkitektur</link>."
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1186,9 +1186,8 @@ msgid ""
"A list of tested hardware is provided at <ulink url=\"http://wiki.debian.org/"
"DebianEdu/Hardware/\"/> . This list is not nearly complete"
msgstr ""
-"En liste over testet maskinvare kan finnes på <ulink url=\""
-"http://wiki.debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen "
-"måte komplett."
+"En liste over testet maskinvare kan finnes på <ulink url=\"http://wiki."
+"debian.org/DebianEdu/Hardware/\"/>. Denne listen er på ingen måte komplett."
#. type: Attribute 'fileref' of: <article><section><section><section><itemizedlist><listitem><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/smile.png"
@@ -1822,10 +1821,10 @@ msgid ""
"the <emphasis role=\"strong\">KDE \"Plasma\"</emphasis> desktop, add "
"<computeroutput>desktop=gnome</computeroutput> to the kernel boot parameters."
msgstr ""
-"For å installere skrivebordsmiljøet <emphasis role=\"strong\""
-">GNOME</emphasis> i stedet for <emphasis role=\"strong\">KDE "
-"«Plasma»</emphasis>, legg til <computeroutput>desktop=gnome</computeroutput> "
-"i kjernens oppstartsparametere."
+"For å installere skrivebordsmiljøet <emphasis role=\"strong\">GNOME</"
+"emphasis> i stedet for <emphasis role=\"strong\">KDE «Plasma»</emphasis>, "
+"legg til <computeroutput>desktop=gnome</computeroutput> i kjernens "
+"oppstartsparametere."
#. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -1997,16 +1996,17 @@ msgid ""
"server or as a thin client server to become usefull after the installation."
msgstr ""
"Profilene til <emphasis role=\"strong\">hovedtjener </emphasis>, <emphasis "
-"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong\""
-">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være installert "
-"sammen på en maskin hvis du ønsker å installere en såkalt <emphasis> "
-"kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både en tjener "
-"for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
-"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette <"
-"link linkend=\"Installation--Installation_over_the_network_.28PXE."
-"29_and_booting_diskless_clients\">via PXE</link>. Vær oppmerksom på at du må "
-"ha to nettverkskort installert i en maskin som skal gjøres til en kombinert "
-"hovedtjener om den skal komme til nytte etter installasjon."
+"role=\"strong \">arbeidsstasjon</emphasis> og <emphasis role=\"strong"
+"\">tynnklient</emphasis> er forhåndsvalgt. Disse profilene kan være "
+"installert sammen på en maskin hvis du ønsker å installere en såkalt "
+"<emphasis> kombinert hovedtjener</emphasis>. Da vil hovedtjeneren være både "
+"en tjener for tynnklienter, og bli brukt som en arbeidsstasjon. Dette er "
+"forhåndsvalgt, fordi vi regner med at de fleste senere vil installere dette "
+"<link linkend=\"Installation--"
+"Installation_over_the_network_.28PXE.29_and_booting_diskless_clients\">via "
+"PXE</link>. Vær oppmerksom på at du må ha to nettverkskort installert i en "
+"maskin som skal gjøres til en kombinert hovedtjener om den skal komme til "
+"nytte etter installasjon."
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -2042,10 +2042,10 @@ msgid ""
"should be kept for future releases. Although you don't have to, it is a "
"simple way for you to help."
msgstr ""
-"Velg gjerne ja for å sende informasjon til <ulink url=\""
-"http://popcon.skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon "
-"om hvilke pakker som er populære, og som bør beholdes i fremtidige "
-"utgivelser - dette er selvfølgelig frivillig."
+"Velg gjerne ja for å sende informasjon til <ulink url=\"http://popcon."
+"skolelinux.org/\"/>for å tillate oss å få tilsendt informasjon om hvilke "
+"pakker som er populære, og som bør beholdes i fremtidige utgivelser - dette "
+"er selvfølgelig frivillig."
#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
msgid ""
@@ -2272,8 +2272,8 @@ msgid ""
"This is how the PXE menu looks with the <emphasis role=\"strong\">Main-"
"Server</emphasis> profile only:"
msgstr ""
-"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong\""
-">hovedtjener</emphasis> tilgjengelig:"
+"Slik ser PXE-menyen ut når man kun har <emphasis role=\"strong"
+"\">hovedtjener</emphasis> tilgjengelig:"
#. type: Attribute 'fileref' of: <article><section><section><section><para><inlinemediaobject><imageobject><imagedata>
msgid "./images/pxe-tjener.png"
@@ -6116,6 +6116,7 @@ msgstr ""
"nettarkiv, eller du kan legge til"
#. type: CDATA
+#, no-wrap
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
@@ -8746,10 +8747,10 @@ msgid ""
msgstr ""
"Start KMail, klikk på «Next» (Neste) i Account Wizard, velg "
"<computeroutput>IMAP</computeroutput> som kontotype, klikk «Next». Skriv inn "
-"riktig navn og e-postadresse <computeroutput>brukernavn at postoffice.intern "
-"</computeroutput>, klikk «Next». Sjekk om brukernavnet er riktig, ikke "
-"oppgi passordet, klikk «Next» (Kerberos gir enkel pålogging når det gjelder "
-"SMTP og IMAP, så du trenger ikke å skrive inn passordet ditt.) Skriv "
+"riktig navn og e-postadresse <computeroutput>brukernavn at postoffice.intern </"
+"computeroutput>, klikk «Next». Sjekk om brukernavnet er riktig, ikke oppgi "
+"passordet, klikk «Next» (Kerberos gir enkel pålogging når det gjelder SMTP "
+"og IMAP, så du trenger ikke å skrive inn passordet ditt.) Skriv "
"inn<computeroutput> postoffice.intern </computeroutput> to ganger som "
"servernavn, klikk «Finish» (Ferdig). Lukk dagens tips/råd. Klikk på "
"«Settings» (Innstillinger) i KMail-menyen, velg «Konfigurer KMail ...», "
@@ -9568,8 +9569,8 @@ msgid ""
"Git\"/>."
msgstr ""
"Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\""
-"http://wiki.debian.org/Alioth/Git\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
index de88228..f052c65 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-08-10 12:46+0200\n"
+"POT-Creation-Date: 2016-11-21 11:57+0000\n"
"PO-Revision-Date: 2016-08-19 20:51+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -6400,17 +6400,6 @@ msgstr "Om www.deb-multimedia.org te kunnen gebruiken, doet u het volgende:"
#. type: CDATA
#, no-wrap
-#| msgid ""
-#| "# install the debian-keyring securely:\n"
-#| "apt-get install debian-keyring\n"
-#| "# fetch the deb-multimedia key insecurely:\n"
-#| "gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907\n"
-#| "# check securely if the key is correct and add it to the keyring used by APT if it is:\n"
-#| "gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -\n"
-#| "# add repository to sources.list - please check the homepages for mirrors!\n"
-#| "echo \"deb http://deb-multimedia.org wheezy main\" >> /etc/apt/sources.list\n"
-#| "# update the list of available packages:\n"
-#| "apt-get update"
msgid ""
"# install the debian-keyring securely:\n"
"apt-get install debian-keyring\n"
@@ -7549,12 +7538,6 @@ msgstr ""
"rest, ongecodeerd over het netwerk doorgegeven worden."
#. type: Content of: <article><section><section><section><para>
-#| msgid ""
-#| "Note: Since such ten-year-old thin clients may also have trouble running "
-#| "never versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
-#| "issues, you may consider running thin clients with at least 128 MB RAM, "
-#| "or upgrade the hardware, which will also give you the benefit of being "
-#| "able to use them as diskless workstations."
msgid ""
"Note: Since such ten-year-old thin clients may also have trouble running "
"newer versions of LibreOffice and Firefox/Iceweasel due to pixmap caching "
@@ -7865,15 +7848,6 @@ msgid "Example smb.conf files for roaming profiles"
msgstr "Voorbeelden van smb.conf bestanden voor mobiele profielen"
#. type: Content of: <article><section><section><section><section><para>
-#| msgid ""
-#| "You should hopefully find an example smb.conf in your preferred language "
-#| "delivered by the installation on tjener under <computeroutput>/usr/share/"
-#| "debian-edu-config/examples/</computeroutput>. The source file is in "
-#| "English and is called <computeroutput>smb-roaming-profiles-en.conf</"
-#| "computeroutput>; look for a file with the appropriate code in the "
-#| "filename (the German translation, for example, will be named "
-#| "<computeroutput>smb-roaming-profiles-de.conf</computeroutput>). Inside "
-#| "the config file are a lot of explanations which you should have a look at."
msgid ""
"You might find an example smb.conf in your preferred language delivered by "
"the installation on tjener under <computeroutput>/usr/share/doc/debian-edu-"
diff --git a/documentation/rosegarden/rosegarden-manual.nb.po b/documentation/rosegarden/rosegarden-manual.nb.po
index b4d0abf..67dc079 100644
--- a/documentation/rosegarden/rosegarden-manual.nb.po
+++ b/documentation/rosegarden/rosegarden-manual.nb.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-04-13 19:40+0000\n"
+"POT-Creation-Date: 2016-11-21 11:58+0000\n"
"PO-Revision-Date: 2016-11-20 05:55+0000\n"
"Last-Translator: Petter Reinholdtsen <pere-weblate at hungry.com>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -3497,8 +3497,8 @@ msgid ""
"<computeroutput>git</computeroutput> package installed for this to work):"
msgstr ""
"Du kan hente ut kilden for <computeroutput>debian-edu-doc</computeroutput> "
-"anonymt med denne kommandoen (du må ha pakken "
-"<computeroutput>git</computeroutput> installert for at dette skal fungere):"
+"anonymt med denne kommandoen (du må ha pakken <computeroutput>git</"
+"computeroutput> installert for at dette skal fungere):"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -3567,8 +3567,8 @@ msgid ""
"Git\"/>."
msgstr ""
"Grunnleggende informasjon om Alioth (verten der vårt Git pakkelager er "
-"plassert) og Git er tilgjengelig på <ulink url=\""
-"http://wiki.debian.org/Alioth/Git\"/>."
+"plassert) og Git er tilgjengelig på <ulink url=\"http://wiki.debian.org/"
+"Alioth/Git\"/>."
#. type: Content of: <article><section><section><para>
msgid ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git
More information about the debian-edu-commits
mailing list