[debian-edu-commits] debian-edu/ 01/01: Updated from the wiki.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-itil-doc-nb.

commit e000cf85c43488ced1ab7d3e87dc670f721b90e7
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Mar 25 22:44:31 2015 +0100

    Updated from the wiki.
---
 documentation/itil/itil.pot | 18 +++++-------------
 documentation/itil/itil.xml |  8 ++------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/documentation/itil/itil.pot b/documentation/itil/itil.pot
index ba18f18..1250ae1 100644
--- a/documentation/itil/itil.pot
+++ b/documentation/itil/itil.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-03-24 21:01+0100\n"
+"POT-Creation-Date: 2015-03-25 22:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -710,8 +710,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
 msgid ""
-"<emphasis role=\"strong\">10 skoler, 500 klient-maskiner (samtidige "
-"brukere)</emphasis>"
+"<emphasis role=\"strong\">10 skoler, 500 klient-maskiner (samtidige brukere)"
+"</emphasis>"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -5942,15 +5942,7 @@ msgid "Tjener-maskiner"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "Antall"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "klienter/"
-msgstr ""
-
-#. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
-msgid "bærbare"
+msgid "Antall klienter / bærbare"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><informaltable><tgroup><tbody><row><entry><para>
@@ -6531,7 +6523,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><itemizedlist><listitem><para>
-msgid "Skriv inn DHCP verstsnavn:"
+msgid "Skriv inn DHCP vertsnavn:"
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
diff --git a/documentation/itil/itil.xml b/documentation/itil/itil.xml
index ee8c40a..286a24a 100644
--- a/documentation/itil/itil.xml
+++ b/documentation/itil/itil.xml
@@ -2988,11 +2988,7 @@
 </para></entry><entry colsep="1" rowsep="1">
 <para>Tjener-maskiner
 </para></entry><entry colsep="1" rowsep="1">
-<para>Antall
-</para>
-<para>klienter/
-</para>
-<para>bærbare
+<para>Antall klienter / bærbare
 </para></entry><entry colsep="1" rowsep="1">
 <para>Brukere:
 </para></entry><entry colsep="1" rowsep="1">
@@ -3344,7 +3340,7 @@ e.   Does your Internet connection get its IP via DHCP? [y/n]:]]></screen>
     DNS Server 2 (optional):]]></screen>
 <itemizedlist>
 <listitem>
-<para>Skriv inn DHCP verstsnavn:  
+<para>Skriv inn DHCP vertsnavn:  
 </para></listitem></itemizedlist>
 <para>Vanligvis kan denne være blank  
 </para>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/debian-edu-itil-doc-nb.git