[debian-edu-commits] debian-edu/ 01/01: update ITIL document from the wiki (include copyright page)

Holger Levsen holger at layer-acht.org
Thu May 19 08:59:43 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 4e3ffe98333ebe104b2e557696d0f21ce31339dd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu May 19 10:58:46 2016 +0200

    update ITIL document from the wiki (include copyright page)
---
 .../debian-edu-itil/debian-edu-itil-manual.nb.po   | 222 +++++++++++++++++----
 .../debian-edu-itil/debian-edu-itil-manual.pot     |   8 +-
 .../debian-edu-itil/debian-edu-itil-manual.xml     |   2 +
 3 files changed, 187 insertions(+), 45 deletions(-)

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 b34b1cb..a53c464 100644
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.nb.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2015-10-02 21:51+0200\n"
+"POT-Creation-Date: 2016-05-19 10:54+0200\n"
 "PO-Revision-Date: 2015-10-02 22:00+0000\n"
 "Last-Translator: Petter Reinholdtsen <pere at hungry.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -178,6 +178,12 @@ msgstr ""
 "oppdatere konfigurasjoner ol."
 
 #. type: Content of: <article><section><section><para>
+msgid ""
+"See the <ulink url=\"https://wiki.debian.org/CopyRight#\">copyright page</"
+"ulink> for the copyright status of this document."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 msgid "<ulink url=\"http://www.gnu.org/copyleft/gpl.html\"/>"
 msgstr "<ulink url=\"http://www.gnu.org/copyleft/gpl.html\"/>"
 
@@ -15024,8 +15030,14 @@ msgstr ""
 #~ msgid "Machine room 1"
 #~ msgstr "Maskinrommet 1"
 
-#~ msgid "<emphasis role=\"strong\">Advantages:</emphasis> Same functionality as thick clients. Need few servers. The client computers do not have software installed. "
-#~ msgstr "<emphasis role=\"strong\">Fordeler:</emphasis> Samme funksjonalitet som tykke klienter. Trenger få tjenermaskiner. Klientmaskinene har ikke installert programvare."
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Advantages:</emphasis> Same functionality as "
+#~ "thick clients. Need few servers. The client computers do not have "
+#~ "software installed. "
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Fordeler:</emphasis> Samme funksjonalitet som "
+#~ "tykke klienter. Trenger få tjenermaskiner. Klientmaskinene har ikke "
+#~ "installert programvare."
 
 #~ msgid "3-4 h"
 #~ msgstr "3-4 t"
@@ -15039,8 +15051,18 @@ msgstr ""
 #~ msgid "<anchor id=\"Delivery--content-service-level-agreement\"/>"
 #~ msgstr "<anchor id=\"Delivery--content-service-level-agreement\"/>"
 
-#~ msgid "All user programs and services are installed on the server machine. A full operating system with a graphical interface is usually installed on the client machine. The user programs run on the server. The client computer is usually stationary. Several network services such as email, file storage, case-filing system etc. are provided."
-#~ msgstr "Alle brukerprogram og tjenester er installert på tjenermaskin. Fullt operativsystem med vindussystem er vanligvis installert på klientmaskin. Brukerprogrammene kjører på tjenermaskiner. Klientmaskinen er vanligvis stasjonær. Kjører flere tjenester i nettverk som e-post, fillagring, sak-arkivsystem ol."
+#~ msgid ""
+#~ "All user programs and services are installed on the server machine. A "
+#~ "full operating system with a graphical interface is usually installed on "
+#~ "the client machine. The user programs run on the server. The client "
+#~ "computer is usually stationary. Several network services such as email, "
+#~ "file storage, case-filing system etc. are provided."
+#~ msgstr ""
+#~ "Alle brukerprogram og tjenester er installert på tjenermaskin. Fullt "
+#~ "operativsystem med vindussystem er vanligvis installert på klientmaskin. "
+#~ "Brukerprogrammene kjører på tjenermaskiner. Klientmaskinen er vanligvis "
+#~ "stasjonær. Kjører flere tjenester i nettverk som e-post, fillagring, sak-"
+#~ "arkivsystem ol."
 
 #~ msgid "100 % FTE"
 #~ msgstr "100 % stilling"
@@ -15048,26 +15070,74 @@ msgstr ""
 #~ msgid "<emphasis role=\"strong\">Lockdown of thick clients</emphasis>"
 #~ msgstr "<emphasis role=\"strong\">Nedlåsing av tykke klienter</emphasis>"
 
-#~ msgid "Development and maintenance of ICT strategies and processes for deployment and implementation of appropriate solutions in the ICT infrastructure of the organisation."
-#~ msgstr "Utvikling og vedlikehold av IT-strategier og prosesser for utrulling og sammensetting (implementasjon) av passende løsninger i IT-infrastrukturen i organisasjonen."
-
-#~ msgid "<emphasis role=\"strong\">Disadvantage:</emphasis> Requires more servers than thick and diskless clients."
-#~ msgstr "<emphasis role=\"strong\">Ulempe:</emphasis> Krever flere tjenermaskiner enn tykke og halvtykke klienter."
-
-#~ msgid "Concerns implementation and deployment of activities and / or ICT solutions designed and planned with a minimum of disruption to the organisation"
-#~ msgstr "Dreier seg om sammensetting (implementasjon) og utrulling av virksomhet, og/eller IT-løsninger designet og planlagt med et minimum av forstyrrelser for virksomheten."
+#~ msgid ""
+#~ "Development and maintenance of ICT strategies and processes for "
+#~ "deployment and implementation of appropriate solutions in the ICT "
+#~ "infrastructure of the organisation."
+#~ msgstr ""
+#~ "Utvikling og vedlikehold av IT-strategier og prosesser for utrulling og "
+#~ "sammensetting (implementasjon) av passende løsninger i IT-infrastrukturen "
+#~ "i organisasjonen."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Disadvantage:</emphasis> Requires more servers "
+#~ "than thick and diskless clients."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Ulempe:</emphasis> Krever flere tjenermaskiner "
+#~ "enn tykke og halvtykke klienter."
+
+#~ msgid ""
+#~ "Concerns implementation and deployment of activities and / or ICT "
+#~ "solutions designed and planned with a minimum of disruption to the "
+#~ "organisation"
+#~ msgstr ""
+#~ "Dreier seg om sammensetting (implementasjon) og utrulling av virksomhet, "
+#~ "og/eller IT-løsninger designet og planlagt med et minimum av "
+#~ "forstyrrelser for virksomheten."
 
 #~ msgid "Operating process"
 #~ msgstr "Driftsprosess"
 
-#~ msgid "<anchor id=\"InfrastructureSetup--workstationprofile\"/> <emphasis role=\"strong\">Thick clients</emphasis> or standard PCs is what is mostly used today. The term Personal Computers were used for the first time November the third 1962. The first PC with network and graphical user interface was created at Xerox PARK in 1973. Today it is the PC concept IBM launched in 1981 that is known and widespread. The entire operating system and all the software applications are installed on [...]
-#~ msgstr "<anchor id=\"InfrastructureSetup--workstationprofile\"/> <emphasis role=\"strong\">Tykke klienter</emphasis> eller vanlige PC-er er det de fleste bruker i dag. Første gang uttrykket Peronal Computer ble brukt var 3. november 1962. Den første PC-en med nettverk og grafisk brukergrensesnitt ble laget hos Xerox PARK i 1973. I dag er det PC-konseptet IBM lanserte i 1981 som er mest kjent og utbredt. Hele operativsystemet og alle brukerprogrammene er installert på hver klientmaskin [...]
-
-#~ msgid "Warning: <emphasis>All</emphasis> Skolelinux/Debian-edu-networks <emphasis>must have</emphasis> only one main server, and only one machine with that profile. Most commonly that profile can be combined with thin client servers, or just a workstation."
-#~ msgstr "VARSEL: <emphasis>Alle</emphasis> Skolelinux/Debian-edu-nettverk <emphasis>må ha</emphasis> kun en hovedtjener, og kun en installasjon med denne profilen. Profilen kan kombineres med tynnklienttjener som er det vanligste, eller bare en arbeidstasjon."
-
-#~ msgid "<emphasis role=\"strong\">Disadvantage:</emphasis> Need to install and maintain all the software on each client machine"
-#~ msgstr "<emphasis role=\"strong\">Ulempe:</emphasis> Må installere og vedlikeholde all programvare på hver klientmaskin"
+#~ msgid ""
+#~ "<anchor id=\"InfrastructureSetup--workstationprofile\"/> <emphasis role="
+#~ "\"strong\">Thick clients</emphasis> or standard PCs is what is mostly "
+#~ "used today. The term Personal Computers were used for the first time "
+#~ "November the third 1962. The first PC with network and graphical user "
+#~ "interface was created at Xerox PARK in 1973. Today it is the PC concept "
+#~ "IBM launched in 1981 that is known and widespread. The entire operating "
+#~ "system and all the software applications are installed on each client "
+#~ "computer on a local data store. The most famous operating computers are "
+#~ "Microsoft Windows and Linux. But there are also a number of other systems "
+#~ "that many people use, including a version of BSD."
+#~ msgstr ""
+#~ "<anchor id=\"InfrastructureSetup--workstationprofile\"/> <emphasis role="
+#~ "\"strong\">Tykke klienter</emphasis> eller vanlige PC-er er det de fleste "
+#~ "bruker i dag. Første gang uttrykket Peronal Computer ble brukt var 3. "
+#~ "november 1962. Den første PC-en med nettverk og grafisk brukergrensesnitt "
+#~ "ble laget hos Xerox PARK i 1973. I dag er det PC-konseptet IBM lanserte i "
+#~ "1981 som er mest kjent og utbredt. Hele operativsystemet og alle "
+#~ "brukerprogrammene er installert på hver klientmaskin på et lokalt "
+#~ "datalager. De mest kjente operativsystemene PC-er er Microsoft Windows og "
+#~ "Linux. Men det er også en rekke andre systemer som mange bruker, blant "
+#~ "annet en eller annen utgave av BSD."
+
+#~ msgid ""
+#~ "Warning: <emphasis>All</emphasis> Skolelinux/Debian-edu-networks "
+#~ "<emphasis>must have</emphasis> only one main server, and only one machine "
+#~ "with that profile. Most commonly that profile can be combined with thin "
+#~ "client servers, or just a workstation."
+#~ msgstr ""
+#~ "VARSEL: <emphasis>Alle</emphasis> Skolelinux/Debian-edu-nettverk "
+#~ "<emphasis>må ha</emphasis> kun en hovedtjener, og kun en installasjon med "
+#~ "denne profilen. Profilen kan kombineres med tynnklienttjener som er det "
+#~ "vanligste, eller bare en arbeidstasjon."
+
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Disadvantage:</emphasis> Need to install and "
+#~ "maintain all the software on each client machine"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Ulempe:</emphasis> Må installere og "
+#~ "vedlikeholde all programvare på hver klientmaskin"
 
 #~ msgid "Technical support process"
 #~ msgstr "Teknisk støtteprosess"
@@ -15075,17 +15145,26 @@ msgstr ""
 #~ msgid "8,5 % FTE"
 #~ msgstr "8,5 % stilling"
 
-#~ msgid "<emphasis role=\"strong\">Centralisation of all operations</emphasis>"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Centralisation of all operations</emphasis>"
 #~ msgstr "<emphasis role=\"strong\">Sentralisering av all drift</emphasis>"
 
 #~ msgid "Design and planning process"
 #~ msgstr "Design og planleggingsprosess"
 
-#~ msgid "Recommendations of UNINETT ABC: http://www.uninettabc.no/?p=veiledning&sub=annet"
-#~ msgstr "Anbefalinger fra UNINETT ABC: http://www.uninettabc.no/?p=veiledning&sub=annet"
+#~ msgid ""
+#~ "Recommendations of UNINETT ABC: http://www.uninettabc.no/?"
+#~ "p=veiledning&sub=annet"
+#~ msgstr ""
+#~ "Anbefalinger fra UNINETT ABC: http://www.uninettabc.no/?p=veiledning&"
+#~ "sub=annet"
 
-#~ msgid "<emphasis role=\"strong\">Thin or diskless clients against local servers</emphasis>"
-#~ msgstr "<emphasis role=\"strong\">Tynne eller havltykke klienter mot lokale tjenere</emphasis>"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Thin or diskless clients against local servers</"
+#~ "emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Tynne eller havltykke klienter mot lokale "
+#~ "tjenere</emphasis>"
 
 #~ msgid "<emphasis role=\"strong\">Local server machines</emphasis>"
 #~ msgstr "<emphasis role=\"strong\">Lokale tjenermaskiner</emphasis>"
@@ -15093,14 +15172,44 @@ msgstr ""
 #~ msgid "Deployment process"
 #~ msgstr "Utrullingsprosess"
 
-#~ msgid "<emphasis role=\"strong\">Advantage:</emphasis> Can take the PC anywhere suitable"
-#~ msgstr "<emphasis role=\"strong\">Fordel: </emphasis>Kan ta med PC-en hvor det måtte passe"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Advantage:</emphasis> Can take the PC anywhere "
+#~ "suitable"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Fordel: </emphasis>Kan ta med PC-en hvor det "
+#~ "måtte passe"
 
 #~ msgid "https://wiki.debian.org//htdocs/debwiki/img/alert.png"
 #~ msgstr "https://wiki.debian.org//htdocs/debwiki/img/alert.png"
 
-#~ msgid "<anchor id=\"InfrastructureSetup--thinclientprofile\"/> <emphasis role=\"strong\"> Thin clients </emphasis> was introduced in 1984 at MIT. This was around the same time Apple released the Macintosh GUI. The following year Microsoft shipped the first edition of MS-Windows. Actually thin clients are named X Window Systems and can be used on all possible platforms like Linux, Mac or Windows. X Windows turned things upside down. In practice applications run on a server, and the GUI [...]
-#~ msgstr "<anchor id=\"InfrastructureSetup--thinclientprofile\"/> <emphasis role=\"strong\">Tynnklienter</emphasis> ble introdusert i 1984 på MIT. Dette var omtrent på samme tid som Apple lanserte Macintosh med grafisk brukergrensesnitt. Året etter kom første utgave av Windows fra Microsoft. Egentlig heter tynnklienter X Window System og kan brukes på alle mulige plattformer som f.eks. Linux, Mac eller Windows. X Windows snur verden på hode. I praksis kjører programmene på en tjenermask [...]
+#~ msgid ""
+#~ "<anchor id=\"InfrastructureSetup--thinclientprofile\"/> <emphasis role="
+#~ "\"strong\"> Thin clients </emphasis> was introduced in 1984 at MIT. This "
+#~ "was around the same time Apple released the Macintosh GUI. The following "
+#~ "year Microsoft shipped the first edition of MS-Windows. Actually thin "
+#~ "clients are named X Window Systems and can be used on all possible "
+#~ "platforms like Linux, Mac or Windows. X Windows turned things upside "
+#~ "down. In practice applications run on a server, and the GUI is sent over "
+#~ "the network to the client computer. The client computer runs a server "
+#~ "program to display graphical windows. An X server may run your "
+#~ "application windows from different programs running on many different "
+#~ "servers. Thick clients also run the X Window system, using a virtual "
+#~ "local network on the PC. All Unix systems with graphical user interfaces "
+#~ "run X servers."
+#~ msgstr ""
+#~ "<anchor id=\"InfrastructureSetup--thinclientprofile\"/> <emphasis role="
+#~ "\"strong\">Tynnklienter</emphasis> ble introdusert i 1984 på MIT. Dette "
+#~ "var omtrent på samme tid som Apple lanserte Macintosh med grafisk "
+#~ "brukergrensesnitt. Året etter kom første utgave av Windows fra Microsoft. "
+#~ "Egentlig heter tynnklienter X Window System og kan brukes på alle mulige "
+#~ "plattformer som f.eks. Linux, Mac eller Windows. X Windows snur verden på "
+#~ "hode. I praksis kjører programmene på en tjenermaskin, og det grafiske "
+#~ "brukergrensesnittet sendes over nettverket til klientmaskinen. "
+#~ "Klientmaskinen kjører et tjenerprogram for framvising av grafiske "
+#~ "vinduer. En X-tjener kan kjøre programvinduer fra forskjellige program "
+#~ "som kjører på mange forskjellige tjenermaskiner. Tykke klienter kjører "
+#~ "også X Window system, men da et lokalt nettverk på PC-en. Alle Unix-"
+#~ "systemer med grafisk brukergrensesnitt kjører X-tjener."
 
 #~ msgid "0313 Oslo"
 #~ msgstr "0313 Oslo"
@@ -15114,32 +15223,57 @@ msgstr ""
 #~ msgid "RT: Request Tracker: http://www.bestpractical.com/"
 #~ msgstr "RT: Request Tracker: http://www.bestpractical.com/"
 
-#~ msgid "RT Essentials: http://www.oreilly.com/catalog/rtessentials/chapter/index.html"
-#~ msgstr "RT Essentials: http://www.oreilly.com/catalog/rtessentials/chapter/index.html"
+#~ msgid ""
+#~ "RT Essentials: http://www.oreilly.com/catalog/rtessentials/chapter/index."
+#~ "html"
+#~ msgstr ""
+#~ "RT Essentials: http://www.oreilly.com/catalog/rtessentials/chapter/index."
+#~ "html"
 
-#~ msgid "<emphasis role=\"strong\">Advantage:</emphasis> Requires few server machines. Good support for multimedia"
-#~ msgstr "<emphasis role=\"strong\">Fordel:</emphasis> Trenger få tjenermaskiner. God støtte for multimedia"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Advantage:</emphasis> Requires few server "
+#~ "machines. Good support for multimedia"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Fordel:</emphasis> Trenger få tjenermaskiner. "
+#~ "God støtte for multimedia"
 
 #~ msgid "Main server"
 #~ msgstr "Hovedtjener"
 
-#~ msgid "<emphasis role=\"strong\">The different profiles on different servers. </emphasis>"
-#~ msgstr "<emphasis role=\"strong\">De forskjellige profilene på forskjellige tjenermaskiner. </emphasis>"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">The different profiles on different servers. </"
+#~ "emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">De forskjellige profilene på forskjellige "
+#~ "tjenermaskiner. </emphasis>"
 
-#~ msgid "ITIL documentation for centralised administration of Skolelinux and Debian Edu"
-#~ msgstr "ITIL-dokumentasjon for sentralisert drift av Skolelinux og Debian Edu"
+#~ msgid ""
+#~ "ITIL documentation for centralised administration of Skolelinux and "
+#~ "Debian Edu"
+#~ msgstr ""
+#~ "ITIL-dokumentasjon for sentralisert drift av Skolelinux og Debian Edu"
 
 #~ msgid "Workstation"
 #~ msgstr "Arbeidsstasjon"
 
-#~ msgid "<emphasis role=\"strong\">Advantage:</emphasis> Gives new life to reused computers."
-#~ msgstr "<emphasis role=\"strong\">Fordel:</emphasis> Gir nytt liv til gjenbrukte datamaskiner."
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Advantage:</emphasis> Gives new life to reused "
+#~ "computers."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Fordel:</emphasis> Gir nytt liv til gjenbrukte "
+#~ "datamaskiner."
 
-#~ msgid "<emphasis role=\"strong\">Advantage:</emphasis> Gives new life to reused computers. Client does not have installed software."
-#~ msgstr "<emphasis role=\"strong\">Fordel:</emphasis> Gir nytt liv til gjenbrukte datamaskiner. Klienten har ikke installert programvare."
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Advantage:</emphasis> Gives new life to reused "
+#~ "computers. Client does not have installed software."
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Fordel:</emphasis> Gir nytt liv til gjenbrukte "
+#~ "datamaskiner. Klienten har ikke installert programvare."
 
 #~ msgid "Operating company Ltd"
 #~ msgstr "Driftselskapet AS"
 
-#~ msgid "<emphasis role=\"strong\">Centralisation of some functions</emphasis>"
-#~ msgstr "<emphasis role=\"strong\">Sentralisering av enkelte funksjoner</emphasis>"
+#~ msgid ""
+#~ "<emphasis role=\"strong\">Centralisation of some functions</emphasis>"
+#~ msgstr ""
+#~ "<emphasis role=\"strong\">Sentralisering av enkelte funksjoner</emphasis>"
diff --git a/documentation/debian-edu-itil/debian-edu-itil-manual.pot b/documentation/debian-edu-itil/debian-edu-itil-manual.pot
index 0a8f554..c127928 100644
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.pot
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-10-02 21:51+0200\n"
+"POT-Creation-Date: 2016-05-19 10:54+0200\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"
@@ -136,6 +136,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><para>
+msgid ""
+"See the <ulink url=\"https://wiki.debian.org/CopyRight#\">copyright page</"
+"ulink> for the copyright status of this document."
+msgstr ""
+
+#. type: Content of: <article><section><section><para>
 msgid "<ulink url=\"http://www.gnu.org/copyleft/gpl.html\"/>"
 msgstr ""
 
diff --git a/documentation/debian-edu-itil/debian-edu-itil-manual.xml b/documentation/debian-edu-itil/debian-edu-itil-manual.xml
index 5317ce0..a01ef6f 100644
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.xml
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.xml
@@ -54,6 +54,8 @@
 </para></listitem></itemizedlist>
 <para>This documentation is maintained in a wiki. This is to ensure that operations staff can easily search for solutions to problems, update configurations, and so on. 
 </para>
+<para>See the <ulink url="https://wiki.debian.org/CopyRight#">copyright page</ulink> for the copyright status of this document. 
+</para>
 <para><ulink url="http://www.gnu.org/copyleft/gpl.html"/> 
 </para>
 </section>

-- 
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