[debian-edu-commits] debian-edu/ 01/02: Updated ITIL doc from wiki.
Petter Reinholdtsen
pere at moszumanska.debian.org
Tue Nov 22 10:05:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
pere pushed a commit to branch master
in repository debian-edu-doc.
commit 63372887751566764ec7d3f59a4e959d3238d6ad
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Tue Nov 22 11:03:46 2016 +0100
Updated ITIL doc from wiki.
---
.../debian-edu-itil/debian-edu-itil-manual.pot | 51 +++++++++++-----------
.../debian-edu-itil/debian-edu-itil-manual.xml | 13 +++---
2 files changed, 31 insertions(+), 33 deletions(-)
diff --git a/documentation/debian-edu-itil/debian-edu-itil-manual.pot b/documentation/debian-edu-itil/debian-edu-itil-manual.pot
index 0258899..2ceba29 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: 2016-05-23 22:20+0200\n"
+"POT-Creation-Date: 2016-11-22 11:02+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"
@@ -6290,10 +6290,10 @@ msgstr ""
#. type: CDATA
#, no-wrap
msgid ""
-"IP adresse (IP Address): 10.0.2.1\n"
-" Nettmaske (Netmask): 255.255.254.0\n"
-" Kringkasting (Broadcast): 10.0.3.255\n"
-" Nettverk (Network): 10.0.2.0"
+"IP Address: 10.0.2.1\n"
+" Netmask: 255.255.254.0\n"
+" Broadcast: 10.0.3.255\n"
+" Network: 10.0.2.0"
msgstr ""
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
@@ -8039,18 +8039,17 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"<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."
+"<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 ""
#. type: Content of: <article><section><section><para>
@@ -8072,15 +8071,15 @@ msgstr ""
#. type: Content of: <article><section><section><para>
msgid ""
-"<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."
+"<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 ""
#. type: Content of: <article><section><section><para>
diff --git a/documentation/debian-edu-itil/debian-edu-itil-manual.xml b/documentation/debian-edu-itil/debian-edu-itil-manual.xml
index f4772b6..dbf9cf4 100644
--- a/documentation/debian-edu-itil/debian-edu-itil-manual.xml
+++ b/documentation/debian-edu-itil/debian-edu-itil-manual.xml
@@ -3223,11 +3223,10 @@ FIXME>
</para></listitem>
<listitem>
<para>Local network interface:
-</para></listitem></itemizedlist><screen><![CDATA[ IP adresse (IP Address): 10.0.2.1
- Nettmaske (Netmask): 255.255.254.0
- Kringkasting (Broadcast): 10.0.3.255
- Nettverk (Network): 10.0.2.0]]></screen>
-<itemizedlist>
+</para><screen><![CDATA[ IP Address: 10.0.2.1
+ Netmask: 255.255.254.0
+ Broadcast: 10.0.3.255
+ Network: 10.0.2.0]]></screen></listitem>
<listitem>
<para>Install the Big Pond login software? [y/n]:n
</para></listitem></itemizedlist>
@@ -4372,11 +4371,11 @@ FIXME: In with the drawing showing diskless clients>
</para>
<para>With <emphasis role="strong">graphical clients</emphasis> the operations department must run two parallel paths for the maintenance of software. Maintenance occurs on all client computers and on local and central servers. For getting for example Citrix to work reasonably well, there must be deployed two additional server machines in each building, in addition to central application servers. In addition, it usually needs some thick clients also for use with multimedia. For example 1 [...]
</para>
-<para><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 [...]
+<para><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 com [...]
</para>
<para>The main advantage of <emphasis role="strong">thin clients</emphasis> is the reuse of older equipment without increasing the complexity of operations. Many people use PCs with 233 MHz and 32 MB memory as thin clients. There is no need for local hard drive. Users can handle heavier graphics, sound and simple video. Several schools have opened up for the use of CD / DVD-Rom and USB memory stick at <emphasis role="strong">the thin clients</emphasis>. Operating personnel do not have to [...]
</para>
-<para><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 [...]
+<para><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 op [...]
</para>
<para>The advantage of <emphasis role="strong">Thick clients</emphasis> is that all programs are run locally, which can provide great flexibility and performance for users. Since most user programs run locally few central servers are needed. Solutions with thick clients can be relatively inexpensive to operate if one standardizes. On Windows, it is a great advantage to have mostly similar machines, which is difficult over time. It is quite common, for example, that the school has both 4 [...]
</para>
--
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