martin: server/kolab-webadmin/kolab-webadmin/php/admin/templates/en erfrakon.tpl, 1.2, 1.3 kdab.tpl, 1.2, 1.3

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/en
In directory doto:/tmp/cvs-serv31434/php/admin/templates/en

Modified Files:
	erfrakon.tpl kdab.tpl 
Log Message:
Martin K.: Update refernces from Kolab 1 to Kolab 2. Removed reference to BSI


Index: erfrakon.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/en/erfrakon.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- erfrakon.tpl	30 Nov 2004 15:30:02 -0000	1.2
+++ erfrakon.tpl	12 Dec 2004 17:36:12 -0000	1.3
@@ -1,7 +1,7 @@
 {* Smarty Template *}
 {*
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
- (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ (c) 2004 Martin Konold <martin.konold at erfrakon.de>
  This program is Free Software under the GNU General Public License (>=v2).
  Read the file COPYING that comes with this packages for details.
 *}
@@ -9,8 +9,8 @@
 <p>
 Kolab's concept was done by 
 <a href="http://www.erfrakon.com">erfrakon</a>; the company also
-designed and implemented the Kolab1 Server and did the design for the
-Kolab2 Server.
+designed and implemented the Kolab 1 Server and did the design and architecture for the
+Kolab 2 Server while providing consulting for the implementation of the Kolab 2 server and the Kolab 2 clients.
 </p>
 <IMG SRC="../pics/erfrakon.png" ALT="erfrakon" align="middle" longdesc="http://www.erfrakon.com" usemap="#maperfrakon">
 <map name="maperfrakon">
@@ -18,13 +18,13 @@
 </map> 
   
 <p>
-<a href="http://www.erfrakon.com">erfrakon</a> is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the Kolab project are design and architecure of the Kolab groupware solution and the creation of the Kolab server.
+<a href="http://www.erfrakon.com">erfrakon</a> is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the Kolab project are the principle design and architecure of the Kolab groupware solution and the creation of the Kolab 1 server.
 </p>
 <p>
 The following people worked on Kolab for erfrakon:</p>
 <p>
-<a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 1.0">Tassilo Erlewein</a><br>
-<a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 1.0">Achim Frank</a><br>
-<a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 1.0">Martin Konold</a><br>
+<a href="mailto:tassilo.erlewein at erfrakon.de?subject=Kolab Server 2.0">Tassilo Erlewein</a><br>
+<a href="mailto:achim.frank at erfrakon.de?subject=Kolab Server 2.0">Achim Frank</a><br>
+<a href="mailto:martin.konold at erfrakon.de?subject=Kolab Server 2.0">Martin Konold</a><br>
 </p>
 </div>

Index: kdab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/en/kdab.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdab.tpl	30 Nov 2004 15:30:02 -0000	1.2
+++ kdab.tpl	12 Dec 2004 17:36:12 -0000	1.3
@@ -5,22 +5,22 @@
 
 <div class="contentsimple">
 <p>
-The Kolab KDE client and 2nd version of the server was designed and developed
+The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed
 by <a href="http://www.klaralvdalens-datakonsult.se">Klarälvdalens
-Datakonsult AB</a> contracted by the <a href="http://www.bsi.bund.de">BSI</a>.
+Datakonsult AB</a>.
 </p>
 <p>
-Klarälvdalens Datakonsult AB is a consulting company dedicated to opensource software, Linux, and the Qt library. The main tasks of KDAB within the kolab project are design and implementation of the kolab KDE client and the implementation of the 2nd. version of the server.
+Klarälvdalens Datakonsult AB is a consulting company dedicated to opensource software, Linux, and the <a href="http://www.trolltech.com/products/qt/">Qt</a> library. The main tasks of KDAB within the Kolab project are design and implementation of the Kolab KDE clients and the implementation of the current Kolab 2 server.
 </p>
 <p>
 The following people worked on Kolab for Klarälvdalens Datakonsult AB:</p>
 <p>
-<a href="mailto:bo at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Bo Thorsen</a><br>
-<a href="mailto:michel at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Michel Boyer de la Giroday</a><br>
-<a href="mailto:steffen at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Steffen Hansen</a><br>
-<a href="mailto:kalle at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Matthias Kalle Dalheimer</a><br>
-<a href="mailto:dfaure at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">David Faure</a><br>
-<a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Karl-Heinz Zimmer</a><br>
-<a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Client 1.0">Lutz Rogowski</a><br>
+<a href="mailto:bo at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Bo Thorsen</a><br>
+<a href="mailto:michel at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Michel Boyer de la Giroday</a><br>
+<a href="mailto:steffen at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Steffen Hansen</a><br>
+<a href="mailto:kalle at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Matthias Kalle Dalheimer</a><br>
+<a href="mailto:dfaure at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">David Faure</a><br>
+<a href="mailto:khz at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Karl-Heinz Zimmer</a><br>
+<a href="mailto:lutz at klaralvdalens-datakonsult.se?subject=Kolab Client (Kontact)">Lutz Rogowski</a><br>
 </p>
 </div>